Changeset 2882 for code/trunk/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (modified) (2 diffs)

code/trunk/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h

@@ -162 +162 @@
                 {
                 case 0:
-                        plane.setValue(btScalar(1.),btScalar(0.),btScalar(0.));
-                        plane[3] = -halfExtents.x();
+                        plane.setValue(btScalar(1.),btScalar(0.),btScalar(0.),-halfExtents.x());
                         break;
                 case 1:
-                        plane.setValue(btScalar(-1.),btScalar(0.),btScalar(0.));
-                        plane[3] = -halfExtents.x();
+                        plane.setValue(btScalar(-1.),btScalar(0.),btScalar(0.),-halfExtents.x());
                         break;
                 case 2:
-                        plane.setValue(btScalar(0.),btScalar(1.),btScalar(0.));
-                        plane[3] = -halfExtents.y();
+                        plane.setValue(btScalar(0.),btScalar(1.),btScalar(0.),-halfExtents.y());
                         break;
                 case 3:
-                        plane.setValue(btScalar(0.),btScalar(-1.),btScalar(0.));
-                        plane[3] = -halfExtents.y();
+                        plane.setValue(btScalar(0.),btScalar(-1.),btScalar(0.),-halfExtents.y());
                         break;
                 case 4:
-                        plane.setValue(btScalar(0.),btScalar(0.),btScalar(1.));
-                        plane[3] = -halfExtents.z();
+                        plane.setValue(btScalar(0.),btScalar(0.),btScalar(1.),-halfExtents.z());
                         break;
                 case 5:
-                        plane.setValue(btScalar(0.),btScalar(0.),btScalar(-1.));
-                        plane[3] = -halfExtents.z();
+                        plane.setValue(btScalar(0.),btScalar(0.),btScalar(-1.),-halfExtents.z());
                         break;
                 default:
-                        assert(0);
+                        btAssert(0);
                 }
         }
@@ -313 +307 @@
                         break;
                 default:
-                        assert(0);
+                        btAssert(0);
                 }
         }