From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp') diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp index 078f3a24..4b430183 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp @@ -67,11 +67,11 @@ void Scb::ParticleSystem::ForceUpdates::destroy() //----------------------------------------------------------------------------// -Scb::ParticleSystem::ParticleSystem(const PxActorType::Enum& actorType, PxU32 maxParticles, bool perParticleRestOffset) -: mParticleSystem(actorType, maxParticles, perParticleRestOffset) -, mReadParticleFluidData(NULL) +Scb::ParticleSystem::ParticleSystem(const PxActorType::Enum& actorType, PxU32 maxParticles, bool perParticleRestOffset) : + mParticleSystem (actorType, maxParticles, perParticleRestOffset), + mReadParticleFluidData (NULL) { - setScbType(ScbType::PARTICLE_SYSTEM); + setScbType(ScbType::ePARTICLE_SYSTEM); } //----------------------------------------------------------------------------// @@ -279,8 +279,8 @@ void Scb::ParticleSystem::syncState() { LOCK_PARTICLE_USER_BUFFERS("PxScene::fetchResults()") - PxU32 flags = getBufferFlags(); - if (flags) // Optimization to avoid all the if-statements below if possible + const PxU32 flags = getBufferFlags(); + if(flags) // Optimization to avoid all the if-statements below if possible { const Buf& buffer = *getParticleSystemBuffer(); @@ -294,7 +294,7 @@ void Scb::ParticleSystem::syncState() flush(buffer); flush(buffer); - if (flags & Buf::BF_ResetFiltering) + if(flags & Buf::BF_ResetFiltering) mParticleSystem.resetFiltering(); flush(buffer); -- cgit v1.2.3