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/CollisionShapes/btBoxShape.h

    r2192 r2430  
    2020#include "btCollisionMargin.h"
    2121#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
    22 #include "LinearMath/btPoint3.h"
     22#include "LinearMath/btVector3.h"
    2323#include "LinearMath/btMinMax.h"
    2424
     
    118118        virtual void    calculateLocalInertia(btScalar mass,btVector3& inertia) const;
    119119
    120         virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i ) const
     120        virtual void getPlane(btVector3& planeNormal,btVector3& planeSupport,int i ) const
    121121        {
    122122                //this plane might not be aligned...
     
    191191
    192192       
    193         virtual void getEdge(int i,btPoint3& pa,btPoint3& pb) const
     193        virtual void getEdge(int i,btVector3& pa,btVector3& pb) const
    194194        //virtual void getEdge(int i,Edge& edge) const
    195195        {
     
    262262
    263263       
    264         virtual bool isInside(const btPoint3& pt,btScalar tolerance) const
     264        virtual bool isInside(const btVector3& pt,btScalar tolerance) const
    265265        {
    266266                btVector3 halfExtents = getHalfExtentsWithoutMargin();
Note: See TracChangeset for help on using the changeset viewer.