Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (modified) (8 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -21 +21 @@
 #include "LinearMath/btMatrix3x3.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
+class btSerializer;
+
 
 ///The btCollisionShape class provides an interface for collision shapes that can be shared among btCollisionObjects.
@@ -47 +49 @@
         virtual btScalar        getAngularMotionDisc() const;
 
-        virtual btScalar        getContactBreakingThreshold() const;
+        virtual btScalar        getContactBreakingThreshold(btScalar defaultContactThresholdFactor) const;
 
 
@@ -54 +56 @@
         void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const;
 
-#ifndef __SPU__
+
 
         SIMD_FORCE_INLINE bool  isPolyhedral() const
@@ -61 +63 @@
         }
 
+        SIMD_FORCE_INLINE bool  isConvex2d() const
+        {
+                return btBroadphaseProxy::isConvex2d(getShapeType());
+        }
+
         SIMD_FORCE_INLINE bool  isConvex() const
         {
                 return btBroadphaseProxy::isConvex(getShapeType());
+        }
+        SIMD_FORCE_INLINE bool  isNonMoving() const
+        {
+                return btBroadphaseProxy::isNonMoving(getShapeType());
         }
         SIMD_FORCE_INLINE bool  isConcave() const
@@ -74 +85 @@
         }
 
+        SIMD_FORCE_INLINE bool  isSoftBody() const
+        {
+                return btBroadphaseProxy::isSoftBody(getShapeType());
+        }
+
         ///isInfinite is used to catch simulation error (aabb check)
         SIMD_FORCE_INLINE bool isInfinite() const
@@ -80 +96 @@
         }
 
-        
+#ifndef __SPU__
         virtual void    setLocalScaling(const btVector3& scaling) =0;
         virtual const btVector3& getLocalScaling() const =0;
@@ -107 +123 @@
         }
 
+        virtual int     calculateSerializeBufferSize() const;
+
+        ///fills the dataBuffer and returns the struct name (and 0 on failure)
+        virtual const char*     serialize(void* dataBuffer, btSerializer* serializer) const;
+
+        virtual void    serializeSingleShape(btSerializer* serializer) const;
+
 };      
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct  btCollisionShapeData
+{
+        char    *m_name;
+        int             m_shapeType;
+        char    m_padding[4];
+};
+
+SIMD_FORCE_INLINE       int     btCollisionShape::calculateSerializeBufferSize() const
+{
+        return sizeof(btCollisionShapeData);
+}
+
+
 
 #endif //COLLISION_SHAPE_H