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

Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release 

Former-commit-id: 2aeee76d912fe28845cf3654374a70f6035f115b [formerly e5bc7e35688b44ed78e6b76cd2a448ec0f1bb89e] [formerly e2924ddad7955a7b4aa0b11932a4019bddfdf19e [formerly 30651b18c45b8da9bcfda621a6b21d42520e85a1]]
Former-commit-id: 205e52c5da9e9da01a48285f71f9b9dc7603f29b [formerly a4040aaacf0c0eb7625ab739123116e18a4a07a8]
Former-commit-id: abb37a852646924793a2cfd00b74a05c00479cb3
This commit is contained in:
Lynix 2016-08-06 01:07:09 +02:00
parent dda41dbd8a
commit 218dfc9bb1
4 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Graphics/ParticleEmitter.hpp
View File

@ -20,7 +20,7 @@ namespace Nz
{
public:
ParticleEmitter();
ParticleEmitter(const ParticleEmitter& emitter) = default;
ParticleEmitter(const ParticleEmitter& emitter);
ParticleEmitter(ParticleEmitter&& emitter);
virtual ~ParticleEmitter();
@ -40,7 +40,7 @@ namespace Nz
ParticleEmitter& operator=(ParticleEmitter&& emitter);
// Signals:
NazaraSignal(OnParticleEmitterMove, const ParticleEmitter* /*oldParticleEmitter*/, const ParticleEmitter* /*newParticleEmitter*/);
NazaraSignal(OnParticleEmitterMove, ParticleEmitter* /*oldParticleEmitter*/, ParticleEmitter* /*newParticleEmitter*/);
NazaraSignal(OnParticleEmitterRelease, const ParticleEmitter* /*particleEmitter*/);
private:

12
include/Nazara/Graphics/ParticleGroup.hpp
View File

@ -68,12 +68,22 @@ namespace Nz
private:
void MakeBoundingVolume() const override;
void OnEmitterMove(ParticleEmitter* oldEmitter, ParticleEmitter* newEmitter);
void OnEmitterRelease(const ParticleEmitter* emitter);
void ResizeBuffer();
struct EmitterEntry
{
NazaraSlot(ParticleEmitter, OnParticleEmitterMove, moveSlot);
NazaraSlot(ParticleEmitter, OnParticleEmitterRelease, releaseSlot);
ParticleEmitter* emitter;
};
std::set<unsigned int, std::greater<unsigned int>> m_dyingParticles;
mutable std::vector<UInt8> m_buffer;
std::vector<ParticleControllerRef> m_controllers;
std::vector<ParticleEmitter*> m_emitters;
std::vector<EmitterEntry> m_emitters;
std::vector<ParticleGeneratorRef> m_generators;
ParticleDeclarationConstRef m_declaration;
ParticleRendererRef m_renderer;

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

@ -32,6 +32,14 @@ namespace Nz
{
}
ParticleEmitter::ParticleEmitter(const ParticleEmitter& emitter) :
m_lagCompensationEnabled(emitter.m_lagCompensationEnabled),
m_emissionAccumulator(0.f),
m_emissionRate(emitter.m_emissionRate),
m_emissionCount(emitter.m_emissionCount)
{
}
ParticleEmitter::ParticleEmitter(ParticleEmitter&& emitter) :
m_lagCompensationEnabled(emitter.m_lagCompensationEnabled),
m_emissionAccumulator(0.f),

42
src/Nazara/Graphics/ParticleGroup.cpp
View File

@ -109,7 +109,12 @@ namespace Nz
{
NazaraAssert(emitter, "Invalid particle emitter");
m_emitters.emplace_back(emitter);
EmitterEntry entry;
entry.emitter = emitter;
entry.moveSlot.Connect(emitter->OnParticleEmitterMove, this, &ParticleGroup::OnEmitterMove);
entry.releaseSlot.Connect(emitter->OnParticleEmitterRelease, this, &ParticleGroup::OnEmitterRelease);
m_emitters.emplace_back(std::move(entry));
}
/*!
@ -336,9 +341,14 @@ namespace Nz
void ParticleGroup::RemoveEmitter(ParticleEmitter* emitter)
{
auto it = std::find(m_emitters.begin(), m_emitters.end(), emitter);
if (it != m_emitters.end())
m_emitters.erase(it);
for (auto it = m_emitters.begin(); it != m_emitters.end(); ++it)
{
if (it->emitter == emitter)
{
m_emitters.erase(it);
break;
}
}
}
/*!
@ -374,8 +384,8 @@ namespace Nz
void ParticleGroup::Update(float elapsedTime)
{
// Emission
for (ParticleEmitter* emitter : m_emitters)
emitter->Emit(*this, elapsedTime);
for (const EmitterEntry& entry : m_emitters)
entry.emitter->Emit(*this, elapsedTime);
// Update
if (m_particleCount > 0)
@ -443,6 +453,26 @@ namespace Nz
m_boundingVolume.MakeInfinite();
}
void ParticleGroup::OnEmitterMove(ParticleEmitter* oldEmitter, ParticleEmitter* newEmitter)
{
for (EmitterEntry& entry : m_emitters)
{
if (entry.emitter == oldEmitter)
entry.emitter = newEmitter;
}
}
void ParticleGroup::OnEmitterRelease(const ParticleEmitter* emitter)
{
for (auto it = m_emitters.begin(); it != m_emitters.end();)
{
if (it->emitter == emitter)
it = m_emitters.erase(it);
else
++it;
}
}
/*!
* \brief Resizes the internal buffer
*