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

add commandline arguments to serialize demo for xml export and Bullet import file name

Browse Source 
update AntTweakBar version in CDTestFramework
add btCompoundShape support in BulletXmlWorldImporter (this importer is still premature/work-in-progress)
This commit is contained in:
erwin.coumans
2012-09-26 19:47:18 +00:00
parent 60c1b1918a
commit 4442a826ed
85 changed files with 59310 additions and 18485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
View File

@@ -333,6 +333,7 @@ btCollisionShape* btWorldImporter::convertCollisionShape( btCollisionShapeData*
{
hullShape->addPoint(tmpPoints[i]);
}
//hullShape->initializePolyhedralFeatures();
shape = hullShape;
break;
}
@@ -419,11 +420,17 @@ btCollisionShape* btWorldImporter::convertCollisionShape( btCollisionShapeData*
btCompoundShapeData* compoundData = (btCompoundShapeData*)shapeData;
btCompoundShape* compoundShape = createCompoundShape();
btCompoundShapeChildData* childShapeDataArray = &compoundData->m_childShapePtr[0];
btAlignedObjectArray<btCollisionShape*> childShapes;
for (int i=0;i<compoundData->m_numChildShapes;i++)
{
btCollisionShape* childShape = convertCollisionShape(compoundData->m_childShapePtr[i].m_childShape);
btCompoundShapeChildData* ptr = &compoundData->m_childShapePtr[i];
btCollisionShapeData* cd = compoundData->m_childShapePtr[i].m_childShape;
btCollisionShape* childShape = convertCollisionShape(cd);
if (childShape)
{
btTransform localTransform;