diff options
Diffstat (limited to 'APEX_1.4/framework')
| -rw-r--r-- | APEX_1.4/framework/src/ApexResourceProvider.cpp | 2 | ||||
| -rw-r--r-- | APEX_1.4/framework/src/ApexSceneTasks.cpp | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/APEX_1.4/framework/src/ApexResourceProvider.cpp b/APEX_1.4/framework/src/ApexResourceProvider.cpp index f9d668f4..569d338e 100644 --- a/APEX_1.4/framework/src/ApexResourceProvider.cpp +++ b/APEX_1.4/framework/src/ApexResourceProvider.cpp @@ -600,7 +600,7 @@ uint32_t ApexResourceProvider::findResourceU32(const char* nameSpace, const c { if (mResources[id].valueIsSet) { -#if PX_X64 +#if defined(PX_X64) || defined(PX_A64) uint64_t ret64 = (uint64_t)mResources[id].ptr; ret = (uint32_t)ret64; #else diff --git a/APEX_1.4/framework/src/ApexSceneTasks.cpp b/APEX_1.4/framework/src/ApexSceneTasks.cpp index 0db8ebe7..9aa98bce 100644 --- a/APEX_1.4/framework/src/ApexSceneTasks.cpp +++ b/APEX_1.4/framework/src/ApexSceneTasks.cpp @@ -72,14 +72,7 @@ void PhysXSimulateTask::run() { PX_ASSERT(mElapsedTime >= 0.0f); SCOPED_PHYSX_LOCK_WRITE(mScene); - #if APEX_UE4 - if (mScene->mPhysXScene->getNbActors(PxActorTypeFlags(0xff))) - mScene->mPhysXScene->simulate(mElapsedTime, &mCheckResultsTask, mScratchBlock, mScratchBlockSize, false); - else - mCheckResultsTask.removeReference(); - #else mScene->mPhysXScene->simulate(mElapsedTime, &mCheckResultsTask, mScratchBlock, mScratchBlockSize, false); - #endif } #endif @@ -137,12 +130,10 @@ void CheckResultsTask::run() #if PX_PHYSICS_VERSION_MAJOR == 3 { SCOPED_PHYSX_LOCK_WRITE(mScene); - if (mScene->mPhysXScene -#if APEX_UE4 - && mScene->mPhysXScene->getNbActors(PxActorTypeFlags(0xff)) -#endif - ) + if (mScene->mPhysXScene) + { mScene->mPhysXScene->checkResults(true); + } } #endif |