From ef5882ffbf001c9bc20d99b919cbad18dc94ccbe Mon Sep 17 00:00:00 2001
From: Stiffly <adambylehn@hotmail.com>
Date: Wed, 7 Oct 2015 19:18:49 +0200
Subject: [PATCH] Vattnet fungerar nu igen.

---
 include/Core/Engine.h              | 16 +---------------
 src/game/Physics/PhysicsSystem.cpp |  2 +-
 src/game/Sound/SoundSystem.cpp     | 15 ---------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index 9c9904f..19ebbae 100755
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -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();
diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp
index 5380ccb..2824a39 100755
--- a/src/game/Physics/PhysicsSystem.cpp
+++ b/src/game/Physics/PhysicsSystem.cpp
@@ -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
diff --git a/src/game/Sound/SoundSystem.cpp b/src/game/Sound/SoundSystem.cpp
index 2ee2a61..c11d84e 100644
--- a/src/game/Sound/SoundSystem.cpp
+++ b/src/game/Sound/SoundSystem.cpp
@@ -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;
 }