diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /PhysX_3.4/Source/GeomUtils/src/mesh | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'PhysX_3.4/Source/GeomUtils/src/mesh')
| -rw-r--r-- | PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseInterface.h | 18 | ||||
| -rw-r--r-- | PhysX_3.4/Source/GeomUtils/src/mesh/GuSweepsMesh.cpp | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseInterface.h b/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseInterface.h index cb7ae145..515bab3a 100644 --- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseInterface.h +++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuMidphaseInterface.h @@ -181,7 +181,7 @@ namespace Midphase } } - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) #else static PxU32 unsupportedMidphase( const TriangleMesh*, const PxTriangleMeshGeometry&, const PxTransform&, const PxVec3&, const PxVec3&, PxReal, @@ -222,7 +222,7 @@ namespace Midphase static const MidphaseRaycastFunction gMidphaseRaycastTable[PxMeshMidPhase::eLAST] = { raycast_triangleMesh_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) raycast_triangleMesh_BV4, #else unsupportedMidphase, @@ -232,7 +232,7 @@ namespace Midphase static const MidphaseSphereOverlapFunction gMidphaseSphereOverlapTable[PxMeshMidPhase::eLAST] = { intersectSphereVsMesh_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) intersectSphereVsMesh_BV4, #else unsupportedSphereOverlapMidphase, @@ -242,7 +242,7 @@ namespace Midphase static const MidphaseBoxOverlapFunction gMidphaseBoxOverlapTable[PxMeshMidPhase::eLAST] = { intersectBoxVsMesh_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) intersectBoxVsMesh_BV4, #else unsupportedBoxOverlapMidphase, @@ -252,7 +252,7 @@ namespace Midphase static const MidphaseCapsuleOverlapFunction gMidphaseCapsuleOverlapTable[PxMeshMidPhase::eLAST] = { intersectCapsuleVsMesh_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) intersectCapsuleVsMesh_BV4, #else unsupportedCapsuleOverlapMidphase, @@ -262,7 +262,7 @@ namespace Midphase static const MidphaseBoxCBOverlapFunction gMidphaseBoxCBOverlapTable[PxMeshMidPhase::eLAST] = { intersectOBB_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) intersectOBB_BV4, #else unsupportedBoxCBOverlapMidphase, @@ -272,7 +272,7 @@ namespace Midphase static const MidphaseBoxSweepFunction gMidphaseBoxSweepTable[PxMeshMidPhase::eLAST] = { sweepBox_MeshGeom_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) sweepBox_MeshGeom_BV4, #else unsupportedBoxSweepMidphase, @@ -282,7 +282,7 @@ namespace Midphase static const MidphaseCapsuleSweepFunction gMidphaseCapsuleSweepTable[PxMeshMidPhase::eLAST] = { sweepCapsule_MeshGeom_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) sweepCapsule_MeshGeom_BV4, #else unsupportedCapsuleSweepMidphase, @@ -292,7 +292,7 @@ namespace Midphase static const MidphaseConvexSweepFunction gMidphaseConvexSweepTable[PxMeshMidPhase::eLAST] = { sweepConvex_MeshGeom_RTREE, - #if PX_INTEL_FAMILY + #if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) sweepConvex_MeshGeom_BV4, #else unsupportedConvexSweepMidphase, diff --git a/PhysX_3.4/Source/GeomUtils/src/mesh/GuSweepsMesh.cpp b/PhysX_3.4/Source/GeomUtils/src/mesh/GuSweepsMesh.cpp index 9f9f0543..131567d8 100644 --- a/PhysX_3.4/Source/GeomUtils/src/mesh/GuSweepsMesh.cpp +++ b/PhysX_3.4/Source/GeomUtils/src/mesh/GuSweepsMesh.cpp @@ -157,7 +157,8 @@ PxAgain SweepCapsuleMeshHitCallback::processHit( // all reported coords are in m } const PxReal alignmentValue = computeAlignmentValue(triNormal, mUnitDir); - if(keepTriangle(localHit.distance, alignmentValue, mBestDist, mBestAlignmentValue, mTrueSweepDistance, distEpsilon)) +// if(keepTriangle(localHit.distance, alignmentValue, mBestDist, mBestAlignmentValue, mTrueSweepDistance, distEpsilon)) + if(keepTriangle(localHit.distance, alignmentValue, mBestDist, mBestAlignmentValue, mTrueSweepDistance, GU_EPSILON_SAME_DISTANCE)) { mBestAlignmentValue = alignmentValue; |