Vattnet fungerar nu igen.

This commit is contained in:
Stiffly
2015-10-07 19:18:49 +02:00
parent 1a1b94477e
commit ef5882ffbf
3 changed files with 2 additions and 31 deletions
+1 -15
View File
@@ -198,21 +198,7 @@ public:
}
//ParticleTest
{
Events::CreateParticleSequence e;
e.Position = glm::vec3(0.f, 0.f, -10.f);
e.SpriteFile = "Textures/Background.png";
e.GravityScale = 0.0f;
e.SpawnRate = 1.f;
e.NumberOfTicks = 2;
e.Speed = 1.f;
e.ParticlesPerTick = 5;
e.Spread = glm::pi<float>() * 2;
e.EmittingAngle = glm::pi<float>();
e.EmitterLifeTime = 50;
e.ParticleLifeTime = 3.f;
m_EventBroker->Publish(e);
}
/*{
auto Pe = m_World->CreateEntity();
+1 -1
View File
@@ -199,7 +199,7 @@ void dd::Systems::PhysicsSystem::Update(double dt)
}
auto transform = m_World->GetComponent<Components::Transform>(entity);
transform->Position = glm::vec3(position.x, position.y, -10.f);
transform->Position = glm::vec3(position.x - parentTransform.x, position.y - parentTransform.y, 0);
}
//Normal particles
-15
View File
@@ -175,21 +175,6 @@ bool dd::Systems::SoundSystem::OnContact(const dd::Events::Contact &event)
EventBroker->Publish(e);
}
{
Events::CreateParticleSequence e;
e.Position = glm::vec3(0.f, 0.f, -10.f);
e.SpriteFile = "Textures/Background.png";
e.GravityScale = 0.0f;
e.SpawnRate = 1.f;
e.NumberOfTicks = 2;
e.Speed = 1.f;
e.ParticlesPerTick = 5;
e.Spread = glm::pi<float>() * 2;
e.EmittingAngle = glm::pi<float>();
e.EmitterLifeTime = 50;
e.ParticleLifeTime = 3.f;
EventBroker->Publish(e);
}
return true;
}