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/src/SwSolver.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/src/SwSolver.cpp')
| -rw-r--r-- | NvCloth/src/SwSolver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NvCloth/src/SwSolver.cpp b/NvCloth/src/SwSolver.cpp index a1f0cf8..b535fca 100644 --- a/NvCloth/src/SwSolver.cpp +++ b/NvCloth/src/SwSolver.cpp @@ -85,9 +85,9 @@ bool clothSizeGreater(const T& t0, const T& t1) } template <typename T> -void sortTasks(shdfnd::Array<T, cloth::NonTrackingAllocator>& tasks) +void sortTasks(ps::Array<T, nv::cloth::ps::NonTrackingAllocator>& tasks) { - shdfnd::sort(tasks.begin(), tasks.size(), &clothSizeGreater<T>, nv::cloth::NonTrackingAllocator()); + ps::sort(tasks.begin(), tasks.size(), &clothSizeGreater<T>, nv::cloth::ps::NonTrackingAllocator()); } } @@ -295,7 +295,7 @@ void cloth::SwSolver::SimulatedCloth::Simulate() IterationStateFactory factory(*mCloth, mParent->mCurrentDt); mInvNumIterations = factory.mInvNumIterations; - shdfnd::SIMDGuard simdGuard; + ps::SIMDGuard simdGuard; SwClothData data(*mCloth, mCloth->mFabric); SwKernelAllocator allocator(mScratchMemory, uint32_t(mScratchMemorySize)); |