aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Source/SimulationController/include
diff options
context:
space:
mode:
Diffstat (limited to 'PhysX_3.4/Source/SimulationController/include')
-rw-r--r--PhysX_3.4/Source/SimulationController/include/ScConstraintCore.h2
-rw-r--r--PhysX_3.4/Source/SimulationController/include/ScScene.h3
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;