Changeset 2882 for code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) (3 diffs)

code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h

@@ -53 +53 @@
         btVector3       m_interpolationLinearVelocity;
         btVector3       m_interpolationAngularVelocity;
+        
+        btVector3               m_anisotropicFriction;
+        bool                            m_hasAnisotropicFriction;
+        btScalar                m_contactProcessingThreshold;   
+
         btBroadphaseProxy*              m_broadphaseHandle;
         btCollisionShape*               m_collisionShape;
@@ -115 +120 @@
                 CO_COLLISION_OBJECT =1,
                 CO_RIGID_BODY,
-                CO_SOFT_BODY,
                 ///CO_GHOST_OBJECT keeps track of all objects overlapping its AABB and that pass its collision filter
                 ///It is useful for collision sensors, explosion objects, character controller etc.
-                CO_GHOST_OBJECT
+                CO_GHOST_OBJECT,
+                CO_SOFT_BODY,
+                CO_HF_FLUID
         };
 
@@ -127 +133 @@
         }
 
+        const btVector3& getAnisotropicFriction() const
+        {
+                return m_anisotropicFriction;
+        }
+        void    setAnisotropicFriction(const btVector3& anisotropicFriction)
+        {
+                m_anisotropicFriction = anisotropicFriction;
+                m_hasAnisotropicFriction = (anisotropicFriction[0]!=1.f) || (anisotropicFriction[1]!=1.f) || (anisotropicFriction[2]!=1.f);
+        }
+        bool    hasAnisotropicFriction() const
+        {
+                return m_hasAnisotropicFriction;
+        }
+
+        ///the constraint solver can discard solving contacts, if the distance is above this threshold. 0 by default.
+        ///Note that using contacts with positive distance can improve stability. It increases, however, the chance of colliding with degerate contacts, such as 'interior' triangle edges
+        void    setContactProcessingThreshold( btScalar contactProcessingThreshold)
+        {
+                m_contactProcessingThreshold = contactProcessingThreshold;
+        }
+        btScalar        getContactProcessingThreshold() const
+        {
+                return m_contactProcessingThreshold;
+        }
 
         SIMD_FORCE_INLINE bool          isStaticObject() const {