Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.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/btStaticPlaneShape.h (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.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 @@
 
 ///The btStaticPlaneShape simulates an infinite non-moving (static) collision plane.
-class btStaticPlaneShape : public btConcaveShape
+ATTRIBUTE_ALIGNED16(class) btStaticPlaneShape : public btConcaveShape
 {
 protected:
@@ -59 +59 @@
         virtual const char*     getName()const {return "STATICPLANE";}
 
+        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  btStaticPlaneShapeData
+{
+        btCollisionShapeData    m_collisionShapeData;
+
+        btVector3FloatData      m_localScaling;
+        btVector3FloatData      m_planeNormal;
+        float                   m_planeConstant;
+        char    m_pad[4];
+};
+
+
+SIMD_FORCE_INLINE       int     btStaticPlaneShape::calculateSerializeBufferSize() const
+{
+        return sizeof(btStaticPlaneShapeData);
+}
+
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE       const char*     btStaticPlaneShape::serialize(void* dataBuffer, btSerializer* serializer) const
+{
+        btStaticPlaneShapeData* planeData = (btStaticPlaneShapeData*) dataBuffer;
+        btCollisionShape::serialize(&planeData->m_collisionShapeData,serializer);
+
+        m_localScaling.serializeFloat(planeData->m_localScaling);
+        m_planeNormal.serializeFloat(planeData->m_planeNormal);
+        planeData->m_planeConstant = float(m_planeConstant);
+                
+        return "btStaticPlaneShapeData";
+}
+
+
 #endif //STATIC_PLANE_SHAPE_H
+
+
+