3 files changed, 42 insertions, 7 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 56928b5..19af420 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -209,6 +209,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 bbf153a..5c067dd 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -125,12 +125,36 @@ struct Solid {
 };
 
 struct SpriteData {
+	
+	SpriteData(std::string path, vec2 off):
+		offset(off) {
+			tex = Texture(path);
+			size = tex.getDim();
+			
+			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 off, vec2 si):
+		size(si), offset(off) {
+			tex = Texture(path);
+			vec2 tmpsize = tex.getDim();
 
-	SpriteData(std::string path, vec2 offset)
-		: tex(path), offset(offset) {}
+			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;
+	}
 
 	Texture tex;
+	vec2 size;
 	vec2 offset;
+	
+	vec2 offset_tex;
+	vec2 size_tex;
 };
 
 using Frame = std::vector<std::pair<SpriteData, vec2>>;
@@ -212,7 +236,7 @@ struct Sprite {
 //TODO
 struct Animate {
 	// COMMENT
-	std::vector<Frame> frame;
+	std::vector<std::pair<uint, Frame>> frame;
 	// COMMENT	
 	uint index;
 
@@ -221,17 +245,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 52569e7..2b03696 100644
--- a/include/engine.hpp
+++ b/include/engine.hpp
@@ -44,6 +44,7 @@ public:
 	 * @param dt the delta time
 	 */
     void render(entityx::TimeDelta dt);
+	void resetRender(entityx::TimeDelta dt);
 
 	/**
 	 * Updates all logic systems.