From 90963f4c0a38c705fe85101f2be5fdd09911b10f Mon Sep 17 00:00:00 2001 From: Marijn Tamis Date: Mon, 29 Apr 2019 16:21:42 +0200 Subject: Fix potential namespace issues when using NvCloth together with PhysX. --- NvCloth/extensions/src/ClothFabricCooker.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'NvCloth/extensions/src/ClothFabricCooker.cpp') diff --git a/NvCloth/extensions/src/ClothFabricCooker.cpp b/NvCloth/extensions/src/ClothFabricCooker.cpp index eda73de..c10098f 100644 --- a/NvCloth/extensions/src/ClothFabricCooker.cpp +++ b/NvCloth/extensions/src/ClothFabricCooker.cpp @@ -208,13 +208,13 @@ namespace mBending += PxMax(0.0f, 0.1f - ratio) * 3; } - PxReal mStretching; - PxReal mBending; - PxReal mShearing; + physx::PxReal mStretching; + physx::PxReal mBending; + physx::PxReal mShearing; }; - typedef shdfnd::Pair Pair; - typedef shdfnd::Pair Entry; + typedef ps::Pair Pair; + typedef ps::Pair Entry; // maintain heap status after elements have been pushed (heapify) template @@ -234,7 +234,7 @@ namespace if (!(begin[parent] < begin[current])) break; - shdfnd::swap(begin[parent], begin[current]); + ps::swap(begin[parent], begin[current]); current = parent; } } @@ -246,7 +246,7 @@ namespace T* begin = heap.begin(); T* end = heap.end(); - shdfnd::swap(begin[0], end[-1]); // exchange elements + ps::swap(begin[0], end[-1]); // exchange elements // shift down end--; @@ -261,7 +261,7 @@ namespace if (!(begin[current] < begin[child])) break; - shdfnd::swap(begin[current], begin[child]); + ps::swap(begin[current], begin[child]); current = child; } @@ -546,7 +546,7 @@ bool FabricCookerImpl::cook(const ClothMeshDesc& desc, PxVec3 gravity, bool useG const PxU32 restOffset = mSets[i]; ConstraintSorter predicate(&mIndices[indicesOffset]); - shdfnd::sort(&reorder[0], reorder.size(), predicate, nv::cloth::NonTrackingAllocator()); + ps::sort(&reorder[0], reorder.size(), predicate, nv::cloth::ps::NonTrackingAllocator()); for (PxU32 r=0; r < reorder.size(); ++r) { -- cgit v1.2.3