merge with niels/rendering

1 files changed, 13 insertions, 3 deletions

diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 4eda466..d9e26ab 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,8 +1,18 @@
-#include <string>
+
 
 #include "Sprite.h"
+#include "api/Texture.h"
+#include "util/log.h"
+#include <memory>
+#include <utility>
 
-using namespace crepe::api;
 using namespace std;
+using namespace crepe;
+using namespace crepe::api;
+
+Sprite::Sprite(shared_ptr<Texture> image, const Color & color,
+			   const flip_settings & flip) : color(color), flip(flip), sprite_image(image) {
+	dbg_trace();
+}
 
-Sprite::Sprite(uint32_t gameObjectId, string path) : Component(gameObjectId), path(path) {}
+Sprite::~Sprite() { dbg_trace(); }