PhysX 3.4, APEX 1.4 patch release @21821222

9 files changed, 15 insertions, 15 deletions

diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_AABBSweep.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_AABBSweep.cpp
index f353d55c..4c4efe3d 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_AABBSweep.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_AABBSweep.cpp
@@ -31,7 +31,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 #define SWEEP_AABB_IMPL
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_BoxOverlap.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_BoxOverlap.cpp
index f949d220..a3605cff 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_BoxOverlap.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_BoxOverlap.cpp
@@ -31,7 +31,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
@@ -153,10 +153,10 @@ public:
 			if(intersectTriangleBoxBV4(params->mVerts[VRef0], params->mVerts[VRef1], params->mVerts[VRef2], params->mRModelToBox_Padded, params->mTModelToBox_Padded, params->mBoxExtents_PaddedAligned))
 			{
 				OBBParamsAll* ParamsAll = static_cast<OBBParamsAll*>(params);
-				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
-				ParamsAll->mNbHits++;
 				if(ParamsAll->mNbHits==ParamsAll->mMaxNbHits)
 					return 1;
+				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
+				ParamsAll->mNbHits++;
 			}
 			primIndex++;
 		}while(nbToGo--);
@@ -373,10 +373,10 @@ public:
 		{
 			if(__CapsuleTriangle(ParamsAll, primIndex))
 			{
-				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
-				ParamsAll->mNbHits++;
 				if(ParamsAll->mNbHits==ParamsAll->mMaxNbHits)
 					return 1;
+				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
+				ParamsAll->mNbHits++;
 			}
 			primIndex++;
 		}while(nbToGo--);
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweep.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweep.cpp
index 3a1e5266..46141ba5 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweep.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweep.cpp
@@ -32,7 +32,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweepAA.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweepAA.cpp
index ff10270b..2ce7f17a 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweepAA.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_CapsuleSweepAA.cpp
@@ -32,7 +32,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_OBBSweep.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_OBBSweep.cpp
index 6378005d..097ab63d 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_OBBSweep.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_OBBSweep.cpp
@@ -31,7 +31,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
 #include "GuBV4_BoxSweep_Internal.h"
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_Raycast.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_Raycast.cpp
index e13a71c6..82cdc40d 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_Raycast.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_Raycast.cpp
@@ -31,7 +31,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PxQueryReport.h"
 #include "GuInternal.h"
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereOverlap.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereOverlap.cpp
index 259347c3..49ade4b8 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereOverlap.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereOverlap.cpp
@@ -31,7 +31,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
@@ -228,10 +228,10 @@ public:
 			if(__SphereTriangle(params, primIndex))
 			{
 				SphereParamsAll* ParamsAll = static_cast<SphereParamsAll*>(params);
-				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
-				ParamsAll->mNbHits++;
 				if(ParamsAll->mNbHits==ParamsAll->mMaxNbHits)
 					return 1;
+				ParamsAll->mHits[ParamsAll->mNbHits] = primIndex;
+				ParamsAll->mNbHits++;
 			}
 			primIndex++;
 		}while(nbToGo--);
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereSweep.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereSweep.cpp
index d6b13cae..9139b7cc 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereSweep.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuBV4_SphereSweep.cpp
@@ -38,7 +38,7 @@
 using namespace physx;
 using namespace Gu;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY  && !defined(PX_SIMD_DISABLED)
 
 #include "PsVecMath.h"
 using namespace physx::shdfnd::aos;
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseBV4.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseBV4.cpp
index 084b29e2..06aa4c7e 100644
--- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseBV4.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseBV4.cpp
@@ -57,7 +57,7 @@ using namespace physx;
 using namespace Gu;
 using namespace Cm;
 
-#if PX_INTEL_FAMILY
+#if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED)
 Ps::IntBool	BV4_RaycastSingle		(const PxVec3& origin, const PxVec3& dir, const BV4Tree& tree, const PxMat44* PX_RESTRICT worldm_Aligned, PxRaycastHit* PX_RESTRICT hit, float maxDist, float geomEpsilon, PxU32 flags, PxHitFlags hitFlags);
 PxU32		BV4_RaycastAll			(const PxVec3& origin, const PxVec3& dir, const BV4Tree& tree, const PxMat44* PX_RESTRICT worldm_Aligned, PxRaycastHit* PX_RESTRICT hits, PxU32 maxNbHits, float maxDist, float geomEpsilon, PxU32 flags, PxHitFlags hitFlags);
 void		BV4_RaycastCB			(const PxVec3& origin, const PxVec3& dir, const BV4Tree& tree, const PxMat44* PX_RESTRICT worldm_Aligned, float maxDist, float geomEpsilon, PxU32 flags, MeshRayCallback callback, void* userData);