Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.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/btBoxShape.h (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.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.
@@ -42 +42 @@
         const btVector3& getHalfExtentsWithoutMargin() const
         {
-                return m_implicitShapeDimensions;//changed in Bullet 2.63: assume the scaling and margin are included
+                return m_implicitShapeDimensions;//scaling is included, margin is not
         }
         
@@ -313 +313 @@
 };
 
+
 #endif //OBB_BOX_MINKOWSKI_H