Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) (6 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.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.
@@ -63 +63 @@
         int                                                             m_updateRevision;
 
+        btScalar        m_collisionMargin;
+
+protected:
+        btVector3       m_localScaling;
+
 public:
         BT_DECLARE_ALIGNED_ALLOCATOR();
@@ -117 +122 @@
         virtual void recalculateLocalAabb(); 
 
-        virtual void    setLocalScaling(const btVector3& scaling)
-        {
-                m_localScaling = scaling;
-        }
+        virtual void    setLocalScaling(const btVector3& scaling);
+
         virtual const btVector3& getLocalScaling() const 
         {
@@ -141 +144 @@
         }
 
-        //this is optional, but should make collision queries faster, by culling non-overlapping nodes
-        void    createAabbTreeFromChildren();
 
         btDbvt*                                                 getDynamicAabbTree()
@@ -148 +149 @@
                 return m_dynamicAabbTree;
         }
+
+        void createAabbTreeFromChildren();
 
         ///computes the exact moment of inertia and the transform from the coordinate system defined by the principal axes of the moment of inertia
@@ -161 +164 @@
         }
 
-private:
-        btScalar        m_collisionMargin;
-protected:
-        btVector3       m_localScaling;
-
-};
+        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;
+
+
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct btCompoundShapeChildData
+{
+        btTransformFloatData    m_transform;
+        btCollisionShapeData    *m_childShape;
+        int                                             m_childShapeType;
+        float                                   m_childMargin;
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct  btCompoundShapeData
+{
+        btCollisionShapeData            m_collisionShapeData;
+
+        btCompoundShapeChildData        *m_childShapePtr;
+
+        int                                                     m_numChildShapes;
+
+        float   m_collisionMargin;
+
+};
+
+
+SIMD_FORCE_INLINE       int     btCompoundShape::calculateSerializeBufferSize() const
+{
+        return sizeof(btCompoundShapeData);
+}
+
+
+
+