Trying some stuff, this build did not support sprite rendering
This commit is contained in:
+12
-2
@@ -239,14 +239,24 @@ void GameWorld::Initialize()
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
auto tree = CreateEntity();
|
/* auto tree = CreateEntity();
|
||||||
auto transform = AddComponent<Components::Transform>(tree);
|
auto transform = AddComponent<Components::Transform>(tree);
|
||||||
transform->Position = glm::vec3(0, -15, 0);
|
transform->Position = glm::vec3(0, -15, 0);
|
||||||
auto model = AddComponent<Components::Model>(tree);
|
auto model = AddComponent<Components::Model>(tree);
|
||||||
model->ModelFile = "Models/Tree/leafs/Leafs.obj";
|
model->ModelFile = "Models/Tree/leafs/Leafs.obj";
|
||||||
model->Transparent = true;
|
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);
|
EntityID tank1 = CreateTank(1);
|
||||||
|
|||||||
@@ -85,13 +85,13 @@ void InputManager::Update(double dt)
|
|||||||
EventBroker->Publish(e);
|
EventBroker->Publish(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_CurrentKeyState[GLFW_KEY_B])
|
if(m_CurrentKeyState[GLFW_KEY_Z])
|
||||||
{
|
{
|
||||||
Events::CreateExplosion e;
|
Events::CreateExplosion e;
|
||||||
e.LifeTime = 1;
|
e.LifeTime = 1;
|
||||||
e.ParticleScale = 6;
|
e.ParticleScale = 6;
|
||||||
e.ParticlesToSpawn = 50;
|
e.ParticlesToSpawn = 1;
|
||||||
e.Position = glm::vec3(0, -20, 40);
|
e.Position = glm::vec3(0, -15, 0);
|
||||||
e.RelativeUpOrientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1,0,0));
|
e.RelativeUpOrientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1,0,0));
|
||||||
e.Speed = 3;
|
e.Speed = 3;
|
||||||
e.SpreadAngle = glm::pi<float>();
|
e.SpreadAngle = glm::pi<float>();
|
||||||
|
|||||||
Reference in New Issue
Block a user