Changeset 8351 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.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/btPolyhedralConvexShape.h (modified) (6 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.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.
@@ -18 +18 @@
 
 #include "LinearMath/btMatrix3x3.h"
-#include "LinearMath/btAabbUtil2.h"
 #include "btConvexInternalShape.h"
 
@@ -27 +26 @@
 
 protected:
-        btVector3       m_localAabbMin;
-        btVector3       m_localAabbMax;
-        bool            m_isLocalAabbValid;
-
+        
 public:
 
@@ -39 +35 @@
         virtual btVector3       localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
         virtual void    batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-
         
         virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+        
+        
+        virtual int     getNumVertices() const = 0 ;
+        virtual int getNumEdges() const = 0;
+        virtual void getEdge(int i,btVector3& pa,btVector3& pb) const = 0;
+        virtual void getVertex(int i,btVector3& vtx) const = 0;
+        virtual int     getNumPlanes() const = 0;
+        virtual void getPlane(btVector3& planeNormal,btVector3& planeSupport,int i ) const = 0;
+//      virtual int getIndex(int i) const = 0 ; 
 
+        virtual bool isInside(const btVector3& pt,btScalar tolerance) const = 0;
+        
+};
+
+
+///The btPolyhedralConvexAabbCachingShape adds aabb caching to the btPolyhedralConvexShape
+class btPolyhedralConvexAabbCachingShape : public btPolyhedralConvexShape
+{
+
+        btVector3       m_localAabbMin;
+        btVector3       m_localAabbMax;
+        bool            m_isLocalAabbValid;
+                
+protected:
 
         void setCachedLocalAabb (const btVector3& aabbMin, const btVector3& aabbMax)
@@ -58 +76 @@
         }
 
+public:
+
+        btPolyhedralConvexAabbCachingShape();
+        
         inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
         {
@@ -66 +88 @@
         }
 
-        
+        virtual void    setLocalScaling(const btVector3& scaling);
+
         virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
-        virtual void    setLocalScaling(const btVector3& scaling);
-
         void    recalcLocalAabb();
-
-        virtual int     getNumVertices() const = 0 ;
-        virtual int getNumEdges() const = 0;
-        virtual void getEdge(int i,btVector3& pa,btVector3& pb) const = 0;
-        virtual void getVertex(int i,btVector3& vtx) const = 0;
-        virtual int     getNumPlanes() const = 0;
-        virtual void getPlane(btVector3& planeNormal,btVector3& planeSupport,int i ) const = 0;
-//      virtual int getIndex(int i) const = 0 ; 
-
-        virtual bool isInside(const btVector3& pt,btScalar tolerance) const = 0;
-        
-        /// optional Hull is for optional Separating Axis Test Hull collision detection, see Hull.cpp
-        class   Hull*   m_optionalHull;
 
 };