Trying some stuff, this build did not support sprite rendering

This commit is contained in:
Stiffly
2014-05-30 20:00:09 +02:00
parent bf77fba963
commit 31348e774e
2 changed files with 15 additions and 5 deletions
+12 -2
View File
@@ -239,14 +239,24 @@ void GameWorld::Initialize()
}
{
auto tree = CreateEntity();
/* auto tree = CreateEntity();
auto transform = AddComponent<Components::Transform>(tree);
transform->Position = glm::vec3(0, -15, 0);
auto model = AddComponent<Components::Model>(tree);
model->ModelFile = "Models/Tree/leafs/Leafs.obj";
model->Transparent = true;
CommitEntity(tree);
CommitEntity(tree);*/
auto thing = CreateEntity();
auto transform = AddComponent<Components::Transform>(thing);
transform->Position = glm::vec3(0,15,0);
transform->Scale = glm::vec3(3);
// auto model = AddComponent<Components::Model>(thing);
// model->ModelFile = "Models/Barrel/Barrel.obj";
auto sprite = AddComponent<Components::Sprite>(thing);
sprite->SpriteFile = "Textures/Sprites/SeriousParticle.png";
}
EntityID tank1 = CreateTank(1);
+3 -3
View File
@@ -85,13 +85,13 @@ void InputManager::Update(double dt)
EventBroker->Publish(e);
}
if(m_CurrentKeyState[GLFW_KEY_B])
if(m_CurrentKeyState[GLFW_KEY_Z])
{
Events::CreateExplosion e;
e.LifeTime = 1;
e.ParticleScale = 6;
e.ParticlesToSpawn = 50;
e.Position = glm::vec3(0, -20, 40);
e.ParticlesToSpawn = 1;
e.Position = glm::vec3(0, -15, 0);
e.RelativeUpOrientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1,0,0));
e.Speed = 3;
e.SpreadAngle = glm::pi<float>();