Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/Gimpact/btGImpactShape.h

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/btGImpactShape.h (modified) (4 diffs)

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);