sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed particle callbacks arguments (offset, count) => (startId, endId) 

Former-commit-id: 24550dad44e55aa9dfabaf916cbfb8e25df0451a
This commit is contained in:
Lynix 2014-08-08 20:59:49 +02:00
parent e9267d7f43
commit 202f675301
4 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/ParticleController.hpp
View File

@ -25,7 +25,7 @@ class NAZARA_API NzParticleController : public NzResource
NzParticleController(const NzParticleController& controller); NzParticleController(const NzParticleController& controller);
virtual ~NzParticleController(); virtual ~NzParticleController();
virtual void Apply(NzParticleEmitter& emitter, NzParticleMapper& mapper, unsigned int offset, unsigned int particleCount, float elapsedTime) = 0; virtual void Apply(NzParticleEmitter& emitter, NzParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) = 0;
}; };
#endif // NAZARA_PARTICLECONTROLLER_HPP #endif // NAZARA_PARTICLECONTROLLER_HPP

2
include/Nazara/Graphics/ParticleGenerator.hpp
View File

@ -25,7 +25,7 @@ class NAZARA_API NzParticleGenerator : public NzResource
NzParticleGenerator(const NzParticleGenerator& generator); NzParticleGenerator(const NzParticleGenerator& generator);
virtual ~NzParticleGenerator(); virtual ~NzParticleGenerator();
virtual void Generate(NzParticleEmitter& emitter, NzParticleMapper& mapper, unsigned int offset, unsigned int particleCount) = 0; virtual void Generate(NzParticleEmitter& emitter, NzParticleMapper& mapper, unsigned int startId, unsigned int endId) = 0;
}; };
#endif // NAZARA_PARTICLEGENERATOR_HPP #endif // NAZARA_PARTICLEGENERATOR_HPP

2
include/Nazara/Graphics/ParticleRenderer.hpp
View File

@ -26,7 +26,7 @@ class NAZARA_API NzParticleRenderer : public NzResource
NzParticleRenderer(const NzParticleRenderer& renderer); NzParticleRenderer(const NzParticleRenderer& renderer);
virtual ~NzParticleRenderer(); virtual ~NzParticleRenderer();
virtual void Render(const NzParticleEmitter& emitter, const NzParticleMapper& mapper, unsigned int offset, unsigned int particleCount, NzAbstractRenderQueue* renderQueue) = 0; virtual void Render(const NzParticleEmitter& emitter, const NzParticleMapper& mapper, unsigned int startId, unsigned int endId, NzAbstractRenderQueue* renderQueue) = 0;
}; };
#endif // NAZARA_PARTICLERENDERER_HPP #endif // NAZARA_PARTICLERENDERER_HPP

13
src/Nazara/Graphics/ParticleEmitter.cpp
View File

@ -72,9 +72,11 @@ void NzParticleEmitter::AddGenerator(NzParticleGenerator* generator)
void NzParticleEmitter::AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const void NzParticleEmitter::AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const
{ {
///FIXME: Vérifier le renderer ///FIXME: Vérifier le renderer
if (m_particleCount > 0)
{
NzParticleMapper mapper(m_buffer.data(), m_declaration); NzParticleMapper mapper(m_buffer.data(), m_declaration);
m_renderer->Render(*this, mapper, 0, m_particleCount-1, renderQueue);
m_renderer->Render(*this, mapper, 0, m_particleCount, renderQueue); }
} }
void* NzParticleEmitter::CreateParticle() void* NzParticleEmitter::CreateParticle()
@ -106,7 +108,7 @@ void* NzParticleEmitter::GenerateParticles(unsigned int count)
NzParticleMapper mapper(ptr, m_declaration); NzParticleMapper mapper(ptr, m_declaration);
for (NzParticleGenerator* generator : m_generators) for (NzParticleGenerator* generator : m_generators)
generator->Generate(*this, mapper, 0, m_particleCount); generator->Generate(*this, mapper, 0, m_particleCount-1);
return ptr; return ptr;
} }
@ -329,6 +331,8 @@ void NzParticleEmitter::Update()
} }
} }
if (m_particleCount > 0)
{
NzParticleMapper mapper(m_buffer.data(), m_declaration); NzParticleMapper mapper(m_buffer.data(), m_declaration);
m_processing = true; m_processing = true;
@ -340,7 +344,7 @@ void NzParticleEmitter::Update()
}); });
for (NzParticleController* controller : m_controllers) for (NzParticleController* controller : m_controllers)
controller->Apply(*this, mapper, 0, m_particleCount, elapsedTime); controller->Apply(*this, mapper, 0, m_particleCount-1, elapsedTime);
m_processing = false; m_processing = false;
onExit.Reset(); onExit.Reset();
@ -358,4 +362,5 @@ void NzParticleEmitter::Update()
KillParticles(); // Toutes les particules sont mortes, ceci est beaucoup plus rapide KillParticles(); // Toutes les particules sont mortes, ceci est beaucoup plus rapide
m_dyingParticles.clear(); m_dyingParticles.clear();
}
} }