Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (modified) (3 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp

@@ -89 +89 @@
                                          break;
                                  }
+                        case PHY_UCHAR:
+                                 {
+                                         for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
+                                         {
+                                                 unsigned char* tri_indices= (unsigned char*)(indexbase+gfxindex*indexstride);
+                                                 graphicsbase = (float*)(vertexbase+tri_indices[0]*stride);
+                                                 triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
+                                                 graphicsbase = (float*)(vertexbase+tri_indices[1]*stride);
+                                                 triangle[1].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),    graphicsbase[2]*meshScaling.getZ());
+                                                 graphicsbase = (float*)(vertexbase+tri_indices[2]*stride);
+                                                 triangle[2].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),    graphicsbase[2]*meshScaling.getZ());
+                                                 callback->internalProcessTriangleIndex(triangle,part,gfxindex);
+                                         }
+                                         break;
+                                 }
                          default:
                                  btAssert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
@@ -121 +136 @@
                                                 {
                                                         unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
+                                                        graphicsbase = (double*)(vertexbase+tri_indices[0]*stride);
+                                                        triangle[0].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),(btScalar)graphicsbase[2]*meshScaling.getZ());
+                                                        graphicsbase = (double*)(vertexbase+tri_indices[1]*stride);
+                                                        triangle[1].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),  (btScalar)graphicsbase[2]*meshScaling.getZ());
+                                                        graphicsbase = (double*)(vertexbase+tri_indices[2]*stride);
+                                                        triangle[2].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),  (btScalar)graphicsbase[2]*meshScaling.getZ());
+                                                        callback->internalProcessTriangleIndex(triangle,part,gfxindex);
+                                                }
+                                                break;
+                                        }
+                                case PHY_UCHAR:
+                                        {
+                                                for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
+                                                {
+                                                        unsigned char* tri_indices= (unsigned char*)(indexbase+gfxindex*indexstride);
                                                         graphicsbase = (double*)(vertexbase+tri_indices[0]*stride);
                                                         triangle[0].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),(btScalar)graphicsbase[2]*meshScaling.getZ());
@@ -267 +297 @@
                                         break;
                                 }
+                                case PHY_UCHAR:
+                                {
+                                        if (numtriangles)
+                                        {
+                                                btChunk* chunk = serializer->allocate(sizeof(btCharIndexTripletData),numtriangles);
+                                                btCharIndexTripletData* tmpIndices = (btCharIndexTripletData*)chunk->m_oldPtr;
+                                                memPtr->m_3indices8 = (btCharIndexTripletData*) serializer->getUniquePointer(tmpIndices);
+                                                for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
+                                                {
+                                                        unsigned char* tri_indices= (unsigned char*)(indexbase+gfxindex*indexstride);
+                                                        tmpIndices[gfxindex].m_values[0] = tri_indices[0];
+                                                        tmpIndices[gfxindex].m_values[1] = tri_indices[1];
+                                                        tmpIndices[gfxindex].m_values[2] = tri_indices[2];
+                                                }
+                                                serializer->finalizeChunk(chunk,"btCharIndexTripletData",BT_ARRAY_CODE,(void*)chunk->m_oldPtr);
+                                        }
+                                        break;
+                                }
                         default:
                                 {