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

coding convention in Bullet is to keep return type on same line as method:

Browse Source 
btClassName
{
  void myTest();
};

void myTest()
{

}

int getNumObjects()
{
}
This commit is contained in:
ejcoumans
2008-02-07 08:12:08 +00:00
parent 781440edc8
commit 661176bfed
1 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Extras/BulletColladaConverter/ColladaConverter.cpp
View File

@@ -615,8 +615,7 @@ bool ColladaConverter::convert()
return true; return true;
} }
domNode* domNode* ColladaConverter::findNode (const char* nodeName)
ColladaConverter::findNode (const char* nodeName)
{ {
if (!m_dom) if (!m_dom)
return NULL; return NULL;
@@ -641,8 +640,7 @@ ColladaConverter::findNode (const char* nodeName)
return NULL; return NULL;
} }
domNode* domNode* ColladaConverter::findNode (btRigidBody* rb)
ColladaConverter::findNode (btRigidBody* rb)
{ {
if (rb->getTypedUserInfo()) if (rb->getTypedUserInfo())
{ {
@@ -654,8 +652,7 @@ ColladaConverter::findNode (btRigidBody* rb)
return NULL; return NULL;
} }
domRigid_body* domRigid_body* ColladaConverter::findRigid_body (const char* rigidbodyName)
ColladaConverter::findRigid_body (const char* rigidbodyName)
{ {
domLibrary_physics_models_Array& physicsModelsArray = m_dom->getLibrary_physics_models_array(); domLibrary_physics_models_Array& physicsModelsArray = m_dom->getLibrary_physics_models_array();
for (int i = 0; i < physicsModelsArray.getCount(); i++) for (int i = 0; i < physicsModelsArray.getCount(); i++)
@@ -679,8 +676,7 @@ ColladaConverter::findRigid_body (const char* rigidbodyName)
return NULL; return NULL;
} }
domRigid_body* domRigid_body* ColladaConverter::findRigid_body (btRigidBody* rb)
ColladaConverter::findRigid_body (btRigidBody* rb)
{ {
if (rb->getTypedUserInfo ()) if (rb->getTypedUserInfo ())
{ {
@@ -692,8 +688,7 @@ ColladaConverter::findRigid_body (btRigidBody* rb)
return NULL; return NULL;
} }
domInstance_rigid_body* domInstance_rigid_body* ColladaConverter::findRigid_body_instance (const char* nodeName)
ColladaConverter::findRigid_body_instance (const char* nodeName)
{ {
domPhysics_scene* physicsScene = getDefaultPhysicsScene (); domPhysics_scene* physicsScene = getDefaultPhysicsScene ();
domInstance_physics_model_Array& physicsModelInstances = physicsScene->getInstance_physics_model_array (); domInstance_physics_model_Array& physicsModelInstances = physicsScene->getInstance_physics_model_array ();
@@ -713,8 +708,7 @@ ColladaConverter::findRigid_body_instance (const char* nodeName)
return NULL; return NULL;
} }
domInstance_rigid_body* domInstance_rigid_body* ColladaConverter::findRigid_body_instance (btRigidBody* rb)
ColladaConverter::findRigid_body_instance (btRigidBody* rb)
{ {
if (rb->getTypedUserInfo ()) if (rb->getTypedUserInfo ())
{ {
@@ -726,8 +720,7 @@ ColladaConverter::findRigid_body_instance (btRigidBody* rb)
return NULL; return NULL;
} }
domRigid_constraint* domRigid_constraint* ColladaConverter::findRigid_constraint (const char* constraintName)
ColladaConverter::findRigid_constraint (const char* constraintName)
{ {
domLibrary_physics_models_Array& physicsModelsArray = m_dom->getLibrary_physics_models_array(); domLibrary_physics_models_Array& physicsModelsArray = m_dom->getLibrary_physics_models_array();
for (int i = 0; i < physicsModelsArray.getCount(); i++) for (int i = 0; i < physicsModelsArray.getCount(); i++)
@@ -752,8 +745,7 @@ ColladaConverter::findRigid_constraint (const char* constraintName)
return NULL; return NULL;
} }
domRigid_constraint* domRigid_constraint* ColladaConverter::findRigid_constraint (btTypedConstraint* constraint)
ColladaConverter::findRigid_constraint (btTypedConstraint* constraint)
{ {
if (constraint->getTypedUserInfo ()) if (constraint->getTypedUserInfo ())
{ {
@@ -765,8 +757,7 @@ ColladaConverter::findRigid_constraint (btTypedConstraint* constraint)
return NULL; return NULL;
} }
domGeometry* domGeometry* ColladaConverter::findGeometry (const char* shapeName)
ColladaConverter::findGeometry (const char* shapeName)
{ {
domLibrary_geometries* geomLib = getDefaultGeomLib (); domLibrary_geometries* geomLib = getDefaultGeomLib ();
domGeometry_Array& geometryArray = geomLib->getGeometry_array (); domGeometry_Array& geometryArray = geomLib->getGeometry_array ();
@@ -784,8 +775,7 @@ ColladaConverter::findGeometry (const char* shapeName)
return NULL; return NULL;
} }
domGeometry* domGeometry* ColladaConverter::findGeometry (btCollisionShape* shape)
ColladaConverter::findGeometry (btCollisionShape* shape)
{ {
if (shape->getTypedUserInfo ()) if (shape->getTypedUserInfo ())
{ {
@@ -1057,8 +1047,7 @@ void ColladaConverter::PreparePhysicsObject(struct btRigidBodyInput& input, bool
} }
domLibrary_geometries* domLibrary_geometries* ColladaConverter::getDefaultGeomLib ()
ColladaConverter::getDefaultGeomLib ()
{ {
domLibrary_geometries* geometriesLib = NULL; domLibrary_geometries* geometriesLib = NULL;
@@ -1071,8 +1060,7 @@ ColladaConverter::getDefaultGeomLib ()
} }
} }
domLibrary_physics_materials* domLibrary_physics_materials* ColladaConverter::getDefaultMaterialsLib ()
ColladaConverter::getDefaultMaterialsLib ()
{ {
domLibrary_physics_materials* materialsLib = NULL; domLibrary_physics_materials* materialsLib = NULL;
@@ -1098,8 +1086,7 @@ ColladaConverter::getDefaultMaterialsLib ()
return materialsLib; return materialsLib;
} }
domPhysics_model* domPhysics_model* ColladaConverter::getDefaultPhysicsModel ()
ColladaConverter::getDefaultPhysicsModel ()
{ {
domLibrary_physics_models* modelsLib = NULL; domLibrary_physics_models* modelsLib = NULL;
@@ -1139,8 +1126,7 @@ ColladaConverter::getDefaultPhysicsModel ()
} }
domInstance_physics_model* domInstance_physics_model* ColladaConverter::getDefaultInstancePhysicsModel ()
ColladaConverter::getDefaultInstancePhysicsModel ()
{ {
domPhysics_scene* physicsScene = getDefaultPhysicsScene (); domPhysics_scene* physicsScene = getDefaultPhysicsScene ();
domInstance_physics_model_Array& physicsModelInstances = physicsScene->getInstance_physics_model_array (); domInstance_physics_model_Array& physicsModelInstances = physicsScene->getInstance_physics_model_array ();
@@ -1159,8 +1145,7 @@ ColladaConverter::getDefaultInstancePhysicsModel ()
return physicsModelInstance; return physicsModelInstance;
} }
domPhysics_scene* domPhysics_scene* ColladaConverter::getDefaultPhysicsScene ()
ColladaConverter::getDefaultPhysicsScene ()
{ {
domLibrary_physics_scenes* physicsScenesLib = NULL; domLibrary_physics_scenes* physicsScenesLib = NULL;
@@ -1183,8 +1168,7 @@ ColladaConverter::getDefaultPhysicsScene ()
} }
domVisual_scene* domVisual_scene* ColladaConverter::getDefaultVisualScene ()
ColladaConverter::getDefaultVisualScene ()
{ {
domLibrary_visual_scenes* visualScenesLib = NULL; domLibrary_visual_scenes* visualScenesLib = NULL;
@@ -1206,8 +1190,7 @@ ColladaConverter::getDefaultVisualScene ()
} }
void void ColladaConverter::addConvexHull (btCollisionShape* shape, const char* nodeName)
ColladaConverter::addConvexHull (btCollisionShape* shape, const char* nodeName)
{ {
btConvexHullShape* hullShape = (btConvexHullShape*)shape; btConvexHullShape* hullShape = (btConvexHullShape*)shape;
btShapeHull* triHull = new btShapeHull (hullShape); btShapeHull* triHull = new btShapeHull (hullShape);
@@ -2121,13 +2104,11 @@ ColladaConverter::updateConstraint (btTypedConstraint* constraint, domRigid_cons
} }
} }
void void ColladaConverter::syncOrAddGeometry (btCollisionShape* shape, const char* nodeName)
ColladaConverter::syncOrAddGeometry (btCollisionShape* shape, const char* nodeName)
{ {
} }
void void ColladaConverter::syncOrAddRigidBody (btRigidBody* body)
ColladaConverter::syncOrAddRigidBody (btRigidBody* body)
{ {
domNodeRef node = findNode (body); domNodeRef node = findNode (body);
domLibrary_geometriesRef geomLib = getDefaultGeomLib (); domLibrary_geometriesRef geomLib = getDefaultGeomLib ();
@@ -2182,8 +2163,7 @@ ColladaConverter::syncOrAddRigidBody (btRigidBody* body)
} }
} }
void void ColladaConverter::syncOrAddConstraint (btTypedConstraint* constraint)
ColladaConverter::syncOrAddConstraint (btTypedConstraint* constraint)
{ {
domRigid_constraintRef rigidConstraint = findRigid_constraint (constraint); domRigid_constraintRef rigidConstraint = findRigid_constraint (constraint);
return; return;