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

Browse Source 
Former-commit-id: 6603dd15dd55be43181a2682d0357c6b0371a9f6 [formerly dcd942ae41237a51e6a4e51838f7ccbab26453a7] [formerly 6c0e05bb3e1f9c22a2db8ab7c41b61701918b0dc [formerly c104626f082f38cfc48ee3bce67ffb7f2eea0715]]
Former-commit-id: 5315a5a45cc3087df6938e95723b288d44e5a33d [formerly bd0898d00b042e3271927b063224709c5b43a05c]
Former-commit-id: c80f244a446823cb043ad8fa4f362ccbf989e36d
This commit is contained in:
Lynix
2016-08-06 01:07:09 +02:00
parent 82a082341c
commit cf287b1eb2
4 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
*