Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (modified) (3 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h

@@ -25 +25 @@
 ATTRIBUTE_ALIGNED16(class) btConvexHullShape : public btPolyhedralConvexShape
 {
-        btAlignedObjectArray<btPoint3>  m_points;
+        btAlignedObjectArray<btVector3> m_unscaledPoints;
 
 public:
@@ -34 +34 @@
         ///It is easier to not pass any points in the constructor, and just add one point at a time, using addPoint.
         ///btConvexHullShape make an internal copy of the points.
-        btConvexHullShape(const btScalar* points=0,int numPoints=0, int stride=sizeof(btPoint3));
+        btConvexHullShape(const btScalar* points=0,int numPoints=0, int stride=sizeof(btVector3));
 
-        void addPoint(const btPoint3& point);
+        void addPoint(const btVector3& point);
 
-        btPoint3* getPoints()
+        
+        btVector3* getUnscaledPoints()
         {
-                return &m_points[0];
+                return &m_unscaledPoints[0];
         }
 
-        const btPoint3* getPoints() const
+        const btVector3* getUnscaledPoints() const
         {
-                return &m_points[0];
+                return &m_unscaledPoints[0];
         }
 
-        int getNumPoints() const 
+        ///getPoints is obsolete, please use getUnscaledPoints
+        const btVector3* getPoints() const
         {
-                return m_points.size();
+                return getUnscaledPoints();
+        }
+
+        
+
+
+        SIMD_FORCE_INLINE       btVector3 getScaledPoint(int i) const
+        {
+                return m_unscaledPoints[i] * m_localScaling;
+        }
+
+        SIMD_FORCE_INLINE       int getNumPoints() const 
+        {
+                return m_unscaledPoints.size();
         }
 
@@ -65 +80 @@
         virtual int     getNumVertices() const;
         virtual int getNumEdges() const;
-        virtual void getEdge(int i,btPoint3& pa,btPoint3& pb) const;
-        virtual void getVertex(int i,btPoint3& vtx) const;
+        virtual void getEdge(int i,btVector3& pa,btVector3& pb) const;
+        virtual void getVertex(int i,btVector3& vtx) const;
         virtual int     getNumPlanes() const;
-        virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i ) const;
-        virtual bool isInside(const btPoint3& pt,btScalar tolerance) const;
+        virtual void getPlane(btVector3& planeNormal,btVector3& planeSupport,int i ) const;
+        virtual bool isInside(const btVector3& pt,btScalar tolerance) const;
 
         ///in case we receive negative scaling