Animation

2 files changed, 51 insertions, 2 deletions

diff --git a/src/components.cpp b/src/components.cpp
index 28358be..38fd7a6 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -72,7 +72,6 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 	Render::worldShader.use();
 
 	en.each<Visible, Sprite, Position>([dt](entityx::Entity entity, Visible &visible, Sprite &sprite, Position &pos) {
-		(void)entity;
 		// Verticies and shit
 		GLfloat tex_coord[] = {0.0, 0.0,
 							   1.0, 0.0,
@@ -90,6 +89,10 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 								1.0, 1.0,
 								1.0, 0.0};
 
+		if (entity.has_component<Animate>()) {
+			sprite.sprite = entity.component<Animate>().get()->nextFrame();
+		}
+		
 		for (auto &S : sprite.sprite) {
 			float width = HLINES(S.first.size.x);
 			float height = HLINES(S.first.size.y);
@@ -111,7 +114,9 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 				float flashAmt = 1-(hitDuration/maxHitDuration);
 				glUniform4f(Render::worldShader.uniform[WU_tex_color], 1.0, flashAmt, flashAmt, 1.0);
 			}*/
+			
 			glBindTexture(GL_TEXTURE_2D, S.first.pic);
+			
 			glUniform1i(Render::worldShader.uniform[WU_texture], 0);
 			Render::worldShader.enable();
 
@@ -207,3 +212,36 @@ void DialogSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 	(void)ev;
 	(void)dt;
 }
+
+std::vector<Frame> developFrame(XMLElement* xml)
+{
+	Frame tmpf;
+	std::vector<Frame> tmp;
+
+	// this is the xml elements first child. It will only be the <frame> tag
+	auto framexml = xml->FirstChildElement();
+	while (framexml) {
+		// this will always be frame. but if it isn't we don't wanna crash the game
+		std::string defframe = framexml->Name();
+		if (defframe == "frame") {
+			tmpf.clear();
+			// the xml element to parse each src of the frames
+			auto sxml = framexml->FirstChildElement();
+			while (sxml) {
+				std::string sname = sxml->Name();
+				if (sname == "src") {
+					tmpf.push_back(std::make_pair(SpriteData(sxml->GetText(), vec2(0,0)), vec2(0,0)));
+					std::cout << tmpf.back().first.pic << std::endl;
+				}
+				sxml = sxml->NextSiblingElement();
+			}
+			tmp.push_back(tmpf);
+		}
+		// if it's not a frame we don't care
+		
+		// parse next frame
+		framexml = framexml->NextSiblingElement();
+	}
+
+	return tmp;
+}
diff --git a/src/world.cpp b/src/world.cpp
index 8ae93bb..68b8f34 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -335,7 +335,7 @@ void WorldSystem::load(const std::string& file)
 						auto tex = abcd->Attribute("image");
 						sprite->addSpriteSegment(SpriteData(tex,
 						                                    vec2(0, 0)),
-						                         vec2(0, 0));
+						                         			vec2(0, 0));
 					} else if (tname == "Portal") {
 						entity.assign<Portal>(wxml->StrAttribute("inside"));
 					} else if (tname == "Solid") {
@@ -381,6 +381,17 @@ void WorldSystem::load(const std::string& file)
 						entity.assign<Grounded>();
 					} else if (tname == "Wander") {
 						entity.assign<Wander>();
+					} else if (tname == "Animation") {
+						entity.assign<Animate>();
+						auto animx = abcd->FirstChildElement();
+						while (animx) {	
+							std::string animType = animx->Name();
+							if (animType == "movement") {
+								entity.component<Animate>().get()->frame = developFrame(animx);
+							}
+							
+							animx = animx->NextSiblingElement();
+						}
 					}
 
 					abcd = abcd->NextSiblingElement();