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

fixed a few issues with BulletColladaConverter/ColladaConverter.cpp, related to constraints.

Browse Source
This commit is contained in:
erwin.coumans
2008-06-05 05:09:47 +00:00
parent 35083aae4a
commit 8634b6ba14
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Extras/BulletColladaConverter/ColladaConverter.cpp
View File

@@ -646,6 +646,9 @@ btRigidBodyColladaInfo* ColladaConverter::findRigidBodyColladaInfo(const btRigid
{ {
///we assume that the btRigidBody getUid matches btRigidBodyColladaInfo getUid ///we assume that the btRigidBody getUid matches btRigidBodyColladaInfo getUid
if (!body->getBroadphaseProxy())
return 0;
int uid = body->getBroadphaseProxy()->getUid(); int uid = body->getBroadphaseProxy()->getUid();
btHashKeyPtr<btRigidBodyColladaInfo*> tmpKey(uid); btHashKeyPtr<btRigidBodyColladaInfo*> tmpKey(uid);
btRigidBodyColladaInfo** rbciPtr = this->m_rbUserInfoHashMap.find(tmpKey); btRigidBodyColladaInfo** rbciPtr = this->m_rbUserInfoHashMap.find(tmpKey);
@@ -1822,7 +1825,7 @@ domNode* ColladaConverter::addNode (btRigidBody* rb, const char* nodeName, const
domRigid_constraint* ColladaConverter::addConstraint (btTypedConstraint* constraint, const char* constraintName) domRigid_constraint* ColladaConverter::addConstraint (btTypedConstraint* constraint, const char* constraintName)
{ {
if (!constraint->getConstraintType() != D6_CONSTRAINT_TYPE) if (constraint->getConstraintType() != D6_CONSTRAINT_TYPE)
return NULL; return NULL;
btGeneric6DofConstraint* g6c = (btGeneric6DofConstraint*)constraint; btGeneric6DofConstraint* g6c = (btGeneric6DofConstraint*)constraint;
@@ -3080,6 +3083,8 @@ btTypedConstraint* ColladaConverter::createUniversalD6Constraint(
{ {
btRigidBody::btRigidBodyConstructionInfo cinfo(0,0,0); btRigidBody::btRigidBodyConstructionInfo cinfo(0,0,0);
bodyOther = new btRigidBody(cinfo); bodyOther = new btRigidBody(cinfo);
//needs to be in the world!
m_dynamicsWorld->addRigidBody(bodyOther);
bodyOther->setWorldTransform(bodyRef->getWorldTransform()); bodyOther->setWorldTransform(bodyRef->getWorldTransform());
localAttachmentOther = localAttachmentFrameRef; localAttachmentOther = localAttachmentFrameRef;