Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (modified) (3 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp

@@ -155 +155 @@
 
                 btCapsuleShape* capsuleShape = (btCapsuleShape*)this;
-                btVector3 halfExtents = capsuleShape->getImplicitShapeDimensions();
                 btScalar halfHeight = capsuleShape->getHalfHeight();
                 int capsuleUpAxis = capsuleShape->getUpAxis();
@@ -302 +301 @@
         {
                 btSphereShape* sphereShape = (btSphereShape*)this;
-                float radius = sphereShape->getImplicitShapeDimensions().getX();// * convexShape->getLocalScaling().getX();
-                float margin = radius + sphereShape->getMarginNonVirtual();
+                btScalar radius = sphereShape->getImplicitShapeDimensions().getX();// * convexShape->getLocalScaling().getX();
+                btScalar margin = radius + sphereShape->getMarginNonVirtual();
                 const btVector3& center = t.getOrigin();
                 btVector3 extent(margin,margin,margin);
@@ -315 +314 @@
         {
                 btBoxShape* convexShape = (btBoxShape*)this;
-                float margin=convexShape->getMarginNonVirtual();
+                btScalar margin=convexShape->getMarginNonVirtual();
                 btVector3 halfExtents = convexShape->getImplicitShapeDimensions();
                 halfExtents += btVector3(margin,margin,margin);