diff options
Diffstat (limited to 'PhysX_3.4/Source')
5 files changed, 10 insertions, 14 deletions
diff --git a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.cpp b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.cpp index 0fed3223..df6ede0c 100644 --- a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.cpp +++ b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.cpp @@ -662,7 +662,7 @@ MBP_Pair* MBP_PairManager::addPair(PxU32 id0, PxU32 id1, const BpHandle* PX_REST PX_ASSERT(id0!=INVALID_ID); PX_ASSERT(id1!=INVALID_ID); - if(groups) + PX_ASSERT(groups); { const MBP_ObjectIndex index0 = decodeHandle_Index(id0); const MBP_ObjectIndex index1 = decodeHandle_Index(id1); diff --git a/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp b/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp index be5fccf4..10c371a0 100644 --- a/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp +++ b/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.cpp @@ -562,8 +562,8 @@ static void checkNode(IncrementalAABBTreeNode* node, IncrementalAABBTreeNode* pa PX_ASSERT(!parent->isLeaf()); PX_ASSERT(parent->mChilds[0] == node || parent->mChilds[1] == node); - ASSERT_ISVALIDVEC3V(node->mBVMin); - ASSERT_ISVALIDVEC3V(node->mBVMax); + //ASSERT_ISVALIDVEC3V(node->mBVMin); + //ASSERT_ISVALIDVEC3V(node->mBVMax); if(!node->isLeaf()) { diff --git a/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h b/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h index 040302a7..6a8f9e74 100644 --- a/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h +++ b/PhysX_3.4/Source/SceneQuery/src/SqIncrementalAABBTree.h @@ -96,22 +96,22 @@ namespace physx PX_FORCE_INLINE IncrementalAABBTreeNode* getPos(IncrementalAABBTreeNode* ) { return mChilds[0]; } PX_FORCE_INLINE IncrementalAABBTreeNode* getNeg(IncrementalAABBTreeNode* ) { return mChilds[1]; } - PX_FORCE_INLINE void getAABBCenterExtentsV(Vec4V* center, Vec4V* extents) const + PX_FORCE_INLINE void getAABBCenterExtentsV(physx::shdfnd::aos::Vec3V* center, physx::shdfnd::aos::Vec3V* extents) const { const float half = 0.5f; const FloatV halfV = FLoad(half); - *extents = V4Scale(V4Sub(mBVMax, mBVMin), halfV); - *center = V4Scale(V4Add(mBVMax, mBVMin), halfV); + *extents = Vec3V_From_Vec4V((V4Scale(V4Sub(mBVMax, mBVMin), halfV))); + *center = Vec3V_From_Vec4V((V4Scale(V4Add(mBVMax, mBVMin), halfV))); } - PX_FORCE_INLINE void getAABBCenterExtentsV2(Vec4V* center, Vec4V* extents) const + PX_FORCE_INLINE void getAABBCenterExtentsV2(physx::shdfnd::aos::Vec3V* center, physx::shdfnd::aos::Vec3V* extents) const { - *extents = V4Sub(mBVMax, mBVMin); - *center = V4Add(mBVMax, mBVMin); + *extents = Vec3V_From_Vec4V((V4Sub(mBVMax, mBVMin))); + *center = Vec3V_From_Vec4V((V4Add(mBVMax, mBVMin))); } - PX_FORCE_INLINE void getAABBMinMaxV(Vec4V* minV, Vec4V* maxV) const + PX_FORCE_INLINE void getAABBMinMaxV(physx::shdfnd::aos::Vec4V* minV, physx::shdfnd::aos::Vec4V* maxV) const { *minV = mBVMin; *maxV = mBVMax; diff --git a/PhysX_3.4/Source/SimulationController/include/ScIterators.h b/PhysX_3.4/Source/SimulationController/include/ScIterators.h index c539d783..97115db6 100644 --- a/PhysX_3.4/Source/SimulationController/include/ScIterators.h +++ b/PhysX_3.4/Source/SimulationController/include/ScIterators.h @@ -81,8 +81,6 @@ namespace Sc PxContactStreamIterator mIter; const PxReal* mForces; Contact mCurrentContact; - ShapeSim* mShape0; - ShapeSim* mShape1; }; ContactIterator() {} diff --git a/PhysX_3.4/Source/SimulationController/src/ScIterators.cpp b/PhysX_3.4/Source/SimulationController/src/ScIterators.cpp index 8273fabe..4ed8195f 100644 --- a/PhysX_3.4/Source/SimulationController/src/ScIterators.cpp +++ b/PhysX_3.4/Source/SimulationController/src/ScIterators.cpp @@ -43,8 +43,6 @@ Sc::ContactIterator::Pair::Pair(const void*& contactPatches, const void*& contac , mNumContacts(numContacts) , mIter(reinterpret_cast<const PxU8*>(contactPatches), reinterpret_cast<const PxU8*>(contactPoints), reinterpret_cast<const PxU32*>(forces + numContacts), numPatches, numContacts) , mForces(forces) -, mShape0(&shape0) -, mShape1(&shape1) { mCurrentContact.shape0 = shape0.getPxShape(); mCurrentContact.shape1 = shape1.getPxShape(); |