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

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;