for for btBvhTriangleMeshShape with short int indices serialization

disable bvh serialization, it has issues (needs testing)

src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp

@@ -1321,7 +1321,8 @@ const char*	btQuantizedBvh::serialize(void* dataBuffer, btSerializer* serializer
 	}
 
 	quantizedData->m_numQuantizedContiguousNodes = m_quantizedContiguousNodes.size();
-	quantizedData->m_quantizedContiguousNodesPtr = (btQuantizedBvhNodeData*) (m_quantizedContiguousNodes.size() ? &m_quantizedContiguousNodes[0] : 0);
+//	printf("quantizedData->m_numQuantizedContiguousNodes=%d\n",quantizedData->m_numQuantizedContiguousNodes);
+	quantizedData->m_quantizedContiguousNodesPtr =(btQuantizedBvhNodeData*) (m_quantizedContiguousNodes.size() ? &m_quantizedContiguousNodes[0] : 0);
 	if (quantizedData->m_quantizedContiguousNodesPtr)
 	{
 		int sz = sizeof(btQuantizedBvhNodeData);

src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

@@ -502,8 +502,8 @@ struct	btBvhSubtreeInfoData
 {
 	int			m_rootNodeIndex;
 	int			m_subtreeSize;
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
+	unsigned short m_quantizedAabbMin[3];
+	unsigned short m_quantizedAabbMax[3];
 };
 
 struct btOptimizedBvhNodeFloatData
@@ -511,9 +511,9 @@ struct btOptimizedBvhNodeFloatData
 	btVector3FloatData	m_aabbMinOrg;
 	btVector3FloatData	m_aabbMaxOrg;
 	int	m_escapeIndex;
-
 	int	m_subPart;
 	int	m_triangleIndex;
+	char m_pad[4];
 };
 
 struct btOptimizedBvhNodeDoubleData
@@ -521,17 +521,17 @@ struct btOptimizedBvhNodeDoubleData
 	btVector3DoubleData	m_aabbMinOrg;
 	btVector3DoubleData	m_aabbMaxOrg;
 	int	m_escapeIndex;
-
 	int	m_subPart;
 	int	m_triangleIndex;
+	char	m_pad[4];
 };
 
 
 struct btQuantizedBvhNodeData
 {
+	unsigned short m_quantizedAabbMin[3];
+	unsigned short m_quantizedAabbMax[3];
 	int	m_escapeIndexOrTriangleIndex;
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
 };
 
 struct	btQuantizedBvhFloatData
@@ -545,10 +545,10 @@ struct	btQuantizedBvhFloatData
 	int					m_numQuantizedContiguousNodes;
 	btOptimizedBvhNodeFloatData	*m_contiguousNodesPtr;
 	btQuantizedBvhNodeData		*m_quantizedContiguousNodesPtr;
-
+	btBvhSubtreeInfoData	*m_subTreeInfoPtr;
 	int					m_traversalMode;
 	int					m_numSubtreeHeaders;
-	btBvhSubtreeInfoData	*m_subTreeInfoPtr;
+	
 };
 
 struct	btQuantizedBvhDoubleData

src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp

@@ -221,7 +221,7 @@ const char*	btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
 			memPtr->m_numTriangles = numtriangles;//indices = 3*numtriangles
 			memPtr->m_numVertices = numverts;
 			memPtr->m_indices32 = 0;
-			memPtr->m_indices16 = 0;
+			memPtr->m_3indices16 = 0;
 			memPtr->m_vertices3f = 0;
 			memPtr->m_vertices3d = 0;
 
@@ -249,23 +249,21 @@ const char*	btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
 				}
 			case PHY_SHORT:
 				{
-					int numindices = numtriangles*3;
-					if (numindices)
+					if (numtriangles)
 					{
-						btChunk* chunk = serializer->allocate(sizeof(btShortIntIndexData),numindices);
-						btShortIntIndexData* tmpIndices = (btShortIntIndexData*)chunk->m_oldPtr;
-						memPtr->m_indices16 = tmpIndices;
+						btChunk* chunk = serializer->allocate(sizeof(btShortIntIndexTripletData),numtriangles);
+						btShortIntIndexTripletData* tmpIndices = (btShortIntIndexTripletData*)chunk->m_oldPtr;
+						memPtr->m_3indices16 = tmpIndices;
 						for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
 						{
 							unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
-							tmpIndices[gfxindex*3].m_value = tri_indices[0];
-							tmpIndices[gfxindex*3+1].m_value = tri_indices[1];
-							tmpIndices[gfxindex*3+2].m_value = tri_indices[2];
+							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,"btShortIntIndexData",BT_ARRAY_CODE,(void*)chunk->m_oldPtr);
+						serializer->finalizeChunk(chunk,"btShortIntIndexTripletData",BT_ARRAY_CODE,(void*)chunk->m_oldPtr);
 					}
 					break;
-
 				}
 			default:
 				{

src/BulletCollision/CollisionShapes/btStridingMeshInterface.h

@@ -104,9 +104,12 @@ struct	btIntIndexData
 	int	m_value;
 };
 
-struct	btShortIntIndexData
+
+
+struct	btShortIntIndexTripletData
 {
-	short int	m_value;
+	short	m_values[3];
+	char	m_pad[2];
 };
 
 ///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
@@ -115,9 +118,10 @@ struct	btMeshPartData
 	btVector3FloatData			*m_vertices3f;
 	btVector3DoubleData			*m_vertices3d;
 
-	btIntIndexData			*m_indices32;
-	btShortIntIndexData		*m_indices16;
-	int                     m_numTriangles;//length of m_indices = 3*m_numTriangles
+	btIntIndexData				*m_indices32;
+	btShortIntIndexTripletData	*m_3indices16;
+
+	int                     m_numTriangles;//length of m_indices = m_numTriangles
 	int                     m_numVertices;
 };