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

Alphabetical commit 

Former-commit-id: bacf8ab447d3022b48aac5f5ca2d337bc1283f8c
This commit is contained in:
Lynix 2015-01-19 11:57:19 +01:00
parent 5d16d7ab7e
commit e2d4ba030c
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,8 @@ class NAZARA_API NzParticleSystem : public NzSceneNode, NzUpdatable
void Register() override; void Register() override;
void ResizeBuffer(); void ResizeBuffer();
void Unregister() override; void Unregister() override;
void UpdateBoundingVolume() const;
void Update() override; void Update() override;
void UpdateBoundingVolume() const;
std::set<unsigned int, std::greater<unsigned int>> m_dyingParticles; std::set<unsigned int, std::greater<unsigned int>> m_dyingParticles;
mutable std::vector<nzUInt8> m_buffer; mutable std::vector<nzUInt8> m_buffer;

27
src/Nazara/Graphics/ParticleSystem.cpp
View File

@ -295,18 +295,6 @@ void NzParticleSystem::Unregister()
m_scene->UnregisterForUpdate(this); m_scene->UnregisterForUpdate(this);
} }
void NzParticleSystem::UpdateBoundingVolume() const
{
if (m_boundingVolume.IsNull())
GenerateAABB();
if (!m_transformMatrixUpdated)
UpdateTransformMatrix();
m_boundingVolume.Update(m_transformMatrix);
m_boundingVolumeUpdated = true;
}
void NzParticleSystem::Update() void NzParticleSystem::Update()
{ {
float elapsedTime = m_scene->GetUpdateTime(); float elapsedTime = m_scene->GetUpdateTime();
@ -345,8 +333,7 @@ void NzParticleSystem::Update()
controller->Apply(*this, mapper, 0, m_particleCount-1, elapsedTime); controller->Apply(*this, mapper, 0, m_particleCount-1, elapsedTime);
} }
m_processing = false; onExit.CallAndReset();
onExit.Reset();
// On tue maintenant les particules mortes durant la mise à jour // On tue maintenant les particules mortes durant la mise à jour
if (m_dyingParticles.size() < m_particleCount) if (m_dyingParticles.size() < m_particleCount)
@ -363,3 +350,15 @@ void NzParticleSystem::Update()
m_dyingParticles.clear(); m_dyingParticles.clear();
} }
} }
void NzParticleSystem::UpdateBoundingVolume() const
{
if (m_boundingVolume.IsNull())
GenerateAABB();
if (!m_transformMatrixUpdated)
UpdateTransformMatrix();
m_boundingVolume.Update(m_transformMatrix);
m_boundingVolumeUpdated = true;
}