Merge branch 'master' into water

include/Core/Engine.h

@@ -214,7 +214,7 @@ public:
 		//ParticleTest
 
 
-		{
+		/*{
 			auto Pe = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(Pe);
 			auto particleEmitter= m_World->AddComponent<Components::ParticleEmitter>(Pe);
@@ -245,7 +245,7 @@ public:
 				PtParticle->Flags = static_cast<ParticleFlags::Type>(ParticleFlags::Type::Powder | ParticleFlags::Type::ParticleContactFilter | ParticleFlags::Type::FixtureContactFilter);
 			}
 			m_World->CommitEntity(Pe);
-		}
+		}*/
 
 		//TODO: Why does the ball not collide with these bricks?
 		//BottomBox

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>();
-    float EmittingAngle = glm::two_pi<float>();
+    float Spread = 1.f;
+    float EmittingAngle = 0.f;
     float MaxCount = 0;
 
     //Particle

include/Physics/PhysicsSystem.h

@@ -2,6 +2,7 @@
 #define DAYDREAM_PHYSICSSYSTEM_H
 
 #include <unordered_map>
+#include <random>
 
 #include <Box2D/Box2D.h>
 
@@ -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<b2ParticleSystem*> ParticleSystem;
             std::vector<EntityID> ParticleEmitter;
             std::vector<EntityID> ParticleTemplate;
         };
-            ParticleEmitter m_ParticleEmitters;
+            EmitterHandler m_ParticleEmitters;
 
             std::list<Impulse> 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
         {