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

Sdk/ParticleEmitterComponent: Update emitter (they are no longer attached to groups) 

They are no longer attached to groups, groups attach emitters


Former-commit-id: fa4c2eb69147c7a19e9d77f952fdeaec0fdafc24 [formerly 981a7cfe37867842b4fe275cae6b04ab9f8a33c9] [formerly bc3c128bdfdb36eaf09f8f8a650c07e00d7e877c [formerly 1dc92772e589d80f59e8dab5d315387c7c57f886]]
Former-commit-id: 6420a724b368ab2e72e67154e76566c7eda9f7a5 [formerly b3912e18e589bff75f8f9a1870fbebffe208f653]
Former-commit-id: 1598b8cfb892285daee6dac7cd3283ba8447a032
This commit is contained in:
Lynix 2016-08-06 01:09:13 +02:00
parent cf287b1eb2
commit 7f707e1250
3 changed files with 18 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SDK/include/NDK/Components/ParticleEmitterComponent.hpp
View File

@ -19,28 +19,23 @@ namespace Ndk
public: public:
using SetupFunc = std::function<void(const EntityHandle& /*entity*/, Nz::ParticleMapper& /*mapper*/, unsigned int /*count*/)>; using SetupFunc = std::function<void(const EntityHandle& /*entity*/, Nz::ParticleMapper& /*mapper*/, unsigned int /*count*/)>;
ParticleEmitterComponent(Nz::ParticleGroup* group); inline ParticleEmitterComponent();
ParticleEmitterComponent(const ParticleEmitterComponent& emitter); ParticleEmitterComponent(const ParticleEmitterComponent& emitter) = default;
ParticleEmitterComponent(ParticleEmitterComponent&& emitter); ParticleEmitterComponent(ParticleEmitterComponent&& emitter) = default;
~ParticleEmitterComponent(); ~ParticleEmitterComponent() = default;
void Enable(bool active = true);
inline bool IsActive() const; inline bool IsActive() const;
void SetActive(bool active = true);
void SetGroup(Nz::ParticleGroup* group);
inline void SetSetupFunc(SetupFunc func); inline void SetSetupFunc(SetupFunc func);
static ComponentIndex componentIndex; static ComponentIndex componentIndex;
private: private:
void OnParticleGroupRelease(const Nz::ParticleGroup* particleGroup);
void SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const override; void SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const override;
NazaraSlot(Nz::ParticleGroup, OnParticleGroupRelease, m_particleGroupRelease);
SetupFunc m_setupFunc; SetupFunc m_setupFunc;
Nz::ParticleGroup* m_particleGroup;
bool m_isActive; bool m_isActive;
}; };
} }

10
SDK/include/NDK/Components/ParticleEmitterComponent.inl
View File

@ -6,6 +6,16 @@
namespace Ndk namespace Ndk
{ {
inline ParticleEmitterComponent::ParticleEmitterComponent() :
m_isActive(true)
{
}
inline void Ndk::ParticleEmitterComponent::Enable(bool active)
{
m_isActive = active;
}
inline bool ParticleEmitterComponent::IsActive() const inline bool ParticleEmitterComponent::IsActive() const
{ {
return m_isActive; return m_isActive;

46
SDK/src/NDK/Components/ParticleEmitterComponent.cpp
View File

@ -7,51 +7,9 @@
namespace Ndk namespace Ndk
{ {
ParticleEmitterComponent::ParticleEmitterComponent(Nz::ParticleGroup* group) : void ParticleEmitterComponent::SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const
m_particleGroup(group),
m_isActive(true)
{ {
if (m_particleGroup) if (m_isActive && m_setupFunc)
m_particleGroup->AddEmitter(this);
}
ParticleEmitterComponent::ParticleEmitterComponent(const ParticleEmitterComponent& emitter) :
m_particleGroup(emitter.m_particleGroup),
m_isActive(emitter.m_isActive)
{
if (m_isActive)
m_particleGroup->AddEmitter(this);
}
ParticleEmitterComponent::~ParticleEmitterComponent()
{
m_particleGroup->RemoveEmitter(this);
}
inline void Ndk::ParticleEmitterComponent::SetActive(bool active)
{
if (m_isActive != active)
{
if (active)
m_particleGroup->AddEmitter(this);
else
m_particleGroup->RemoveEmitter(this);
}
}
void ParticleEmitterComponent::SetGroup(Nz::ParticleGroup* group)
{
if (m_particleGroup)
m_particleGroup->RemoveEmitter(this);
m_particleGroup = group;
if (m_particleGroup && m_isActive)
m_particleGroup = group;
}
inline void ParticleEmitterComponent::SetupParticles(Nz::ParticleMapper& mapper, unsigned int count) const
{
if (m_setupFunc)
m_setupFunc(m_entity, mapper, count); m_setupFunc(m_entity, mapper, count);
} }