Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (modified) (1 diff)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btConeShape.cpp

@@ -132 +132 @@
 
 
+void    btConeShape::setLocalScaling(const btVector3& scaling)
+{
+        int axis = m_coneIndices[1];
+        int r1 = m_coneIndices[0];
+        int r2 = m_coneIndices[2];
+        m_height *= scaling[axis] / m_localScaling[axis];
+        m_radius *= (scaling[r1] / m_localScaling[r1] + scaling[r2] / m_localScaling[r2]) / 2;
+        m_sinAngle = (m_radius / btSqrt(m_radius * m_radius + m_height * m_height));
+        btConvexInternalShape::setLocalScaling(scaling);
+}