Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (modified) (4 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btCompoundShape.h

@@ -14 +14 @@
 */
 
-#ifndef COMPOUND_SHAPE_H
-#define COMPOUND_SHAPE_H
+#ifndef BT_COMPOUND_SHAPE_H
+#define BT_COMPOUND_SHAPE_H
 
 #include "btCollisionShape.h"
@@ -107 +107 @@
 
         ///set a new transform for a child, and update internal data structures (local aabb and dynamic tree)
-        void    updateChildTransform(int childIndex, const btTransform& newChildTransform);
+        void    updateChildTransform(int childIndex, const btTransform& newChildTransform, bool shouldRecalculateLocalAabb = true);
 
 
@@ -144 +144 @@
         }
 
-
-        btDbvt*                                                 getDynamicAabbTree()
+        const btDbvt*   getDynamicAabbTree() const
+        {
+                return m_dynamicAabbTree;
+        }
+        
+        btDbvt* getDynamicAabbTree()
         {
                 return m_dynamicAabbTree;
@@ -206 +210 @@
 
 
-#endif //COMPOUND_SHAPE_H
+#endif //BT_COMPOUND_SHAPE_H