Animation models and stuff

include/Core/Engine.h

@@ -252,7 +252,7 @@ public:
 			m_World->CommitEntity(background);
 		}
 
-//			auto particleEmitter= m_World->AddComponent<Components::Emitter>(Pe);
+		//			auto particleEmitter= m_World->AddComponent<Components::Emitter>(Pe);
 		//Water test
 		{
 			auto t_waterBody = m_World->CreateEntity();
@@ -265,6 +265,9 @@ public:
 			m_World->CommitEntity(t_waterBody);
 		}
 
+
+		
+
 		//ParticleTest
 
 

include/Game/PadSystem.h

@@ -37,6 +37,7 @@
 #include "Game/EHitLag.h"
 #include "Game/EScreenShake.h"
 #include "Game/EActionButton.h"
+#include "Rendering/CAnimation.h"
 
 
 namespace dd

src/game/Game/PadSystem.cpp

@@ -55,6 +55,17 @@ void dd::Systems::PadSystem::Initialize()
         m_World->CommitEntity(ent);
 
         SetEdge(3.2 - (ctransform->Scale.x / 2));
+
+
+		{
+			auto entArm = m_World->CreateEntity(ent);
+			auto ctransform = m_World->AddComponent<Components::Transform>(entArm);
+			ctransform->Position = glm::vec3(1.f, -3.0f, 0.f);
+			auto cModel = m_World->AddComponent<Components::Model>(entArm);
+			cModel->ModelFile = "Models/Kraken/Arm.dae";
+			auto animationComponent = m_World->AddComponent<Components::Animation>(entArm);
+			animationComponent->Speed = 1.0f;
+		}
     }
 
 	//Stick