Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h

Timestamp:

Dec 13, 2008, 11:45:51 PM (16 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (modified) (6 diffs)

code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h

@@ -51 +51 @@
 struct  btSubSimplexClosestResult
 {
-        btPoint3        m_closestPointOnSimplex;
+        btVector3       m_closestPointOnSimplex;
         //MASK for m_usedVertices
         //stores the simplex vertex-usage, using the MASK, 
@@ -98 +98 @@
 
         btVector3       m_simplexVectorW[VORONOI_SIMPLEX_MAX_VERTS];
-        btPoint3        m_simplexPointsP[VORONOI_SIMPLEX_MAX_VERTS];
-        btPoint3        m_simplexPointsQ[VORONOI_SIMPLEX_MAX_VERTS];
+        btVector3       m_simplexPointsP[VORONOI_SIMPLEX_MAX_VERTS];
+        btVector3       m_simplexPointsQ[VORONOI_SIMPLEX_MAX_VERTS];
 
         
 
-        btPoint3        m_cachedP1;
-        btPoint3        m_cachedP2;
+        btVector3       m_cachedP1;
+        btVector3       m_cachedP2;
         btVector3       m_cachedV;
         btVector3       m_lastW;
@@ -117 +117 @@
         bool    updateClosestVectorAndPoints();
 
-        bool    closestPtPointTetrahedron(const btPoint3& p, const btPoint3& a, const btPoint3& b, const btPoint3& c, const btPoint3& d, btSubSimplexClosestResult& finalResult);
-        int             pointOutsideOfPlane(const btPoint3& p, const btPoint3& a, const btPoint3& b, const btPoint3& c, const btPoint3& d);
-        bool    closestPtPointTriangle(const btPoint3& p, const btPoint3& a, const btPoint3& b, const btPoint3& c,btSubSimplexClosestResult& result);
+        bool    closestPtPointTetrahedron(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d, btSubSimplexClosestResult& finalResult);
+        int             pointOutsideOfPlane(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c, const btVector3& d);
+        bool    closestPtPointTriangle(const btVector3& p, const btVector3& a, const btVector3& b, const btVector3& c,btSubSimplexClosestResult& result);
 
 public:
@@ -125 +125 @@
          void reset();
 
-         void addVertex(const btVector3& w, const btPoint3& p, const btPoint3& q);
+         void addVertex(const btVector3& w, const btVector3& p, const btVector3& q);
 
 
@@ -137 +137 @@
          }
 
-         int getSimplex(btPoint3 *pBuf, btPoint3 *qBuf, btVector3 *yBuf) const;
+         int getSimplex(btVector3 *pBuf, btVector3 *qBuf, btVector3 *yBuf) const;
 
          bool inSimplex(const btVector3& w);
@@ -145 +145 @@
          bool emptySimplex() const ;
 
-         void compute_points(btPoint3& p1, btPoint3& p2) ;
+         void compute_points(btVector3& p1, btVector3& p2) ;
 
          int numVertices() const