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/ClothImpl.h | |
| 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/ClothImpl.h')
| -rw-r--r-- | NvCloth/src/ClothImpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NvCloth/src/ClothImpl.h b/NvCloth/src/ClothImpl.h index de8ac97..d9545e2 100644 --- a/NvCloth/src/ClothImpl.h +++ b/NvCloth/src/ClothImpl.h @@ -340,7 +340,7 @@ inline physx::PxVec3 ClothImpl<T>::getGravity() const inline float safeLog2(float x) { NV_CLOTH_ASSERT_WITH_MESSAGE("safeLog2",x >= 0.0f); - return x > 0 ? physx::shdfnd::log2(x) : -FLT_MAX_EXP; + return x > 0 ? ps::log2(x) : -FLT_MAX_EXP; } inline physx::PxVec3 safeLog2(const physx::PxVec3& v) @@ -353,7 +353,7 @@ inline float safeExp2(float x) if (x <= -FLT_MAX_EXP) return 0.0f; else - return physx::shdfnd::exp2(x); + return ps::exp2(x); } inline physx::PxVec3 safeExp2(const physx::PxVec3& v) @@ -1228,7 +1228,7 @@ inline void ClothImpl<T>::clearInterpolation() if (!getChildCloth()->mTargetCollisionSpheres.empty()) { ContextLockType contextLock(getChildCloth()->mFactory); - physx::shdfnd::swap(getChildCloth()->mStartCollisionSpheres, getChildCloth()->mTargetCollisionSpheres); + ps::swap(getChildCloth()->mStartCollisionSpheres, getChildCloth()->mTargetCollisionSpheres); getChildCloth()->mTargetCollisionSpheres.resize(0); } getChildCloth()->mMotionConstraints.pop(); |