aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp
diff options
context:
space:
mode:
authorsschirm <[email protected]>2016-12-23 14:20:36 +0100
committersschirm <[email protected]>2016-12-23 14:56:17 +0100
commitef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch)
tree710426e8daa605551ce3f34b581897011101c30f /PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp
parentInitial commit: (diff)
downloadphysx-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/SceneQuery/src/SqBucketPruner.cpp')
-rw-r--r--PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp b/PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp
index 35a5ca13..ba0934b0 100644
--- a/PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp
+++ b/PhysX_3.4/Source/SceneQuery/src/SqBucketPruner.cpp
@@ -2219,24 +2219,24 @@ void BucketPruner::removeObjects(const PrunerHandle* handles, PxU32 count)
mCore.mDirty = true;
}
-void BucketPruner::updateObjects(const PrunerHandle* handles, const PxBounds3* newBounds, PxU32 count)
+void BucketPruner::updateObjectsAfterManualBoundsUpdates(const PrunerHandle* handles, PxU32 count)
{
if(!count)
return;
- if(newBounds)
- {
- for(PxU32 i=0;i<count;i++)
- mPool.setWorldAABB(handles[i], newBounds[i]);
- }
+ PX_UNUSED(handles);
mCore.setExternalMemory(mPool.getNbActiveObjects(), mPool.getCurrentWorldBoxes(), mPool.getObjects());
mCore.mDirty = true;
}
-void BucketPruner::updateObjects(const PrunerHandle* handles, const PxU32* indices, const PxBounds3* newBounds, PxU32 count)
+void BucketPruner::updateObjectsAndInflateBounds(const PrunerHandle* handles, const PxU32* indices, const PxBounds3* newBounds, PxU32 count)
{
- mPool.updateObjects(handles, indices, newBounds, count);
+ if(!count)
+ return;
+
+ mPool.updateObjectsAndInflateBounds(handles, indices, newBounds, count);
+
mCore.setExternalMemory(mPool.getNbActiveObjects(), mPool.getCurrentWorldBoxes(), mPool.getObjects());
mCore.mDirty = true;
}