Sprites flip and shit are good

3 files changed, 34 insertions, 6 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 3caa083..861905a 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -210,6 +210,14 @@ constexpr const float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
 std::vector<std::string> StringTokenizer(const std::string& str, char delim);
 
 /**
+ * Seperates a string like, "23,12" to a vec2.
+ * 
+ * @param s the string to parse
+ * @return the vec2 of the values passed in the string
+ */
+vec2 str2coord(std::string s);
+
+/**
  * A function to draw a colored box for OpenGL.
  * To use it, the lower left hand and upper right hand coords are given.
  *
diff --git a/include/components.hpp b/include/components.hpp
index d630f83..2a8680d 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -130,11 +130,28 @@ struct SpriteData {
 		offset(offset) {
 			pic = Texture::loadTexture(path);
 			size = Texture::imageDim(path);
-		}
+			size_tex = vec2(1.0, 1.0);
+			
+			offset_tex.x = offset.x/size.x;
+			offset_tex.y = offset.y/size.y;
+	}
+
+	SpriteData(std::string path, vec2 offset, vec2 size):
+		offset(offset), size(size) {
+			pic = Texture::loadTexture(path);
+			vec2 tmpsize = Texture::imageDim(path);
+
+			size_tex.x = size.x/tmpsize.x;
+			size_tex.y = size.y/tmpsize.y;
+			offset_tex.x = offset.x/tmpsize.x;
+			offset_tex.y = offset.y/tmpsize.y;
+	}
 
 	GLuint pic;
 	vec2 offset;
+	vec2 offset_tex;
 	vec2 size;
+	vec2 size_tex;
 };
 
 using Frame = std::vector<std::pair<SpriteData, vec2>>;
@@ -214,7 +231,7 @@ struct Sprite {
 //TODO
 struct Animate {
 	// COMMENT
-	std::vector<Frame> frame;
+	std::vector<std::pair<uint, Frame>> frame;
 	// COMMENT	
 	uint index;
 
@@ -223,17 +240,19 @@ struct Animate {
 	}
 
 	// COMMENT
-	Frame nextFrame() {
+	void nextFrame(Frame sprite) {
 		if (index < frame.size() - 1) {
 			index++;
 		} else {
 			index = 0;
 		}
-		return frame.at(index);
+		auto fa = frame.at(index);
+		if (sprite.size() > fa.first-1)
+			sprite.at(fa.first) = fa.second.at(fa.first);
 	}
 
-	Frame firstFrame() {
-		return frame.front();
+	void firstFrame(Frame sprite) {
+		sprite = frame.at(0).second;
 	}
 };
 
diff --git a/include/engine.hpp b/include/engine.hpp
index c842b59..1c5f510 100644
--- a/include/engine.hpp
+++ b/include/engine.hpp
@@ -20,6 +20,7 @@ public:
 
 	void init(void);
     void render(entityx::TimeDelta dt);
+	void resetRender(entityx::TimeDelta dt);
 	void update(entityx::TimeDelta dt);
 
 	template<typename T>