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

COLLADA import, avoided some crashes, improved <convex_mesh> support

Browse Source
This commit is contained in:
ejcoumans
2006-07-29 00:54:31 +00:00
parent b8cbfe5f72
commit 235b49d748
1 changed files with 101 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -1239,7 +1239,7 @@ int main(int argc,char** argv)
daeElement* geomElem = geomInstRef->getUrl().getElement(); daeElement* geomElem = geomInstRef->getUrl().getElement();
//elemRef->getTypeName(); //elemRef->getTypeName();
domGeometry* geom = (domGeometry*) geomElem; domGeometry* geom = (domGeometry*) geomElem;
if (geom->getMesh()) if (geom && geom->getMesh())
{ {
const domMeshRef meshRef = geom->getMesh(); const domMeshRef meshRef = geom->getMesh();
TriangleIndexVertexArray* tindexArray = new TriangleIndexVertexArray(); TriangleIndexVertexArray* tindexArray = new TriangleIndexVertexArray();
@@ -1354,7 +1354,7 @@ int main(int argc,char** argv)
} }
if (geom->getConvex_mesh()) if (geom && geom->getConvex_mesh())
{ {
{ {
@@ -1382,84 +1382,125 @@ int main(int argc,char** argv)
const domConvex_meshRef convexRef = geom->getConvex_mesh(); const domConvex_meshRef convexRef = geom->getConvex_mesh();
//daeString urlref = convexRef->getConvex_hull_of().getURI(); //daeString urlref = convexRef->getConvex_hull_of().getURI();
daeString urlref2 = convexRef->getConvex_hull_of().getOriginalURI(); daeString urlref2 = convexRef->getConvex_hull_of().getOriginalURI();
daeElementRef otherElemRef = convexRef->getConvex_hull_of().getElement(); if (urlref2)
// if ( otherElemRef != NULL )
// {
// domGeometryRef linkedGeom = *(domGeometryRef*)&otherElemRef;
// Load all the geometry libraries
for ( int i = 0; i < dom->getLibrary_geometries_array().getCount(); i++)
{ {
domLibrary_geometriesRef libgeom = dom->getLibrary_geometries_array()[i]; daeElementRef otherElemRef = convexRef->getConvex_hull_of().getElement();
//int index = libgeom->findLastIndexOf(urlref2); // if ( otherElemRef != NULL )
//can't find it // {
// domGeometryRef linkedGeom = *(domGeometryRef*)&otherElemRef;
for ( int i = 0; i < libgeom->getGeometry_array().getCount(); i++) // Load all the geometry libraries
for ( int i = 0; i < dom->getLibrary_geometries_array().getCount(); i++)
{ {
//ReadGeometry( ); domLibrary_geometriesRef libgeom = dom->getLibrary_geometries_array()[i];
domGeometryRef lib = libgeom->getGeometry_array()[i]; //int index = libgeom->findLastIndexOf(urlref2);
if (!strcmp(lib->getName(),urlref2)) //can't find it
for ( int i = 0; i < libgeom->getGeometry_array().getCount(); i++)
{ {
//found convex_hull geometry //ReadGeometry( );
domMesh *meshElement = lib->getMesh();//linkedGeom->getMesh(); domGeometryRef lib = libgeom->getGeometry_array()[i];
if (meshElement) if (!strcmp(lib->getName(),urlref2))
{ {
const domVerticesRef vertsRef = meshElement->getVertices(); //found convex_hull geometry
int numInputs = vertsRef->getInput_array().getCount(); domMesh *meshElement = lib->getMesh();//linkedGeom->getMesh();
for (int i=0;i<numInputs;i++) if (meshElement)
{ {
domInputLocalRef localRef = vertsRef->getInput_array()[i]; const domVerticesRef vertsRef = meshElement->getVertices();
daeString str = localRef->getSemantic(); int numInputs = vertsRef->getInput_array().getCount();
if ( !strcmp(str,"POSITION")) for (int i=0;i<numInputs;i++)
{ {
const domURIFragmentType& frag = localRef->getSource(); domInputLocalRef localRef = vertsRef->getInput_array()[i];
daeString str = localRef->getSemantic();
daeElementConstRef constElem = frag.getElement(); if ( !strcmp(str,"POSITION"))
const domSourceRef node = *(const domSourceRef*)&constElem;
const domFloat_arrayRef flArray = node->getFloat_array();
if (flArray)
{ {
int numElem = flArray->getCount(); const domURIFragmentType& frag = localRef->getSource();
const domListOfFloats& listFloats = flArray->getValue();
for (int k=0;k+2<numElem;k+=3) daeElementConstRef constElem = frag.getElement();
const domSourceRef node = *(const domSourceRef*)&constElem;
const domFloat_arrayRef flArray = node->getFloat_array();
if (flArray)
{ {
domFloat fl0 = listFloats.get(k); int numElem = flArray->getCount();
domFloat fl1 = listFloats.get(k+1); const domListOfFloats& listFloats = flArray->getValue();
domFloat fl2 = listFloats.get(k+2);
//printf("float %f %f %f\n",fl0,fl1,fl2); for (int k=0;k+2<numElem;k+=3)
{
domFloat fl0 = listFloats.get(k);
domFloat fl1 = listFloats.get(k+1);
domFloat fl2 = listFloats.get(k+2);
//printf("float %f %f %f\n",fl0,fl1,fl2);
convexHullShape->AddPoint(SimdPoint3(fl0,fl1,fl2));
}
convexHullShape->AddPoint(SimdPoint3(fl0,fl1,fl2));
} }
} }
} }
}
}
}
}
} else
{
//no getConvex_hull_of but direct vertices
const domVerticesRef vertsRef = convexRef->getVertices();
int numInputs = vertsRef->getInput_array().getCount();
for (int i=0;i<numInputs;i++)
{
domInputLocalRef localRef = vertsRef->getInput_array()[i];
daeString str = localRef->getSemantic();
if ( !strcmp(str,"POSITION"))
{
const domURIFragmentType& frag = localRef->getSource();
daeElementConstRef constElem = frag.getElement();
const domSourceRef node = *(const domSourceRef*)&constElem;
const domFloat_arrayRef flArray = node->getFloat_array();
if (flArray)
{
int numElem = flArray->getCount();
const domListOfFloats& listFloats = flArray->getValue();
for (int k=0;k+2<numElem;k+=3)
{
domFloat fl0 = listFloats.get(k);
domFloat fl1 = listFloats.get(k+1);
domFloat fl2 = listFloats.get(k+2);
//printf("float %f %f %f\n",fl0,fl1,fl2);
convexHullShape->AddPoint(SimdPoint3(fl0,fl1,fl2));
} }
} }
} }
}
if (convexHullShape->GetNumVertices())
{
colShape = convexHullShape;
printf("created convexHullShape with %i points\n",convexHullShape->GetNumVertices());
} else
{
delete convexHullShape;
printf("failed to create convexHullShape\n");
} }
}
if (convexHullShape->GetNumVertices())
{
colShape = convexHullShape;
printf("created convexHullShape with %i points\n",convexHullShape->GetNumVertices());
} else
{
delete convexHullShape;
printf("failed to create convexHullShape\n");
} }
@@ -1566,7 +1607,6 @@ int main(int argc,char** argv)
char* bodyName = (char*)physObjects[i]->getNewClientInfo(); char* bodyName = (char*)physObjects[i]->getNewClientInfo();
if (!strcmp(bodyName,orgUri0)) if (!strcmp(bodyName,orgUri0))
{ {
printf("found\n");
ctrl0=physObjects[i]; ctrl0=physObjects[i];
} }
if (!strcmp(bodyName,orgUri1)) if (!strcmp(bodyName,orgUri1))
@@ -1658,6 +1698,8 @@ int main(int argc,char** argv)
} }
if (ctrl0 && ctrl1)
{
constraintId =physicsEnvironmentPtr->createUniversalD6Constraint( constraintId =physicsEnvironmentPtr->createUniversalD6Constraint(
ctrl0, ctrl0,
ctrl1, ctrl1,
@@ -1668,6 +1710,10 @@ int main(int argc,char** argv)
angularLowerLimits, angularLowerLimits,
angularUpperLimits angularUpperLimits
); );
} else
{
printf("Error: Cannot find Rigidbodies(%s,%s) for constraint %s\n",orgUri0,orgUri1,constraintName);
}
} }