diff options
| author | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
| commit | 90963f4c0a38c705fe85101f2be5fdd09911b10f (patch) | |
| tree | 34ca6c9e642ce4998612e3ee5bf3264a57c21277 /NvCloth/extensions/src/ClothMeshQuadifier.cpp | |
| parent | 1.1.6 Release. (diff) | |
| download | nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.tar.xz nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.zip | |
Fix potential namespace issues when using NvCloth together with PhysX.
Diffstat (limited to 'NvCloth/extensions/src/ClothMeshQuadifier.cpp')
| -rw-r--r-- | NvCloth/extensions/src/ClothMeshQuadifier.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/NvCloth/extensions/src/ClothMeshQuadifier.cpp b/NvCloth/extensions/src/ClothMeshQuadifier.cpp index 2250c09..511fa06 100644 --- a/NvCloth/extensions/src/ClothMeshQuadifier.cpp +++ b/NvCloth/extensions/src/ClothMeshQuadifier.cpp @@ -133,7 +133,7 @@ namespace PxU32 indexMap[3][3] = { { 0, 1, 2 }, { 1, 2, 0 }, { 0, 2, 1 } }; - const PxF32 rightAngle = PxCos(shdfnd::degToRad(85.0f)); + const PxF32 rightAngle = PxCos(ps::degToRad(85.0f)); for(PxU32 i=0; i<triangles.size(); i+=3) { @@ -166,7 +166,7 @@ namespace uniqueEdges.pushBack(edges[j]); } - shdfnd::sort(uniqueEdges.begin(), uniqueEdges.size(), UniqueEdge(0, 0, 0), NonTrackingAllocator()); + ps::sort(uniqueEdges.begin(), uniqueEdges.size(), UniqueEdge(0, 0, 0), ps::NonTrackingAllocator()); PxU32 writeIndex = 0, readStart = 0, readEnd = 0; PxU32 numQuadEdges = 0; @@ -259,9 +259,9 @@ namespace } } - shdfnd::sort(hideEdges.begin(), hideEdges.size(), SortHiddenEdges(uniqueEdges), NonTrackingAllocator()); + ps::sort(hideEdges.begin(), hideEdges.size(), SortHiddenEdges(uniqueEdges), ps::NonTrackingAllocator()); - const PxF32 maxAngle = PxSin(shdfnd::degToRad(60.0f)); + const PxF32 maxAngle = PxSin(ps::degToRad(60.0f)); PxU32 numHiddenEdges = 0; |