diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-19 15:51:59 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-19 15:51:59 +0100 |
| commit | 7c8c94663fdedb212e993eec232e6d40290cb67e (patch) | |
| tree | 51cd6d5d1352f71688ac9739ad860db8f89e3887 /src/crepe | |
| parent | a35b8998ec828877991c6da92879e37f28f64dc5 (diff) | |
make format
Diffstat (limited to 'src/crepe')
| -rw-r--r-- | src/crepe/facade/SDLContext.cpp | 8 | ||||
| -rw-r--r-- | src/crepe/facade/SDLContext.h | 2 | ||||
| -rw-r--r-- | src/crepe/system/RenderSystem.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index dc3f362..6fb312b 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -153,13 +153,13 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const { size *= cam_aux_data.render_scale * ctx.img_scale * data.scale_offset; if (ctx.sprite.data.world_space) { - screen_pos = (screen_pos - cam_aux_data.cam_pos - + cam_aux_data.zoomed_viewport / 2) + screen_pos = (screen_pos - cam_aux_data.cam_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size; } else { - screen_pos = (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale - - size / 2 + cam_aux_data.bar_size; + screen_pos + = (screen_pos + cam_aux_data.zoomed_viewport / 2) * cam_aux_data.render_scale + - size / 2 + cam_aux_data.bar_size; } cout << "HALLO" << endl; diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h index 7f07d34..e570073 100644 --- a/src/crepe/facade/SDLContext.h +++ b/src/crepe/facade/SDLContext.h @@ -19,9 +19,9 @@ #include "api/Sprite.h" #include "api/Transform.h" -#include "types.h" #include "EventData.h" #include "FontFacade.h" +#include "types.h" namespace crepe { class Texture; diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h index ed55dd5..14e5c2d 100644 --- a/src/crepe/system/RenderSystem.h +++ b/src/crepe/system/RenderSystem.h @@ -66,7 +66,6 @@ private: * \return returns a sorted reference vector */ RefVector<Sprite> sort(RefVector<Sprite> & objs) const; - }; } // namespace crepe |