From 345da029b934b24f33cac61462ef4abc7f89bd79 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 7 Nov 2008 04:02:32 +0000 Subject: [PATCH] minor issues, don't inline a out-of-line method, reorder members --- src/BulletCollision/CollisionDispatch/btCollisionObject.h | 2 +- .../NarrowPhaseCollision/btPersistentManifold.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/src/BulletCollision/CollisionDispatch/btCollisionObject.h index ee7202e1f..225f1db6f 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -185,7 +185,7 @@ public: SIMD_FORCE_INLINE int getActivationState() const { return m_activationState1;} - SIMD_FORCE_INLINE void setActivationState(int newState); + void setActivationState(int newState); void setDeactivationTime(btScalar time) { diff --git a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index 1bed564e5..71b9195ce 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -52,10 +52,10 @@ ATTRIBUTE_ALIGNED16( class) btPersistentManifold /// void* will allow any rigidbody class void* m_body0; void* m_body1; - btScalar m_contactBreakingThreshold; - int m_cachedPoints; + btScalar m_contactBreakingThreshold; + /// sort cached points so most isolated points come first int sortCachedPoints(const btManifoldPoint& pt);