diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-10-23 21:54:28 +0200 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-10-23 21:54:28 +0200 |
commit | 9b7be419c9dcc6ebd1e504713c7b2676ca3d2fdf (patch) | |
tree | 97a2fc5ce1ec1345bd6f44889682ea9a2ffafd76 /src/crepe/ParticleSystem.cpp | |
parent | 080ad535e6fc6666b919b1a21b6986aaf9b678eb (diff) |
`clang-format`
Diffstat (limited to 'src/crepe/ParticleSystem.cpp')
-rw-r--r-- | src/crepe/ParticleSystem.cpp | 99 |
1 files changed, 51 insertions, 48 deletions
diff --git a/src/crepe/ParticleSystem.cpp b/src/crepe/ParticleSystem.cpp index bf7f8fc..f0220a1 100644 --- a/src/crepe/ParticleSystem.cpp +++ b/src/crepe/ParticleSystem.cpp @@ -1,59 +1,62 @@ #include "ParticleSystem.h" +#include "ComponentManager.h" +#include "Particle.h" +#include "api/ParticleEmitter.h" #include <cmath> #include <ctime> -#include "api/ParticleEmitter.h" -#include "Particle.h" -#include "ComponentManager.h" using namespace crepe; -ParticleSystem::ParticleSystem() : m_elapsedTime(0.0f) {} // Initialize m_elapsedTime to 0 +ParticleSystem::ParticleSystem() + : m_elapsed_time(0.0f) {} // Initialize m_elapsedTime to 0 void ParticleSystem::update() { - ComponentManager& mgr = ComponentManager::get_instance(); - std::vector<std::reference_wrapper<ParticleEmitter>> emitters = mgr.get_components_by_type<ParticleEmitter>(); - float deltaTime = 0.10; - for (ParticleEmitter& emitter : emitters) { - float updateAmount = 1/static_cast<float>(emitter.m_emissionRate); - for (float i = 0; i < deltaTime; i += updateAmount) - { - emitParticle(emitter); - } - for (size_t j = 0; j < emitter.particles.size(); j++) - { - if(emitter.particles[j].active) - { - emitter.particles[j].update(deltaTime); - } - } - } + ComponentManager & mgr = ComponentManager::get_instance(); + std::vector<std::reference_wrapper<ParticleEmitter>> emitters + = mgr.get_components_by_type<ParticleEmitter>(); + float delta_time = 0.10; + for (ParticleEmitter & emitter : emitters) { + float update_amount = 1 / static_cast<float>(emitter.m_emission_rate); + for (float i = 0; i < delta_time; i += update_amount) { + emit_particle(emitter); + } + for (size_t j = 0; j < emitter.particles.size(); j++) { + if (emitter.particles[j].active) { + emitter.particles[j].update(delta_time); + } + } + } } -void ParticleSystem::emitParticle(ParticleEmitter& emitter) { - Position initialPosition = { emitter.m_position.x, emitter.m_position.y}; - float randomAngle = 0.0f; - 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); - } - else - { - 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); - float velocityY = (emitter.m_speed + randomSpeedOffset) * std::sin(angleInRadians); - Position initialVelocity = { - velocityX, - velocityY - }; - for (size_t i = 0; i < emitter.particles.size(); i++) - { - if(!emitter.particles[i].active) - { - emitter.particles[i].reset(emitter.m_endLifespan, initialPosition, initialVelocity); - break; - } - } +void ParticleSystem::emit_particle(ParticleEmitter & emitter) { + Position initial_position = {emitter.m_position.x, emitter.m_position.y}; + float random_angle = 0.0f; + if (emitter.m_max_angle < emitter.m_min_angle) { + random_angle = ((emitter.m_min_angle + + (std::rand() + % (static_cast<uint32_t>(emitter.m_max_angle + 360 + - emitter.m_min_angle + 1)))) + % 360); + } else { + random_angle = emitter.m_min_angle + + (std::rand() + % (static_cast<uint32_t>(emitter.m_max_angle + - emitter.m_min_angle + 1))); + } + float angle_in_radians = random_angle * (M_PI / 180.0f); + float random_speed_offset = (static_cast<float>(std::rand()) / RAND_MAX) + * (2 * emitter.m_speed_offset) + - emitter.m_speed_offset; + float velocity_x + = (emitter.m_speed + random_speed_offset) * std::cos(angle_in_radians); + float velocity_y + = (emitter.m_speed + random_speed_offset) * std::sin(angle_in_radians); + Position initial_velocity = {velocity_x, velocity_y}; + for (size_t i = 0; i < emitter.particles.size(); i++) { + if (!emitter.particles[i].active) { + emitter.particles[i].reset(emitter.m_end_lifespan, initial_position, + initial_velocity); + break; + } + } } |