aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp
diff options
context:
space:
mode:
authorsschirm <[email protected]>2017-02-27 16:40:12 +0100
committersschirm <[email protected]>2017-03-01 18:04:26 +0100
commit7840347c32755e94a807f978f1cbb558717ac8cf (patch)
tree295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp
parentPre-release comments marking end of beta. (diff)
downloadphysx-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/GuMeshFactory.cpp')
-rw-r--r--PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp b/PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp
index 0ce25e11..838aeb2d 100644
--- a/PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/GuMeshFactory.cpp
@@ -138,10 +138,12 @@ PxTriangleMesh* GuMeshFactory::createTriangleMesh(TriangleMeshData& data)
{
PX_NEW_SERIALIZED(np, RTreeTriangleMesh)(*this, data);
}
+#if !defined(PX_SIMD_DISABLED)
else if(data.mType==PxMeshMidPhase::eBVH34)
{
PX_NEW_SERIALIZED(np, BV4TriangleMesh)(*this, data);
}
+#endif
else return NULL;
if(np)
@@ -192,8 +194,10 @@ static TriangleMeshData* loadMeshData(PxInputStream& stream)
TriangleMeshData* data;
if(midphaseID==PxMeshMidPhase::eBVH33)
data = PX_NEW(RTreeTriangleData);
+#if !defined(PX_SIMD_DISABLED)
else if(midphaseID==PxMeshMidPhase::eBVH34)
data = PX_NEW(BV4TriangleData);
+#endif
else return NULL;
// Import mesh
@@ -329,6 +333,7 @@ static TriangleMeshData* loadMeshData(PxInputStream& stream)
return NULL;
}
}
+#if !defined(PX_SIMD_DISABLED)
else if(midphaseID==PxMeshMidPhase::eBVH34)
{
BV4TriangleData* bv4data = static_cast<BV4TriangleData*>(data);
@@ -347,6 +352,7 @@ static TriangleMeshData* loadMeshData(PxInputStream& stream)
bv4data->mMeshInterface.setPointers(reinterpret_cast<IndTri32*>(tris), NULL, verts);
bv4data->mBV4Tree.mMeshInterface = &bv4data->mMeshInterface;
}
+#endif
else PX_ASSERT(0);
// Import local bounds