From f395cb7579c60c1ccd4f0df2c9bebc9907d20d9b Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 9 Aug 2014 00:30:24 +0200 Subject: [PATCH] Added ParticleEmitter::GetFixedStepSize() Fixed missing implementation of ParticleEmitter::SetFixedStepSize Former-commit-id: 255fcca4afe40cccf38a561f09f29a0a4ceccd71 --- include/Nazara/Graphics/ParticleEmitter.hpp | 3 ++- src/Nazara/Graphics/ParticleEmitter.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Graphics/ParticleEmitter.hpp b/include/Nazara/Graphics/ParticleEmitter.hpp index f9d279fcc..ac85c9480 100644 --- a/include/Nazara/Graphics/ParticleEmitter.hpp +++ b/include/Nazara/Graphics/ParticleEmitter.hpp @@ -44,6 +44,7 @@ class NAZARA_API NzParticleEmitter : public NzSceneNode, NzUpdatable unsigned int GetEmissionCount() const; float GetEmissionRate() const; + float GetFixedStepSize() const; unsigned int GetMaxParticleCount() const; unsigned int GetParticleCount() const; unsigned int GetParticleSize() const; @@ -61,7 +62,7 @@ class NAZARA_API NzParticleEmitter : public NzSceneNode, NzUpdatable void SetEmissionCount(unsigned int count); void SetEmissionRate(float rate); - void SetFixedStepSize(float step); + void SetFixedStepSize(float stepSize); void SetRenderer(NzParticleRenderer* renderer); NzParticleEmitter& operator=(const NzParticleEmitter& emitter); diff --git a/src/Nazara/Graphics/ParticleEmitter.cpp b/src/Nazara/Graphics/ParticleEmitter.cpp index 7a54ef7f7..8671091bc 100644 --- a/src/Nazara/Graphics/ParticleEmitter.cpp +++ b/src/Nazara/Graphics/ParticleEmitter.cpp @@ -148,6 +148,11 @@ float NzParticleEmitter::GetEmissionRate() const return m_emissionRate; } +float NzParticleEmitter::GetFixedStepSize() const +{ + return m_stepSize; +} + unsigned int NzParticleEmitter::GetMaxParticleCount() const { return m_maxParticleCount; @@ -223,6 +228,11 @@ void NzParticleEmitter::SetEmissionRate(float rate) m_emissionRate = rate; } +void NzParticleEmitter::SetFixedStepSize(float stepSize) +{ + m_stepSize = stepSize; +} + void NzParticleEmitter::SetRenderer(NzParticleRenderer* renderer) { m_renderer = renderer;