josh/OdeWorld
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed CCylinder to Capsule globally

Browse Source 
git-svn-id: svn://anubis/misc/OdeWorld@201 bd8a9e45-a331-0410-811e-c64571078777
This commit is contained in:
josh 2009-10-29 02:58:41 +00:00
parent af7060b853
commit 5879a4b953
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OdeWorld.cc
View File

@ -185,7 +185,7 @@ dGeomID OdeWorld::Object::cloneGeom(dGeomID geom, dBodyID body)
id = dCreateBox(space, size[0], size[1], size[2]);
}
break;
case dCCylinderClass:
case dCapsuleClass:
{
dReal radius, length;
dGeomCylinderGetParams(geom, &radius, &length);
@ -195,8 +195,8 @@ dGeomID OdeWorld::Object::cloneGeom(dGeomID geom, dBodyID body)
case dCylinderClass:
{
dReal radius, length;
dGeomCCylinderGetParams(geom, &radius, &length);
id = dCreateCCylinder(space, radius, length);
dGeomCapsuleGetParams(geom, &radius, &length);
id = dCreateCapsule(space, radius, length);
}
break;
case dPlaneClass:
@ -294,11 +294,11 @@ bool OdeWorld::Object::addCylinder(refptr< std::vector<float> > args)
return true;
}
bool OdeWorld::Object::addCCylinder(refptr< std::vector<float> > args)
bool OdeWorld::Object::addCapsule(refptr< std::vector<float> > args)
{
if (args->size() != 8)
return false;
dGeomID id = dCreateCCylinder(0,
dGeomID id = dCreateCapsule(0,
m_scale * (*args)[0], m_scale * (*args)[1]);
dMass mass;
dMassSetCappedCylinder(&mass, 1.0, 3, m_scale * (*args)[0],

2
OdeWorld.h
View File

@ -32,7 +32,7 @@ class OdeWorld
bool addBox(refptr< std::vector<float> > args);
bool addSphere(refptr< std::vector<float> > args);
bool addCylinder(refptr< std::vector<float> > args);
bool addCCylinder(refptr< std::vector<float> > args);
bool addCapsule(refptr< std::vector<float> > args);
bool addPlane(refptr< std::vector<float> > args);
void addForce(dReal fx, dReal fy, dReal fz);
void addRelForce(dReal fx, dReal fy, dReal fz);