diff options
Diffstat (limited to 'PhysX_3.4/Source/LowLevel/software/include')
6 files changed, 1 insertions, 9 deletions
diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsCCD.h b/PhysX_3.4/Source/LowLevel/software/include/PxsCCD.h index 85ee5979..85c547dc 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxsCCD.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxsCCD.h @@ -365,6 +365,7 @@ struct PxsCCDPair PxReal mRestitution; // The restitution coefficient PxU32 mEstimatePass; // The current estimation pass. Used after a sweep hit was found to determine if the pair needs re-estimating. PxReal mAppliedForce; // The applied force for this pair. Only valid if the pair has been responded to. + PxReal mMaxImpulse; // The maximum impulse to be applied E_TOIType mToiType; // The TOI type (estimate, precise). bool mHasFriction; // Whether we want to simulate CCD friction for this pair diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsHeapMemoryAllocator.h b/PhysX_3.4/Source/LowLevel/software/include/PxsHeapMemoryAllocator.h index b690a7cf..37cb66b2 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxsHeapMemoryAllocator.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxsHeapMemoryAllocator.h @@ -31,8 +31,6 @@ #ifndef PXS_HEAP_MEMORY_ALLOCATOR_H #define PXS_HEAP_MEMORY_ALLOCATOR_H - -#include "DyGpuAPI.h" #include "foundation/PxSimpleTypes.h" namespace physx diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsKernelWrangler.h b/PhysX_3.4/Source/LowLevel/software/include/PxsKernelWrangler.h index a8d86229..3732f168 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxsKernelWrangler.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxsKernelWrangler.h @@ -31,7 +31,6 @@ #ifndef PXS_KERNEL_WRANGLER_H #define PXS_KERNEL_WRANGLER_H -#include "DyGpuAPI.h" #include "foundation/PxSimpleTypes.h" namespace physx diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsMemoryManager.h b/PhysX_3.4/Source/LowLevel/software/include/PxsMemoryManager.h index 63b1aa2f..9a98a4d9 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxsMemoryManager.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxsMemoryManager.h @@ -33,7 +33,6 @@ #include "foundation/PxPreprocessor.h" #include "foundation/PxSimpleTypes.h" -#include "DyGpuAPI.h" #include "CmPhysXCommon.h" namespace physx diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsSimulationController.h b/PhysX_3.4/Source/LowLevel/software/include/PxsSimulationController.h index 9a087825..4510c6b7 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxsSimulationController.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxsSimulationController.h @@ -34,7 +34,6 @@ #include "foundation/PxSimpleTypes.h" #include "foundation/PxPreprocessor.h" #include "foundation/PxTransform.h" -#include "DyGpuAPI.h" #include "CmBitMap.h" #include "PsArray.h" diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h b/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h index 20abe843..f3fd4140 100644 --- a/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h +++ b/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h @@ -35,10 +35,6 @@ #include "PxsContactManagerState.h" #include "PsArray.h" -#if PX_SUPPORT_GPU_PHYSX -#include "Pxg.h" -#endif - namespace physx { |