Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (modified) (4 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btTriangleMesh.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.
@@ -13 +13 @@
 3. This notice may not be removed or altered from any source distribution.
 */
-
 
 #ifndef TRIANGLE_MESH_H
@@ -42 +41 @@
                 btTriangleMesh (bool use32bitIndices=true,bool use4componentVertices=true);
 
-                int             findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices);
-                void    addIndex(int index);
-
                 bool    getUse32bitIndices() const
                 {
@@ -63 +59 @@
                 virtual void    preallocateIndices(int numindices){(void) numindices;}
 
+                ///findOrAddVertex is an internal method, use addTriangle instead
+                int             findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices);
+                ///addIndex is an internal method, use addTriangle instead
+                void    addIndex(int index);
                 
 };