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/cuda/CuFabric.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/cuda/CuFabric.cpp')
| -rw-r--r-- | NvCloth/src/cuda/CuFabric.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NvCloth/src/cuda/CuFabric.cpp b/NvCloth/src/cuda/CuFabric.cpp index 48cc0ba..46b7a12 100644 --- a/NvCloth/src/cuda/CuFabric.cpp +++ b/NvCloth/src/cuda/CuFabric.cpp @@ -67,7 +67,7 @@ cloth::CuFabric::CuFabric(CuFactory& factory, uint32_t numParticles, Range<const NV_CLOTH_ASSERT(sets.back() == restvalues.size()); NV_CLOTH_ASSERT(restvalues.size() * 2 == indices.size()); NV_CLOTH_ASSERT(restvalues.size() == stiffnessValues.size() || stiffnessValues.size() == 0); - NV_CLOTH_ASSERT(mNumParticles > *shdfnd::maxElement(indices.begin(), indices.end())); + NV_CLOTH_ASSERT(mNumParticles > *ps::maxElement(indices.begin(), indices.end())); // copy to device, add leading zero mSets.reserve(sets.size() + 1); @@ -106,7 +106,7 @@ cloth::CuFabric::CuFabric(CuFactory& factory, uint32_t numParticles, Range<const // tethers NV_CLOTH_ASSERT(anchors.size() == tetherLengths.size()); mTetherLengthScale = - tetherLengths.empty() ? 1.0f : *shdfnd::maxElement(tetherLengths.begin(), tetherLengths.end()) / USHRT_MAX; + tetherLengths.empty() ? 1.0f : *ps::maxElement(tetherLengths.begin(), tetherLengths.end()) / USHRT_MAX; float inverseScale = 1 / (mTetherLengthScale + FLT_EPSILON); Vector<CuTether>::Type tethers; tethers.reserve(anchors.size()); |