Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/Gimpact

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (modified) (1 diff)
• src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (modified) (1 diff)
• src/bullet/BulletCollision/Gimpact/btGImpactShape.h (modified) (4 diffs)
• src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (modified) (2 diffs)
• src/bullet/BulletCollision/Gimpact/gim_math.h (modified) (1 diff)
• src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (modified) (1 diff)

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp

@@ -151 +151 @@
         }
 
-        btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
+        bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
+        btAssert(!unbal);
 
         return splitIndex;

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp

@@ -172 +172 @@
         }
 
-        btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
+        bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
+        btAssert(!unbal);
 
         return splitIndex;

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h

@@ -882 +882 @@
 class btGImpactMeshShape : public btGImpactShapeInterface
 {
-        btStridingMeshInterface* m_meshInterface;
-
 protected:
         btAlignedObjectArray<btGImpactMeshShapePart*> m_mesh_parts;
@@ -910 +908 @@
         btGImpactMeshShape(btStridingMeshInterface * meshInterface)
         {
-                m_meshInterface = meshInterface;
                 buildMeshParts(meshInterface);
         }
@@ -926 +923 @@
 
 
-        btStridingMeshInterface* getMeshInterface()
-        {
-                return m_meshInterface;
-        }
-
-        const btStridingMeshInterface* getMeshInterface() const
-        {
-                return m_meshInterface;
-        }
 
         int getMeshPartCount() const
@@ -1046 +1034 @@
 
         //! call when reading child shapes
-        virtual void lockChildShapes() const
-        {
-                btAssert(0);
-        }
-
-        virtual void unlockChildShapes() const
+        virtual void lockChildShapes()
+        {
+                btAssert(0);
+        }
+
+        virtual void unlockChildShapes()
         {
                 btAssert(0);

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp

@@ -111 +111 @@
         }
 
-        btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
+        bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
+        btAssert(!unbal);
 
         return splitIndex;
@@ -180 +181 @@
 }
 
-

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_math.h

@@ -108 +108 @@
 #define GIM_CLAMP(number,minval,maxval) (number<minval?minval:(number>maxval?maxval:number))
 
-#define GIM_GREATER(x, y)       btFabs(x) > (y)
+#define GIM_GREATER(x, y)       fabsf(x) > (y)
 
 ///Swap numbers

code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h

@@ -276 +276 @@
                 else
                 {
-                        btScalar sumuv;
+                        float sumuv;
                         sumuv = u+v;
                         if(sumuv<-G_EPSILON)