mirrors/parin
1
0
Fork 0
mirror of https://github.com/Kapendev/parin.git synced 2025-04-27 21:49:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed camera and changed the mouse api.

Browse source
This commit is contained in:
Kapendev 2024-11-18 07:51:19 +02:00
parent 09dcb062e5
commit 637879a5b3
1 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

67
source/parin/engine.d
View file

@ -555,8 +555,9 @@ struct SoundId {
/// Represents the viewing area for rendering. /// Represents the viewing area for rendering.
struct Viewport { struct Viewport {
rl.RenderTexture2D data; rl.RenderTexture2D data;
Color color; Color color; /// TOOO
Blend blend; Blend blend; /// TOOO
bool isAttached; /// Indicates whether the viewport is currently in use.
@safe @nogc nothrow: @safe @nogc nothrow:
@ -600,10 +601,11 @@ struct Viewport {
@trusted @trusted
void attach() { void attach() {
if (isEmpty) return; if (isEmpty) return;
if (engineState.currentViewport != null) { if (engineState.currentViewport.isAttached) {
assert(0, "Cannot attach viewport because another viewport is already attached."); assert(0, "Cannot attach viewport because another viewport is already attached.");
} }
engineState.currentViewport = &this; isAttached = true;
engineState.currentViewport = this;
if (isResolutionLocked) rl.EndTextureMode(); if (isResolutionLocked) rl.EndTextureMode();
rl.BeginTextureMode(data); rl.BeginTextureMode(data);
rl.ClearBackground(color.toRl()); rl.ClearBackground(color.toRl());
@ -615,10 +617,11 @@ struct Viewport {
@trusted @trusted
void detach() { void detach() {
if (isEmpty) return; if (isEmpty) return;
if (engineState.currentViewport != &this) { if (!isAttached) {
assert(0, "Cannot detach viewport because it is not the attached viewport."); assert(0, "Cannot detach viewport because it is not the attached viewport.");
} }
engineState.currentViewport = null; isAttached = false;
engineState.currentViewport = Viewport();
rl.EndBlendMode(); rl.EndBlendMode();
rl.EndTextureMode(); rl.EndTextureMode();
if (isResolutionLocked) rl.BeginTextureMode(engineState.viewport.toRl()); if (isResolutionLocked) rl.BeginTextureMode(engineState.viewport.toRl());
@ -646,6 +649,7 @@ struct Camera {
float rotation = 0.0f; /// The rotation angle of the camera, in degrees. float rotation = 0.0f; /// The rotation angle of the camera, in degrees.
float scale = 1.0f; /// The zoom level of the camera. float scale = 1.0f; /// The zoom level of the camera.
bool isCentered; /// Determines if the camera's origin is at the center instead of the top left. bool isCentered; /// Determines if the camera's origin is at the center instead of the top left.
bool isAttached; /// Indicates whether the camera is currently in use.
@safe @nogc nothrow: @safe @nogc nothrow:
@ -662,20 +666,20 @@ struct Camera {
} }
/// Returns the origin of the camera. /// Returns the origin of the camera.
Vec2 origin() { Vec2 origin(Viewport viewport = Viewport()) {
if (engineState.currentViewport == null || engineState.currentViewport.isEmpty) { if (viewport.isEmpty) {
return Rect(resolution / Vec2(scale)).origin(hook); return Rect(resolution / Vec2(scale)).origin(hook);
} else { } else {
return Rect(engineState.currentViewport.size / Vec2(scale)).origin(hook); return Rect(viewport.size / Vec2(scale)).origin(hook);
} }
} }
/// Returns the area covered by the camera. /// Returns the area covered by the camera.
Rect area() { Rect area(Viewport viewport = Viewport()) {
if (engineState.currentViewport == null || engineState.currentViewport.isEmpty) { if (viewport.isEmpty) {
return Rect(position, resolution / Vec2(scale)).area(hook); return Rect(position, resolution / Vec2(scale)).area(hook);
} else { } else {
return Rect(position, engineState.currentViewport.size / Vec2(scale)).area(hook); return Rect(position, viewport.size / Vec2(scale)).area(hook);
} }
} }
@ -747,11 +751,12 @@ struct Camera {
/// Attaches the camera, making it active. /// Attaches the camera, making it active.
@trusted @trusted
void attach() { void attach() {
if (engineState.currentCamera != null) { if (engineState.currentCamera.isAttached) {
assert(0, "Cannot attach camera because another camera is already attached."); assert(0, "Cannot attach camera because another camera is already attached.");
} }
engineState.currentCamera = &this; isAttached = true;
auto temp = this.toRl(); engineState.currentCamera = this;
auto temp = this.toRl(engineState.currentViewport);
if (isPixelSnapped || isPixelPerfect) { if (isPixelSnapped || isPixelPerfect) {
temp.target.x = floor(temp.target.x); temp.target.x = floor(temp.target.x);
temp.target.y = floor(temp.target.y); temp.target.y = floor(temp.target.y);
@ -764,10 +769,11 @@ struct Camera {
/// Detaches the camera, making it inactive. /// Detaches the camera, making it inactive.
@trusted @trusted
void detach() { void detach() {
if (engineState.currentCamera != &this) { if (!isAttached) {
assert(0, "Cannot detach camera because it is not the attached camera."); assert(0, "Cannot detach camera because it is not the attached camera.");
} }
engineState.currentCamera = null; isAttached = false;
engineState.currentCamera = Camera();
rl.EndMode2D(); rl.EndMode2D();
} }
} }
@ -900,8 +906,8 @@ struct EngineState {
LStr assetsPath; LStr assetsPath;
LStr tempText; LStr tempText;
Camera* currentCamera; Camera currentCamera;
Viewport* currentViewport; Viewport currentViewport;
Color borderColor; Color borderColor;
Filter defaultFilter; Filter defaultFilter;
@ -1017,8 +1023,8 @@ int toRl(Filter filter) {
} }
/// Converts a Parin type to a raylib type. /// Converts a Parin type to a raylib type.
rl.Camera2D toRl(Camera camera) { rl.Camera2D toRl(Camera camera, Viewport viewport = Viewport()) {
auto area = Rect((engineState.currentViewport == null || engineState.currentViewport.isEmpty) ? resolution : engineState.currentViewport.size); auto area = Rect(viewport.isEmpty ? resolution : viewport.size);
return rl.Camera2D( return rl.Camera2D(
area.origin(camera.isCentered ? Hook.center : Hook.topLeft).toRl(), area.origin(camera.isCentered ? Hook.center : Hook.topLeft).toRl(),
camera.position.toRl(), camera.position.toRl(),
@ -1057,16 +1063,16 @@ void randomize() {
randomize(randi); randomize(randi);
} }
/// Converts a world position to a screen position based on the given camera. /// Converts a world point to a screen point based on the given camera.
@trusted @trusted
Vec2 toScreenPosition(Vec2 position, Camera camera) { Vec2 toScreenPoint(Vec2 position, Camera camera, Viewport viewport = Viewport()) {
return toParin(rl.GetWorldToScreen2D(position.toRl(), camera.toRl())); return toParin(rl.GetWorldToScreen2D(position.toRl(), camera.toRl(viewport)));
} }
/// Converts a screen position to a world position based on the given camera. /// Converts a screen point to a world point based on the given camera.
@trusted @trusted
Vec2 toWorldPosition(Vec2 position, Camera camera) { Vec2 toWorldPoint(Vec2 position, Camera camera, Viewport viewport = Viewport()) {
return toParin(rl.GetScreenToWorld2D(position.toRl(), camera.toRl())); return toParin(rl.GetScreenToWorld2D(position.toRl(), camera.toRl(viewport)));
} }
/// Returns an absolute path to the assets folder. /// Returns an absolute path to the assets folder.
@ -1600,7 +1606,7 @@ Vec2 resolution() {
/// Returns the current position of the mouse on the screen. /// Returns the current position of the mouse on the screen.
@trusted @trusted
Vec2 mouseScreenPosition() { Vec2 mouse() {
if (isResolutionLocked) { if (isResolutionLocked) {
auto window = windowSize; auto window = windowSize;
auto minRatio = min(window.x / engineState.viewport.width, window.y / engineState.viewport.height); auto minRatio = min(window.x / engineState.viewport.width, window.y / engineState.viewport.height);
@ -1620,11 +1626,6 @@ Vec2 mouseScreenPosition() {
} }
} }
/// Returns the current position of the mouse on the world, using the specified camera.
Vec2 mouseWorldPosition(Camera camera) {
return mouseScreenPosition.toWorldPosition(camera);
}
/// Returns the current frames per second (FPS). /// Returns the current frames per second (FPS).
@trusted @trusted
int fps() { int fps() {