Animations and stuff

This commit is contained in:
viktorljung
2015-10-21 15:40:19 +02:00
parent a85a703991
commit f4ffead4f2
7 changed files with 4599 additions and 2 deletions
File diff suppressed because one or more lines are too long
+12
View File
@@ -0,0 +1,12 @@
# Blender MTL File: 'Sid.blend'
# Material Count: 1
newmtl Derp
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2
map_Kd SquidTexture.png
File diff suppressed because it is too large Load Diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.
+3 -2
View File
@@ -33,12 +33,13 @@ void dd::Systems::BallSystem::Initialize()
auto ent = m_World->CreateEntity();
std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
transform->Position = glm::vec3(-20.f, 0.26f, -10.f);
transform->Scale = glm::vec3(0.3f, 0.3f, 0.3f);
transform->Scale = glm::vec3(.3f, 0.3f, 0.3f) * 3.f;
transform->Velocity = glm::vec3(0.f, 0.f, 0.f);
auto model = m_World->AddComponent<Components::Model>(ent);
model->ModelFile = "Models/Sid/Sid.dae";
model->ModelFile = "Models/Sid/Sid.fbx";
auto animation = m_World->AddComponent<Components::Animation>(ent);
animation->Speed = 1.0;
animation->Name = "AnimStack::Armature.001|Flying";
std::shared_ptr<Components::CircleShape> circleShape = m_World->AddComponent<Components::CircleShape>(ent);
circleShape->Radius = 0.4f;
std::shared_ptr<Components::Ball> ball = m_World->AddComponent<Components::Ball>(ent);
+12
View File
@@ -70,6 +70,18 @@ void dd::Systems::PadSystem::Initialize()
}
}
{
auto entBody = m_World->CreateEntity();
auto ctransform = m_World->AddComponent<Components::Transform>(entBody);
ctransform->Position = glm::vec3(0.f, 3.0f, -10.f);
ctransform->Scale = glm::vec3(3.f);
auto cModel = m_World->AddComponent<Components::Model>(entBody);
cModel->ModelFile = "Models/Kraken/Body.dae";
auto animationComponent = m_World->AddComponent<Components::Animation>(entBody);
animationComponent->Speed = 0.6f;
}
//Stick
{
auto ent = m_World->CreateEntity();