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/btTetrahedronShape.cpp

    r2192 r2430  
    2323}
    2424
    25 btBU_Simplex1to4::btBU_Simplex1to4(const btPoint3& pt0) : btPolyhedralConvexShape (),
    26 m_numVertices(0)
    27 {
    28         m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
    29         addVertex(pt0);
    30 }
    31 
    32 btBU_Simplex1to4::btBU_Simplex1to4(const btPoint3& pt0,const btPoint3& pt1) : btPolyhedralConvexShape (),
     25btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0) : btPolyhedralConvexShape (),
     26m_numVertices(0)
     27{
     28        m_shapeType = TETRAHEDRAL_SHAPE_PROXYTYPE;
     29        addVertex(pt0);
     30}
     31
     32btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0,const btVector3& pt1) : btPolyhedralConvexShape (),
    3333m_numVertices(0)
    3434{
     
    3838}
    3939
    40 btBU_Simplex1to4::btBU_Simplex1to4(const btPoint3& pt0,const btPoint3& pt1,const btPoint3& pt2) : btPolyhedralConvexShape (),
     40btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0,const btVector3& pt1,const btVector3& pt2) : btPolyhedralConvexShape (),
    4141m_numVertices(0)
    4242{
     
    4747}
    4848
    49 btBU_Simplex1to4::btBU_Simplex1to4(const btPoint3& pt0,const btPoint3& pt1,const btPoint3& pt2,const btPoint3& pt3) : btPolyhedralConvexShape (),
     49btBU_Simplex1to4::btBU_Simplex1to4(const btVector3& pt0,const btVector3& pt1,const btVector3& pt2,const btVector3& pt3) : btPolyhedralConvexShape (),
    5050m_numVertices(0)
    5151{
     
    6161
    6262
    63 void btBU_Simplex1to4::addVertex(const btPoint3& pt)
     63void btBU_Simplex1to4::addVertex(const btVector3& pt)
    6464{
    6565        m_vertices[m_numVertices++] = pt;
     
    9393}
    9494
    95 void btBU_Simplex1to4::getEdge(int i,btPoint3& pa,btPoint3& pb) const
     95void btBU_Simplex1to4::getEdge(int i,btVector3& pa,btVector3& pb) const
    9696{
    9797       
     
    157157}
    158158
    159 void btBU_Simplex1to4::getVertex(int i,btPoint3& vtx) const
     159void btBU_Simplex1to4::getVertex(int i,btVector3& vtx) const
    160160{
    161161        vtx = m_vertices[i];
     
    184184
    185185
    186 void btBU_Simplex1to4::getPlane(btVector3&, btPoint3& ,int ) const
     186void btBU_Simplex1to4::getPlane(btVector3&, btVector3& ,int ) const
    187187{
    188188       
     
    194194}
    195195
    196 bool btBU_Simplex1to4::isInside(const btPoint3& ,btScalar ) const
     196bool btBU_Simplex1to4::isInside(const btVector3& ,btScalar ) const
    197197{
    198198        return false;
Note: See TracChangeset for help on using the changeset viewer.