diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-19 14:01:35 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-19 14:01:35 +0100 |
| commit | b6d3bc08126652ed42a7c84f5e4a8283e5e74d22 (patch) | |
| tree | 747e5ba495fb5d343da40d10e478af9f655f70cc /src/crepe/system/RenderSystem.cpp | |
| parent | b5c4879189a8ff55434c8c04c14163dfda83de65 (diff) | |
fix merge conflict
Diffstat (limited to 'src/crepe/system/RenderSystem.cpp')
| -rw-r--r-- | src/crepe/system/RenderSystem.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp index 3ec1922..579c9f5 100644 --- a/src/crepe/system/RenderSystem.cpp +++ b/src/crepe/system/RenderSystem.cpp @@ -21,7 +21,6 @@ #include "RenderSystem.h" #include "types.h" -#include "util/AbsoluutPosition.h" using namespace crepe; using namespace std; @@ -124,7 +123,7 @@ bool RenderSystem::render_particle(const Sprite & sprite, const Transform & tm){ .sprite = sprite, .texture = res, .pos = p.position, - .angle = p.angle + transform_angle, + .angle = p.angle + tm.rotation, .scale = tm.scale, }); } |