diff options
| author | sschirm <[email protected]> | 2016-12-23 14:20:36 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2016-12-23 14:56:17 +0100 |
| commit | ef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch) | |
| tree | 710426e8daa605551ce3f34b581897011101c30f /PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp | |
| parent | Initial commit: (diff) | |
| download | physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.tar.xz physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.zip | |
PhysX 3.4 / APEX 1.4 release candidate @21506124
Diffstat (limited to 'PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp')
| -rw-r--r-- | PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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<Buf::BF_DynamicFriction>(buffer); flush<Buf::BF_StaticFriction>(buffer); - if (flags & Buf::BF_ResetFiltering) + if(flags & Buf::BF_ResetFiltering) mParticleSystem.resetFiltering(); flush<Buf::BF_SimulationFilterData>(buffer); |