Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix overflow visual shape in COLLADA .dae file importer.

Browse Source
This commit is contained in:
Erwin Coumans
2016-08-01 23:45:14 -07:00
parent 0c0b4be665
commit b759ab8a91
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
View File

@@ -28,6 +28,7 @@ subject to the following restrictions:
#include "btMatrix4x4.h" #include "btMatrix4x4.h"
#define MAX_VISUAL_SHAPES 512
struct VertexSource struct VertexSource
@@ -288,42 +289,47 @@ void readLibraryGeometries(TiXmlDocument& doc, btAlignedObjectArray<GLInstanceGr
}//for each mesh }//for each mesh
int shapeIndex = visualShapes.size(); int shapeIndex = visualShapes.size();
GLInstanceGraphicsShape& visualShape = visualShapes.expand(); if (shapeIndex<MAX_VISUAL_SHAPES)
{ {
visualShape.m_vertices = new b3AlignedObjectArray<GLInstanceVertex>; GLInstanceGraphicsShape& visualShape = visualShapes.expand();
visualShape.m_indices = new b3AlignedObjectArray<int>; {
int indexBase = 0; visualShape.m_vertices = new b3AlignedObjectArray<GLInstanceVertex>;
visualShape.m_indices = new b3AlignedObjectArray<int>;
int indexBase = 0;
btAssert(vertexNormals.size()==vertexPositions.size()); btAssert(vertexNormals.size()==vertexPositions.size());
for (int v=0;v<vertexPositions.size();v++) for (int v=0;v<vertexPositions.size();v++)
{ {
GLInstanceVertex vtx; GLInstanceVertex vtx;
vtx.xyzw[0] = vertexPositions[v].x(); vtx.xyzw[0] = vertexPositions[v].x();
vtx.xyzw[1] = vertexPositions[v].y(); vtx.xyzw[1] = vertexPositions[v].y();
vtx.xyzw[2] = vertexPositions[v].z(); vtx.xyzw[2] = vertexPositions[v].z();
vtx.xyzw[3] = 1.f; vtx.xyzw[3] = 1.f;
vtx.normal[0] = vertexNormals[v].x(); vtx.normal[0] = vertexNormals[v].x();
vtx.normal[1] = vertexNormals[v].y(); vtx.normal[1] = vertexNormals[v].y();
vtx.normal[2] = vertexNormals[v].z(); vtx.normal[2] = vertexNormals[v].z();
vtx.uv[0] = 0.5f; vtx.uv[0] = 0.5f;
vtx.uv[1] = 0.5f; vtx.uv[1] = 0.5f;
visualShape.m_vertices->push_back(vtx); visualShape.m_vertices->push_back(vtx);
} }
for (int index=0;index<indices.size();index++) for (int index=0;index<indices.size();index++)
{ {
visualShape.m_indices->push_back(indices[index]+indexBase); visualShape.m_indices->push_back(indices[index]+indexBase);
} }
//b3Printf(" index_count =%dand vertexPositions.size=%d\n",indices.size(), vertexPositions.size()); //b3Printf(" index_count =%dand vertexPositions.size=%d\n",indices.size(), vertexPositions.size());
indexBase=visualShape.m_vertices->size(); indexBase=visualShape.m_vertices->size();
visualShape.m_numIndices = visualShape.m_indices->size(); visualShape.m_numIndices = visualShape.m_indices->size();
visualShape.m_numvertices = visualShape.m_vertices->size(); visualShape.m_numvertices = visualShape.m_vertices->size();
} }
//b3Printf("geometry name=%s\n",geometryName); //b3Printf("geometry name=%s\n",geometryName);
name2Shape.insert(geometryName,shapeIndex); name2Shape.insert(geometryName,shapeIndex);
} else
{
b3Warning("DAE exceeds number of visual shapes (%d/%d)",shapeIndex, MAX_VISUAL_SHAPES);
}
}//for each geometry }//for each geometry
} }
@@ -557,7 +563,7 @@ void LoadMeshFromCollada(const char* relativeFileName, btAlignedObjectArray<GLIn
// GLInstanceGraphicsShape* instance = 0; // GLInstanceGraphicsShape* instance = 0;
//usually COLLADA files don't have that many visual geometries/shapes //usually COLLADA files don't have that many visual geometries/shapes
visualShapes.reserve(32); visualShapes.reserve(MAX_VISUAL_SHAPES);
float extraScaling = 1;//0.01; float extraScaling = 1;//0.01;
btHashMap<btHashString, int> name2ShapeIndex; btHashMap<btHashString, int> name2ShapeIndex;