Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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.

Location:
code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h

    r8351 r8393  
    1717// 3. This notice may not be removed or altered from any source distribution.
    1818
    19 #ifndef AXIS_SWEEP_3_H
    20 #define AXIS_SWEEP_3_H
     19#ifndef BT_AXIS_SWEEP_3_H
     20#define BT_AXIS_SWEEP_3_H
    2121
    2222#include "LinearMath/btVector3.h"

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef         BROADPHASE_INTERFACE_H
    17 #define         BROADPHASE_INTERFACE_H
     16#ifndef         BT_BROADPHASE_INTERFACE_H
     17#define         BT_BROADPHASE_INTERFACE_H
    1818
    1919
    … …  
    8080};
    8181
    82 #endif //BROADPHASE_INTERFACE_H
     82#endif //BT_BROADPHASE_INTERFACE_H

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef BROADPHASE_PROXY_H
    17 #define BROADPHASE_PROXY_H
     16#ifndef BT_BROADPHASE_PROXY_H
     17#define BT_BROADPHASE_PROXY_H
    1818
    1919#include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
    … …  
    267267
    268268
    269 #endif //BROADPHASE_PROXY_H
    270 
     269#endif //BT_BROADPHASE_PROXY_H
     270

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h

    r5781 r8393  
    1414*/
    1515
    16 #ifndef COLLISION_ALGORITHM_H
    17 #define COLLISION_ALGORITHM_H
     16#ifndef BT_COLLISION_ALGORITHM_H
     17#define BT_COLLISION_ALGORITHM_H
    1818
    1919#include "LinearMath/btScalar.h"
    … …  
    4545        btPersistentManifold*   m_manifold;
    4646
    47         int     getDispatcherId();
     47//      int     getDispatcherId();
    4848
    4949};
    … …  
    6060
    6161protected:
    62         int     getDispatcherId();
     62//      int     getDispatcherId();
    6363       
    6464public:
    … …  
    7878
    7979
    80 #endif //COLLISION_ALGORITHM_H
     80#endif //BT_COLLISION_ALGORITHM_H

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef _DISPATCHER_H
    17 #define _DISPATCHER_H
    18 
     16#ifndef BT_DISPATCHER_H
     17#define BT_DISPATCHER_H
    1918#include "LinearMath/btScalar.h"
    2019
    … …  
    2827class btPersistentManifold;
    2928class btStackAlloc;
     29class btPoolAllocator;
    3030
    3131struct btDispatcherInfo
    … …  
    4141                m_dispatchFunc(DISPATCH_DISCRETE),
    4242                m_timeOfImpact(btScalar(1.)),
    43                 m_useContinuous(false),
     43                m_useContinuous(true),
    4444                m_debugDraw(0),
    4545                m_enableSatConvex(false),
    … …  
    4949                m_useConvexConservativeDistanceUtil(false),
    5050                m_convexConservativeDistanceThreshold(0.0f),
    51                 m_convexMaxDistanceUseCPT(false),
    5251                m_stackAllocator(0)
    5352        {
    … …  
    6665        bool            m_useConvexConservativeDistanceUtil;
    6766        btScalar        m_convexConservativeDistanceThreshold;
    68         bool            m_convexMaxDistanceUseCPT;
    6967        btStackAlloc*   m_stackAllocator;
    7068};
    … …  
    9997        virtual btPersistentManifold**  getInternalManifoldPointer() = 0;
    10098
     99        virtual btPoolAllocator*        getInternalManifoldPool() = 0;
     100
     101        virtual const btPoolAllocator*  getInternalManifoldPool() const = 0;
     102
    101103        virtual void* allocateCollisionAlgorithm(int size)  = 0;
    102104
    … …  
    106108
    107109
    108 #endif //_DISPATCHER_H
     110#endif //BT_DISPATCHER_H

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef OVERLAPPING_PAIR_CACHE_H
    17 #define OVERLAPPING_PAIR_CACHE_H
     16#ifndef BT_OVERLAPPING_PAIR_CACHE_H
     17#define BT_OVERLAPPING_PAIR_CACHE_H
    1818
    1919
    … …  
    465465
    466466
    467 #endif //OVERLAPPING_PAIR_CACHE_H
    468 
    469 
     467#endif //BT_OVERLAPPING_PAIR_CACHE_H
     468
     469

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef QUANTIZED_BVH_H
    17 #define QUANTIZED_BVH_H
     16#ifndef BT_QUANTIZED_BVH_H
     17#define BT_QUANTIZED_BVH_H
    1818
    1919class btSerializer;
    … …  
    577577
    578578
    579 #endif //QUANTIZED_BVH_H
     579#endif //BT_QUANTIZED_BVH_H

  • code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h

    r8351 r8393  
    1414*/
    1515
    16 #ifndef SIMPLE_BROADPHASE_H
    17 #define SIMPLE_BROADPHASE_H
     16#ifndef BT_SIMPLE_BROADPHASE_H
     17#define BT_SIMPLE_BROADPHASE_H
    1818
    1919
    … …  
    168168
    169169
    170 #endif //SIMPLE_BROADPHASE_H
     170#endif //BT_SIMPLE_BROADPHASE_H
    171171
Note: See TracChangeset for help on using the changeset viewer.