Merge remote-tracking branch 'origin/Physics' into Tobias

2015-10-20 11:03:45 +02:00
parent f688981b06 a85a703991
commit ce61de1d5c
6 changed files with 1801 additions and 487 deletions
@@ -57,6 +57,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