PhysX 3.4, APEX 1.4 patch release @23879214

5 files changed, 6 insertions, 3 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;