aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/ParticleSystem.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe/ParticleSystem.cpp')
-rw-r--r--src/crepe/ParticleSystem.cpp27
1 files changed, 3 insertions, 24 deletions
diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp
index 8891e2b..3a1f653 100644
--- a/src/crepe/ParticleSystem.cpp
+++ b/src/crepe/ParticleSystem.cpp
@@ -5,40 +5,32 @@
#include <iostream> // include iostream for std::cout
#include "ParticleEmitter.h"
#include "Particle.h"
+#include "ComponentManager.h"
using namespace crepe;
ParticleSystem::ParticleSystem() : m_elapsedTime(0.0f) {} // Initialize m_elapsedTime to 0
-void ParticleSystem::update(float deltaTime, std::vector<ParticleEmitter>& emitters) {
- // std::cout << "ParticleSystem update" << std::endl;
+void ParticleSystem::update(float deltaTime, std::vector<std::reference_wrapper<ParticleEmitter>>& emitters) {
for (ParticleEmitter& emitter : emitters) {
float updateAmount = 1/static_cast<float>(emitter.m_emissionRate);
for (float i = 0; i < deltaTime; i += updateAmount)
{
emitParticle(emitter);
}
- // std::cout << "after emit" << std::endl;
-
- //update/move particles afterwards delete if not alive.
for (size_t j = 0; j < emitter.particles.size(); j++)
{
- // std::cout << "update" << std::endl;
if(emitter.particles[j].active)
{
emitter.particles[j].update(deltaTime);
}
}
-
-
}
}
void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
- // std::cout << "new emitter:" << std::endl;
- Position initialPosition = { emitter.m_position.x, emitter.m_position.y };
+ Position initialPosition = { emitter.m_position.x, emitter.m_position.y};
float randomAngle = 0.0f;
- //check if value is overthe 360 degrees
if(emitter.m_maxAngle < emitter.m_minAngle)
{
randomAngle = ((emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle + 360 - emitter.m_minAngle + 1))))%360);
@@ -47,8 +39,6 @@ void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
{
randomAngle = emitter.m_minAngle + (std::rand() % (static_cast<uint32_t>(emitter.m_maxAngle - emitter.m_minAngle + 1)));
}
-
-
float angleInRadians = randomAngle * (M_PI / 180.0f);
float randomSpeedOffset = (static_cast<float>(std::rand()) / RAND_MAX) * (2 * emitter.m_speedOffset) - emitter.m_speedOffset;
float velocityX = (emitter.m_speed + randomSpeedOffset) * std::cos(angleInRadians);
@@ -57,23 +47,12 @@ void ParticleSystem::emitParticle(ParticleEmitter& emitter) {
velocityX,
velocityY
};
- // std::cout << "emitter.m_endLifespan:" << emitter.m_endLifespan << std::endl;
for (size_t i = 0; i < emitter.particles.size(); i++)
{
if(!emitter.particles[i].active)
{
- // std::cout << "active " << emitter.particles[i].active << std::endl;
- // std::cout << "lifespan " << emitter.particles[i].lifespan << std::endl;
- // std::cout << "timeInLife " << emitter.particles[i].timeInLife << std::endl;
- // std::cout << "emitter.m_endLifespan" << emitter.m_endLifespan << std::endl;
- // std::cout << "initialPositionx" << initialPosition.x << std::endl;
- // std::cout << "initialPositiony" << initialPosition.y << std::endl;
- // std::cout << "initialVelocityx" << initialVelocity.x << std::endl;
- // std::cout << "initialVelocityy" << initialVelocity.y << std::endl;
emitter.particles[i].reset(emitter.m_endLifespan, initialPosition, initialVelocity);
break;
}
}
-
- //emitter.particles.emplace_back(emitter.m_endLifespan, initialPosition, initialVelocity);
}