diff options
| author | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:29:18 +0100 |
|---|---|---|
| committer | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:29:18 +0100 |
| commit | ae6a103946e437ca85cc69c5fc2cbf68d35ffeae (patch) | |
| tree | a0bd09748c68950353f05d245bed4de470548fc6 /src/crepe/api/Sprite.cpp | |
| parent | a5d3564f6d051986376c98abb9c098a8a7183fe0 (diff) | |
| parent | 5b248d068a94902be9ca4d00fe07d551f64c49b9 (diff) | |
Merge remote-tracking branch 'origin/master' into max/gameobject
Diffstat (limited to 'src/crepe/api/Sprite.cpp')
| -rw-r--r-- | src/crepe/api/Sprite.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp index 806f147..3dd44f2 100644 --- a/src/crepe/api/Sprite.cpp +++ b/src/crepe/api/Sprite.cpp @@ -1,15 +1,14 @@ #include <cstdint> #include <memory> -#include "api/Texture.h" -#include "util/log.h" +#include "../util/log.h" #include "Component.h" #include "Sprite.h" +#include "Texture.h" using namespace std; using namespace crepe; -using namespace crepe::api; Sprite::Sprite(uint32_t id, shared_ptr<Texture> image, const Color & color, const FlipSettings & flip) |