diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp')
| -rw-r--r-- | PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp b/PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp index fabb1016..b7988989 100644 --- a/PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp +++ b/PhysX_3.4/Source/LowLevelDynamics/src/DyDynamics.cpp @@ -2626,7 +2626,7 @@ static PxU32 createFinalizeContacts_Parallel(PxSolverBodyData* solverBodyData, T if(contactDescPtr[header.mStartIndex].constraintLengthOver16 == DY_SC_TYPE_RB_CONTACT) { - SolverConstraintPrepState::Enum state = SolverConstraintPrepState::eUNBATCHABLE; + PxSolverContactDesc blockDescs[4]; PxsContactManagerOutput* cmOutputs[4]; @@ -2679,6 +2679,8 @@ static PxU32 createFinalizeContacts_Parallel(PxSolverBodyData* solverBodyData, T } +#if DY_BATCH_CONSTRAINTS + SolverConstraintPrepState::Enum state = SolverConstraintPrepState::eUNBATCHABLE; if(header.mStride == 4) { //KS - todo - plumb in axisConstraintCount into this method to keep track of the number of axes @@ -2692,6 +2694,7 @@ static PxU32 createFinalizeContacts_Parallel(PxSolverBodyData* solverBodyData, T } if(SolverConstraintPrepState::eSUCCESS != state) +#endif { for(PxU32 i = 0; i < header.mStride; ++i) { @@ -2766,7 +2769,7 @@ static PxU32 createFinalizeContacts_Parallel(PxSolverBodyData* solverBodyData, T prepDesc.minResponseThreshold = constraint->minResponseThreshold; } -#if DY_BATCH_1D +#if DY_BATCH_CONSTRAINTS && DY_BATCH_1D SolverConstraintPrepState::Enum state = SolverConstraintPrepState::eUNBATCHABLE; if(header.mStride == 4) { |