diff --git a/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h index 12ce02e87..66f38c9dd 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h +++ b/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h @@ -56,7 +56,7 @@ public: m_contactPointFlags(0), m_appliedImpulse(0.f), m_prevRHS(0.f), - m_appliedImpulseLateral1(0.f), + m_appliedImpulseLateral1(0.f), m_appliedImpulseLateral2(0.f), m_contactMotion1(0.f), m_contactMotion2(0.f), @@ -117,7 +117,7 @@ public: btScalar m_appliedImpulse; btScalar m_prevRHS; - btScalar m_appliedImpulseLateral1; + btScalar m_appliedImpulseLateral1; btScalar m_appliedImpulseLateral2; btScalar m_contactMotion1; btScalar m_contactMotion2; diff --git a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp index f378ba73b..d1fad7a9d 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp @@ -326,7 +326,7 @@ const char* btPersistentManifold::serialize(const class btPersistentManifold* ma const btManifoldPoint& pt = manifold->getContactPoint(i); dataOut->m_pointCacheAppliedImpulse[i] = pt.m_appliedImpulse; dataOut->m_pointCachePrevRHS[i] = pt.m_prevRHS; - dataOut->m_pointCacheAppliedImpulseLateral1[i] = pt.m_appliedImpulseLateral1; + dataOut->m_pointCacheAppliedImpulseLateral1[i] = pt.m_appliedImpulseLateral1; dataOut->m_pointCacheAppliedImpulseLateral2[i] = pt.m_appliedImpulseLateral2; pt.m_localPointA.serialize(dataOut->m_pointCacheLocalPointA[i]); pt.m_localPointB.serialize(dataOut->m_pointCacheLocalPointB[i]); @@ -338,6 +338,7 @@ const char* btPersistentManifold::serialize(const class btPersistentManifold* ma dataOut->m_pointCacheFrictionCFM[i] = pt.m_frictionCFM; dataOut->m_pointCacheContactERP[i] = pt.m_contactERP; dataOut->m_pointCacheContactCFM[i] = pt.m_contactCFM; + dataOut->m_pointCacheContactPointFlags[i] = pt.m_contactPointFlags; dataOut->m_pointCacheIndex0[i] = pt.m_index0; dataOut->m_pointCacheIndex1[i] = pt.m_index1; dataOut->m_pointCachePartId0[i] = pt.m_partId0;