diff --git a/src/GameWorld.cpp b/src/GameWorld.cpp index 3eab400..69682b6 100755 --- a/src/GameWorld.cpp +++ b/src/GameWorld.cpp @@ -239,14 +239,24 @@ void GameWorld::Initialize() } { - auto tree = CreateEntity(); + /* auto tree = CreateEntity(); auto transform = AddComponent(tree); transform->Position = glm::vec3(0, -15, 0); auto model = AddComponent(tree); model->ModelFile = "Models/Tree/leafs/Leafs.obj"; model->Transparent = true; - CommitEntity(tree); + CommitEntity(tree);*/ + + + auto thing = CreateEntity(); + auto transform = AddComponent(thing); + transform->Position = glm::vec3(0,15,0); + transform->Scale = glm::vec3(3); +// auto model = AddComponent(thing); +// model->ModelFile = "Models/Barrel/Barrel.obj"; + auto sprite = AddComponent(thing); + sprite->SpriteFile = "Textures/Sprites/SeriousParticle.png"; } EntityID tank1 = CreateTank(1); diff --git a/src/InputManager.cpp b/src/InputManager.cpp index 11f21d7..5e6c942 100644 --- a/src/InputManager.cpp +++ b/src/InputManager.cpp @@ -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() / 2, glm::vec3(1,0,0)); e.Speed = 3; e.SpreadAngle = glm::pi();