diff options
| author | Sheikh Dawood <[email protected]> | 2018-04-09 10:13:48 -0500 |
|---|---|---|
| committer | Sheikh Dawood <[email protected]> | 2018-04-09 10:13:48 -0500 |
| commit | 238605d8225a9135d6b60646e05d066e25424eee (patch) | |
| tree | 2b013bd4946bb3c699d7a06ef1f21be85d367f63 /APEX_1.4/module/clothing | |
| parent | Add ParamTool.exe (diff) | |
| download | physx-3.4-238605d8225a9135d6b60646e05d066e25424eee.tar.xz physx-3.4-238605d8225a9135d6b60646e05d066e25424eee.zip | |
PhysX 3.4, APEX 1.4 patch release @23879214
Diffstat (limited to 'APEX_1.4/module/clothing')
8 files changed, 13 insertions, 5 deletions
diff --git a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwInterCollision.cpp b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwInterCollision.cpp index ef720d8a..848db335 100644 --- a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwInterCollision.cpp +++ b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwInterCollision.cpp @@ -23,6 +23,7 @@ #pragma warning(disable:4127) using namespace nvidia; +using namespace cloth; namespace { diff --git a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSelfCollision.cpp b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSelfCollision.cpp index 1ed741a0..6a3e18f5 100644 --- a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSelfCollision.cpp +++ b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSelfCollision.cpp @@ -22,7 +22,7 @@ #pragma warning(disable:4127) using namespace nvidia; -using namespace nvidia; +using namespace cloth; namespace { diff --git a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolver.cpp b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolver.cpp index 9b5a9f9c..13b10c6c 100644 --- a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolver.cpp +++ b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolver.cpp @@ -40,6 +40,7 @@ typedef Scalar4f Simd4fType; #endif using namespace nvidia; +using namespace cloth; cloth::SwSolver::SwSolver(nvidia::profile::PxProfileZone* profiler, PxTaskManager* taskMgr) : mProfiler(profiler) diff --git a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolverKernel.cpp b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolverKernel.cpp index 0ec58608..c6eb09fe 100644 --- a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolverKernel.cpp +++ b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/SwSolverKernel.cpp @@ -82,6 +82,7 @@ const uint32_t sAvxSupport = getAvxSupport(); // 0: no AVX, 1: AVX, 2: AVX+FMA #endif using namespace nvidia; +using namespace cloth; namespace { diff --git a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/scalar/SwCollisionHelpers.h b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/scalar/SwCollisionHelpers.h index 24667d70..14297291 100644 --- a/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/scalar/SwCollisionHelpers.h +++ b/APEX_1.4/module/clothing/embedded/LowLevelCloth/src/scalar/SwCollisionHelpers.h @@ -30,7 +30,7 @@ uint32_t findBitSet(uint32_t mask) inline Scalar4i intFloor(const Scalar4f& v) { - return Scalar4i(int(floor(v.f4[0])), int(floor(v.f4[1])), int(floor(v.f4[2])), int(floor(v.f4[3]))); + return Scalar4i(int(PxFloor(v.f4[0])), int(PxFloor(v.f4[1])), int(PxFloor(v.f4[2])), int(PxFloor(v.f4[3]))); } inline Scalar4i horizontalOr(Scalar4i mask) @@ -50,7 +50,7 @@ struct Gather<Scalar4i> Gather<Scalar4i>::Gather(const Scalar4i& index) { - uint32_t mask = physx::cloth::SwCollision<Scalar4i>::sGridSize - 1; + uint32_t mask = cloth::SwCollision<Scalar4i>::sGridSize - 1; mIndex.u4[0] = index.u4[0] & mask; mIndex.u4[1] = index.u4[1] & mask; diff --git a/APEX_1.4/module/clothing/src/SimdMath.cpp b/APEX_1.4/module/clothing/src/SimdMath.cpp index 7591277d..5ea4a520 100644 --- a/APEX_1.4/module/clothing/src/SimdMath.cpp +++ b/APEX_1.4/module/clothing/src/SimdMath.cpp @@ -19,6 +19,8 @@ using physx::PxQuat; namespace nvidia { +using namespace clothing; + bool operator != (const PxMat44& a, const PxMat44& b) { PX_ASSERT((((size_t)&a) & 0xf) == 0); // verify 16 byte alignment diff --git a/APEX_1.4/module/clothing/src/SimdMath.h b/APEX_1.4/module/clothing/src/SimdMath.h index 568b1f5b..e6cf2ea2 100644 --- a/APEX_1.4/module/clothing/src/SimdMath.h +++ b/APEX_1.4/module/clothing/src/SimdMath.h @@ -18,6 +18,9 @@ namespace nvidia { + +using namespace clothing; + /** Normalization of the (a[0], a[1], a[2]) vector * @param a input vector * @return normalized vector diff --git a/APEX_1.4/module/clothing/src/simd/NvSimdTypes.h b/APEX_1.4/module/clothing/src/simd/NvSimdTypes.h index d7b92647..7997b0ff 100644 --- a/APEX_1.4/module/clothing/src/simd/NvSimdTypes.h +++ b/APEX_1.4/module/clothing/src/simd/NvSimdTypes.h @@ -117,11 +117,11 @@ void foo(const float* ptr) * __m128i are wrapped into structs. Arguments need to be passed by reference in this mode. * \see NV_SIMD_VECTORCALL, Simd4fArg */ -#if defined NV_SIMD_USE_NAMESPACE&& NV_SIMD_USE_NAMESPACE +#ifndef NV_NO_SIMD_NAMESPACE #define NV_SIMD_NAMESPACE_BEGIN \ namespace nvidia \ { \ - namespace simd \ + namespace clothing \ { #define NV_SIMD_NAMESPACE_END \ } \ |