diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2018-09-25 11:33:48 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2018-09-25 11:33:48 -0500 |
| commit | ad993f2926db6fe4ba2c75e17c4f099d9d853038 (patch) | |
| tree | 426f831e7aa870a4704b8dd082538ff292e751f9 /PhysX_3.4/Source/PhysX/src/buffering | |
| parent | PhysX 3.4, APEX 1.4 patch release @24698370 (diff) | |
| download | physx-3.4-ad993f2926db6fe4ba2c75e17c4f099d9d853038.tar.xz physx-3.4-ad993f2926db6fe4ba2c75e17c4f099d9d853038.zip | |
PhysX 3.4, APEX 1.4 patch release @24990349
Diffstat (limited to 'PhysX_3.4/Source/PhysX/src/buffering')
4 files changed, 3 insertions, 5 deletions
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h index 9c8b66b4..1366812b 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h @@ -257,6 +257,7 @@ PX_INLINE void ArticulationJoint::syncState() flush<Buf::BF_TwistLimitEnabled>(buffer); flush<Buf::BF_TangentialStiffness>(buffer); flush<Buf::BF_TangentialDamping>(buffer); + flush<Buf::BF_DriveType>(buffer); if(isBuffered(Buf::BF_SwingLimit)) mJoint.setSwingLimit(buffer.mSwingLimitY, buffer.mSwingLimitZ); diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h index fb7f8387..e1ed5f7a 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h @@ -955,6 +955,7 @@ PX_INLINE void Body::syncState() flush<Buf::BF_FreezeThreshold>(buffer); flush<Buf::BF_MaxPenetrationBias>(buffer); flush<Buf::BF_MaxContactImpulse>(buffer); + flush<Buf::BF_CCDAdvanceCoefficient>(buffer); if(bufferFlags & Buf::BF_RigidBodyFlags) mBodyCore.setFlags(getScbScene()->getScScene().getSimStateDataPool(), buffer.mRigidBodyFlags); } diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp index 445557ec..9814e4ba 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp @@ -118,10 +118,7 @@ void Scb::Shape::syncState() flush<Buf::BF_Shape2Actor>(buffer); flush<Buf::BF_SimulationFilterData>(buffer); - - if(isBuffered(Buf::BF_ContactOffset)) - mShape.setContactOffset(buffer.mContactOffset); - + flush<Buf::BF_ContactOffset>(buffer); flush<Buf::BF_RestOffset>(buffer); flush<Buf::BF_Flags>(buffer); diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h index acadd163..1bcbb6ca 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h @@ -229,7 +229,6 @@ PX_INLINE Shape::Shape(const PxGeometry& geometry, PX_COMPILE_TIME_ASSERT(PxU32(ShapeBuffer::BF_ContactOffset) == PxU32(Sc::ShapeChangeNotifyFlag::eCONTACTOFFSET)); PX_COMPILE_TIME_ASSERT(PxU32(ShapeBuffer::BF_RestOffset) == PxU32(Sc::ShapeChangeNotifyFlag::eRESTOFFSET)); PX_COMPILE_TIME_ASSERT(PxU32(ShapeBuffer::BF_Flags) == PxU32(Sc::ShapeChangeNotifyFlag::eFLAGS)); - PX_COMPILE_TIME_ASSERT(PxU32(ShapeBuffer::BF_Geometry) == PxU32(Sc::ShapeChangeNotifyFlag::eGEOMETRY)); if(isExclusive) setScbType(ScbType::eSHAPE_EXCLUSIVE); |