diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
| commit | d1c812f1162e5fdb13c215792725b2591d7428f5 (patch) | |
| tree | 407056c45c7e9320c48fca6a3697d81a061c4ea0 /PhysX_3.4/Source/SimulationController/include | |
| parent | PhysX 3.4, APEX 1.4 patch release @22121272 (diff) | |
| download | physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.tar.xz physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.zip | |
PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1
Diffstat (limited to 'PhysX_3.4/Source/SimulationController/include')
| -rw-r--r-- | PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h | 2 | ||||
| -rw-r--r-- | PhysX_3.4/Source/SimulationController/include/ScScene.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h b/PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h index 0968e4cd..7f415b1d 100644 --- a/PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h +++ b/PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h @@ -58,7 +58,7 @@ namespace Sc //================================================================================================== public: // PX_SERIALIZATION - ConstraintCore(const PxEMPTY) : mConnector(NULL), mSim(NULL) {} + ConstraintCore(const PxEMPTY) : mFlags(PxEmpty), mConnector(NULL), mSim(NULL) {} PX_FORCE_INLINE void setConstraintFunctions(PxConstraintConnector& n, const PxConstraintShaderTable& shaders) { diff --git a/PhysX_3.4/Source/SimulationController/include/ScScene.h b/PhysX_3.4/Source/SimulationController/include/ScScene.h index 19d8bb93..d6306d46 100644 --- a/PhysX_3.4/Source/SimulationController/include/ScScene.h +++ b/PhysX_3.4/Source/SimulationController/include/ScScene.h @@ -660,6 +660,8 @@ namespace Sc PX_FORCE_INLINE PxU64 getContextId() const { return mContextId; } + PX_FORCE_INLINE bool isUsingGpuRigidBodies() const { return mUseGpuRigidBodies; } + //internal private methods: private: void releaseConstraints(bool endOfScene); @@ -1019,6 +1021,7 @@ namespace Sc PxTaskManager* mTaskManager; bool mContactReportsNeedPostSolverVelocity; + bool mUseGpuRigidBodies; SimulationStage::Enum mSimulationStage; |