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

Made the move from sourceforge to googlecode (no svn sync any longer)

Browse Source 
Fixed BulletColladaConverter load/save
Removed btTypedUserInfo
Added btHashMap
Fixed btCapsuleShape
This commit is contained in:
erwin.coumans
2008-03-13 05:16:42 +00:00
parent 2f80e7f814
commit fe5386a5c8
20 changed files with 771 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
Extras/BulletColladaConverter/ColladaConverter.h
View File

@@ -20,20 +20,86 @@ subject to the following restrictions:
#include "LinearMath/btTransform.h"
#include "LinearMath/btVector3.h"
#include "LinearMath/btAlignedObjectArray.h"
#include "LinearMath/btHashMap.h"
class btCollisionShape;
class btRigidBody;
class btTypedConstraint;
class btDynamicsWorld;
class ConstraintInput;
class btRigidBodyColladaInfo;
class btRigidBodyColladaInfo
{
public:
class domNode* m_node;
class domRigid_body* m_domRigidBody;
class domInstance_rigid_body* m_instanceRigidBody;
btRigidBody* m_body;
int getUid();
btRigidBodyColladaInfo (btRigidBody* body, domNode* node, domRigid_body* rigidBody, domInstance_rigid_body* instanceRigidBody)
{
m_body = body;
m_node = node;
m_domRigidBody = rigidBody;
m_instanceRigidBody = instanceRigidBody;
}
};
class btRigidConstraintColladaInfo
{
public:
btTypedConstraint* m_typedConstraint;
class domRigid_constraint* m_domRigidConstraint;
class domInstance_rigid_constraint* m_domInstanceRigidConstraint;
int getUid();
btRigidConstraintColladaInfo (btTypedConstraint* constraint, domRigid_constraint* rigidConstraint, domInstance_rigid_constraint* domInstanceRigidConstraint)
{
m_typedConstraint = constraint;
m_domRigidConstraint = rigidConstraint;
m_domInstanceRigidConstraint = domInstanceRigidConstraint;
}
};
/*
class btShapeColladaInfo
{
public:
domGeometry* m_geometry;
int getUid();
btShapeColladaInfo (domGeometry* geometry) : btTypedUserInfo ()
{
m_geometry = geometry;
}
};
*/
///ColladaConverter helps converting the physics assets from COLLADA DOM into physics objects
class ColladaConverter
{
char m_cleaned_filename[513];
protected:
btDynamicsWorld* m_dynamicsWorld;
btHashMap<btHashKeyPtr<btRigidBodyColladaInfo*>,btRigidBodyColladaInfo*> m_rbUserInfoHashMap;
btHashMap<btHashKeyPtr<btRigidConstraintColladaInfo*>,btRigidConstraintColladaInfo*> m_constraintUserInfoHashMap;
class DAE* m_collada;
class domCOLLADA* m_dom;
char* m_filename;
@@ -50,6 +116,9 @@ protected:
bool convert ();
btRigidBodyColladaInfo* findRigidBodyColladaInfo(const btRigidBody* body);
btRigidConstraintColladaInfo* findRigidConstraintColladaInfo(btTypedConstraint* constraint);
/* Searches based on matching name/id */
class domNode* findNode (const char* nodeName);
class domRigid_body* findRigid_body (const char* rigidBodyName);
@@ -57,12 +126,11 @@ protected:
class domRigid_constraint* findRigid_constraint (const char* constraintName);
class domGeometry* findGeometry (const char* shapeName);
/* Use btTypedUserInfo->getPrivatePointer() */
class domNode* findNode (btRigidBody* rb);
class domRigid_body* findRigid_body (btRigidBody* rb);
class domRigid_body* findRigid_body (const btRigidBody* rb);
class domInstance_rigid_body* findRigid_body_instance (btRigidBody* rb);
class domRigid_constraint* findRigid_constraint (btTypedConstraint* constraint);
class domGeometry* findGeometry (btCollisionShape* shape);
//class domGeometry* findGeometry (btCollisionShape* shape);
/* These are the locations that NEW elements will be added to */
class domLibrary_geometries* getDefaultGeomLib ();
@@ -79,12 +147,12 @@ protected:
void addConvexHull (btCollisionShape* shape, const char* nodeName);
void addConvexMesh (btCollisionShape* shape, const char* nodeName);
void addConcaveMesh(btCollisionShape* shape, const char* nodeName);
void addNode (btRigidBody* body, const char* nodeName, const char* shapeName);
void addConstraint (btTypedConstraint* constraint, const char* constraintName);
void addConstraintInstance (btTypedConstraint* constraint, const char* constraintName);
class domNode* addNode (btRigidBody* body, const char* nodeName, const char* shapeName);
class domRigid_constraint* addConstraint (btTypedConstraint* constraint, const char* constraintName);
class domInstance_rigid_constraint* addConstraintInstance (btTypedConstraint* constraint, const char* constraintName);
void addMaterial (btRigidBody* body, const char* nodeName);
void addRigidBody (btRigidBody* body, const char* nodeName, const char* shapeName);
void addRigidBodyInstance (btRigidBody* body, const char* nodeName);
class domRigid_body* addRigidBody (btRigidBody* body, const char* nodeName, const char* shapeName);
class domInstance_rigid_body* addRigidBodyInstance (btRigidBody* body, const char* nodeName);
void updateRigidBodyPosition (btRigidBody* body, class domNode* node);
void updateRigidBodyVelocity (btRigidBody* body);
@@ -121,6 +189,11 @@ public:
return m_use4componentVertices;
}
void registerRigidBody(btRigidBody* body, const char* name);
void deRegisterRigidBody(btRigidBody* body);
void registerConstraint(btTypedConstraint* constraint, const char* name);
void deRegisterConstraint(btTypedConstraint* constraint);
///those virtuals are called by load and save.
@@ -148,6 +221,10 @@ public:
{
};
char* getLastFileName();
char* fixFileName(const char* lpCmdLine);
};
#endif //COLLADA_CONVERTER_H