Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (modified) (4 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -22 +22 @@
 
 ///The btConvexPointCloudShape implements an implicit convex hull of an array of vertices.
-ATTRIBUTE_ALIGNED16(class) btConvexPointCloudShape : public btPolyhedralConvexShape
+ATTRIBUTE_ALIGNED16(class) btConvexPointCloudShape : public btPolyhedralConvexAabbCachingShape
 {
         btVector3* m_unscaledPoints;
@@ -29 +29 @@
 public:
         BT_DECLARE_ALIGNED_ALLOCATOR();
+
+        btConvexPointCloudShape()
+        {
+                m_localScaling.setValue(1.f,1.f,1.f);
+                m_shapeType = CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE;
+                m_unscaledPoints = 0;
+                m_numPoints = 0;
+        }
 
         btConvexPointCloudShape(btVector3* points,int numPoints, const btVector3& localScaling,bool computeAabb = true)
@@ -41 +49 @@
         }
 
-        void setPoints (btVector3* points, int numPoints, bool computeAabb = true)
+        void setPoints (btVector3* points, int numPoints, bool computeAabb = true,const btVector3& localScaling=btVector3(1.f,1.f,1.f))
         {
                 m_unscaledPoints = points;
                 m_numPoints = numPoints;
+                m_localScaling = localScaling;
 
                 if (computeAabb)