Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 13, 2008, 11:45:51 PM (17 years ago)
Author:
rgrieder
Message:

Updated to Bullet 2.73 (first part).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h

    r2192 r2430  
    2121
    2222#include "btDiscreteCollisionDetectorInterface.h"
    23 #include "LinearMath/btPoint3.h"
    2423#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
    2524
    … …  
    3938        const btConvexShape* m_minkowskiB;
    4039        bool            m_ignoreMargin;
     40        btScalar        m_cachedSeparatingDistance;
    4141       
    4242
    … …  
    6969        }
    7070
     71        const btVector3& getCachedSeparatingAxis() const
     72        {
     73                return m_cachedSeparatingAxis;
     74        }
     75        btScalar        getCachedSeparatingDistance() const
     76        {
     77                return m_cachedSeparatingDistance;
     78        }
     79
    7180        void    setPenetrationDepthSolver(btConvexPenetrationDepthSolver*       penetrationDepthSolver)
    7281        {
Note: See TracChangeset for help on using the changeset viewer.