Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance

Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
2014-04-17 00:11:53 +02:00
parent 5e402af093 b1edefcf26
commit 2efb5405eb
10 changed files with 158 additions and 17 deletions
@@ -1,5 +1,6 @@
-#include "ParticleSystem.h"
 #include "PrecompiledHeader.h"
+#include "ParticleSystem.h"
+

 #include "World.h"
 void Systems::ParticleSystem::Update(double dt)
@@ -13,13 +14,10 @@ void Systems::ParticleSystem::UpdateEntity(double dt, EntityID entity, EntityID
 	if(!transformComponent)
 		return;
 	
-	transformComponent->Position.y --;
-	
-	timeLived[entity] += dt;
 	
+
+
 	auto emitterComponent = m_World->GetComponent<Components::ParticleEmitter>(entity, "ParticleEmitter");
-	
-	

 }

@@ -35,7 +33,6 @@ void Systems::ParticleSystem::SpawnParticles()
 		auto particle = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(particle, "Transform");
 		transform->Position = glm::vec3(0);
-		particles.push_back(particle);
 	}
 }