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

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.cpp (modified) (4 diffs)

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

@@ -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.
@@ -13 +13 @@
 3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
-
-
-btScalar gContactThresholdFactor=btScalar(0.02);
-
+#include "LinearMath/btSerializer.h"
 
 /*
@@ -46 +42 @@
 }
 
-btScalar        btCollisionShape::getContactBreakingThreshold() const
+
+btScalar        btCollisionShape::getContactBreakingThreshold(btScalar defaultContactThreshold) const
 {
-        return getAngularMotionDisc() * gContactThresholdFactor;
+        return getAngularMotionDisc() * defaultContactThreshold;
 }
+
 btScalar        btCollisionShape::getAngularMotionDisc() const
 {
@@ -97 +95 @@
         temporalAabbMax += angularMotion3d;
 }
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+const char*     btCollisionShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+        btCollisionShapeData* shapeData = (btCollisionShapeData*) dataBuffer;
+        char* name = (char*) serializer->findNameForPointer(this);
+        shapeData->m_name = (char*)serializer->getUniquePointer(name);
+        if (shapeData->m_name)
+        {
+                serializer->serializeName(name);
+        }
+        shapeData->m_shapeType = m_shapeType;
+        //shapeData->m_padding//??
+        return "btCollisionShapeData";
+}
+
+void    btCollisionShape::serializeSingleShape(btSerializer* serializer) const
+{
+        int len = calculateSerializeBufferSize();
+        btChunk* chunk = serializer->allocate(len,1);
+        const char* structType = serialize(chunk->m_oldPtr, serializer);
+        serializer->finalizeChunk(chunk,structType,BT_SHAPE_CODE,(void*)this);
+}