Changeset 8351 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCollisionShape.h

Timestamp:

Apr 28, 2011, 7:15:14 AM (14 years ago)

Author:

rgrieder

Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

• *Support for Mac OS X*
• Visual Studio 2010 support
• Bullet library update to 2.77
• OIS library update to 1.3
• Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
• Improved install target
• Compiles now with GCC 4.6
• Ogre Cg Shader plugin activated for Linux if available
• And of course lots of bug fixes

There are also some regressions:

• No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
• In game console is not working in main menu for CEGUI 0.7
• Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
• And of course lots of new bugs we don't yet know about

File:

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

code/trunk/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