Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp

Timestamp:

Dec 13, 2008, 11:45:51 PM (17 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (modified) (3 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp

@@ -144 +144 @@
                         {
                                 int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
-
-                                btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
-
-                                m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());            
+                                
+                                if (type == PHY_FLOAT)
+                                {
+                                        float* graphicsbase = (float*)(vertexbase+graphicsindex*stride);
+                                        
+                                        m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());            
+                                }
+                                else
+                                {
+                                        double* graphicsbase = (double*)(vertexbase+graphicsindex*stride);
+                                        
+                                        m_triangle[j] = btVector3(btScalar(graphicsbase[0])*meshScaling.getX(),btScalar(graphicsbase[1])*meshScaling.getY(),btScalar(graphicsbase[2])*meshScaling.getZ());              
+                                }
                         }
 
@@ -205 +214 @@
                                 int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
 
-                                btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
-
-                                m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());            
+                                if (type == PHY_FLOAT)
+                                {
+                                        float* graphicsbase = (float*)(vertexbase+graphicsindex*stride);
+
+                                        m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());            
+                                }
+                                else
+                                {
+                                        double* graphicsbase = (double*)(vertexbase+graphicsindex*stride);
+                                        
+                                        m_triangle[j] = btVector3(btScalar(graphicsbase[0])*meshScaling.getX(),btScalar(graphicsbase[1])*meshScaling.getY(),btScalar(graphicsbase[2])*meshScaling.getZ());              
+                                }
                         }
 
@@ -282 +300 @@
                                 printf("%d ,",graphicsindex);
 #endif //DEBUG_TRIANGLE_MESH
-                                btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
-
-                                m_triangle[j] = btVector3(
-                                        graphicsbase[0]*meshScaling.getX(),
-                                        graphicsbase[1]*meshScaling.getY(),
-                                        graphicsbase[2]*meshScaling.getZ());
+                                if (type == PHY_FLOAT)
+                                {
+                                        float* graphicsbase = (float*)(vertexbase+graphicsindex*stride);
+                                        
+                                        m_triangle[j] = btVector3(
+                                                                                                                                                graphicsbase[0]*meshScaling.getX(),
+                                                                                                                                                graphicsbase[1]*meshScaling.getY(),
+                                                                                                                                                graphicsbase[2]*meshScaling.getZ());
+                                }
+                                else
+                                {
+                                        double* graphicsbase = (double*)(vertexbase+graphicsindex*stride);
+
+                                        m_triangle[j] = btVector3(
+                                                btScalar(graphicsbase[0])*meshScaling.getX(),
+                                                btScalar(graphicsbase[1])*meshScaling.getY(),
+                                                btScalar(graphicsbase[2])*meshScaling.getZ());
+                                }
 #ifdef DEBUG_TRIANGLE_MESH
                                 printf("triangle vertices:%f,%f,%f\n",triangle[j].x(),triangle[j].y(),triangle[j].z());