diff --git a/include/Core/Engine.h b/include/Core/Engine.h index 1a2d671..988698a 100755 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -214,7 +214,7 @@ public: //ParticleTest - { + /*{ auto Pe = m_World->CreateEntity(); auto transform = m_World->AddComponent(Pe); auto particleEmitter= m_World->AddComponent(Pe); @@ -245,7 +245,7 @@ public: PtParticle->Flags = static_cast(ParticleFlags::Type::Powder | ParticleFlags::Type::ParticleContactFilter | ParticleFlags::Type::FixtureContactFilter); } m_World->CommitEntity(Pe); - } + }*/ //TODO: Why does the ball not collide with these bricks? //BottomBox diff --git a/include/Physics/ECreateParticleSequence.h b/include/Physics/ECreateParticleSequence.h index 13861cb..c6b3c2d 100644 --- a/include/Physics/ECreateParticleSequence.h +++ b/include/Physics/ECreateParticleSequence.h @@ -19,8 +19,8 @@ struct CreateParticleSequence : public Event int NumberOfTicks = 100; float Speed = 1.f; int ParticlesPerTick = 1.f; - float Spread = glm::pi(); - float EmittingAngle = glm::two_pi(); + float Spread = 1.f; + float EmittingAngle = 0.f; float MaxCount = 0; //Particle diff --git a/include/Physics/PhysicsSystem.h b/include/Physics/PhysicsSystem.h index 2e930f8..6fd7bd3 100755 --- a/include/Physics/PhysicsSystem.h +++ b/include/Physics/PhysicsSystem.h @@ -2,6 +2,7 @@ #define DAYDREAM_PHYSICSSYSTEM_H #include +#include #include @@ -116,13 +117,13 @@ namespace dd float m_Timer = 0; //TODO: Fill struct with info needed. - struct ParticleEmitter //TODO CHANGE NAMES + struct EmitterHandler //TODO CHANGE NAMES { std::vector ParticleSystem; std::vector ParticleEmitter; std::vector ParticleTemplate; }; - ParticleEmitter m_ParticleEmitters; + EmitterHandler m_ParticleEmitters; std::list m_Impulses; @@ -134,7 +135,7 @@ namespace dd : m_PhysicsSystem(physicsSystem) { } void SayGoodbye(b2Joint*) {LOG_INFO("joint körs");}; - void SayGoodbye(b2Fixture*) {LOG_INFO("Fixture körs");}; + void SayGoodbye(b2Fixture*) {/*LOG_INFO("Fixture körs");*/}; void SayGoodbye(b2ParticleSystem* particleSystem, int32 index) override {