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

add btFileUtils::toLower to convert a string (char*) to lower case

Browse Source 
URDF import demo: add COLLADA .dae file support
add FiniteElementMethod demo, extracted from the OpenTissue library (under the zlib license)
don't crash if loading an invalid STL file
add comparison with Assimp for COLLADA file loading (disabled by default, to avoid library dependency)
Gwen: disable some flags that make the build incompatible
This commit is contained in:
erwin coumans
2014-10-29 13:18:34 -07:00
parent aaaf8dc4e2
commit 4b665fa82b
139 changed files with 17704 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Demos3/ImportColladaDemo/ImportColladaSetup.cpp
View File

@@ -70,13 +70,12 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge)
btVector3 scaling(1,1,1);
// int index=10;
fileIndex++;
if (fileIndex>=numFiles)
{
fileIndex = 0;
}
{
btAlignedObjectArray<GLInstanceGraphicsShape> visualShapes;
@@ -86,8 +85,36 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge)
btTransform upAxisTrans;
upAxisTrans.setIdentity();
btVector3 color(0,0,1);
#ifdef COMPARE_WITH_ASSIMP
static int useAssimp = 0;
if (useAssimp)
{
LoadMeshFromColladaAssimp(relativeFileName, visualShapes, visualShapeInstances,upAxisTrans,unitMeterScaling);
fileIndex++;
if (fileIndex>=numFiles)
{
fileIndex = 0;
}
color.setValue(1,0,0);
}
else
{
LoadMeshFromCollada(relativeFileName, visualShapes, visualShapeInstances,upAxisTrans,unitMeterScaling);
}
useAssimp=1-useAssimp;
#else
fileIndex++;
if (fileIndex>=numFiles)
{
fileIndex = 0;
}
LoadMeshFromCollada(relativeFileName, visualShapes, visualShapeInstances,upAxisTrans,unitMeterScaling);
#endif// COMPARE_WITH_ASSIMP
//at the moment our graphics engine requires instances that share the same visual shape to be added right after registering the shape
//so perform a sort, just to be sure
@@ -111,7 +138,7 @@ void ImportColladaSetup::initPhysics(GraphicsPhysicsBridge& gfxBridge)
//trans.setIdentity();
//trans.setRotation(btQuaternion(btVector3(1,0,0),SIMD_HALF_PI));
btVector3 color(0,0,1);
b3AlignedObjectArray<GLInstanceVertex> verts;
verts.resize(gfxShape->m_vertices->size());