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

renamed CCYLINDER to CAPSULE

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@173 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-11-16 03:09:59 +00:00
parent 98eee6fc87
commit cdfaf84c28
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Engine.cc
View File

@ -892,7 +892,7 @@ void Engine::Object::createManagedObject()
m_args->push_back(0); m_args->push_back(0);
m_ode_object->addCylinder(m_args); m_ode_object->addCylinder(m_args);
break; break;
case OdeWorld::CCYLINDER: case OdeWorld::CAPSULE:
while (m_args->size() < 8) while (m_args->size() < 8)
m_args->push_back(0); m_args->push_back(0);
m_ode_object->addCapsule(m_args); m_ode_object->addCapsule(m_args);
@ -1069,7 +1069,7 @@ void Engine::Object::render()
glPopMatrix(); glPopMatrix();
} }
break; break;
case OdeWorld::CCYLINDER: { case OdeWorld::CAPSULE: {
glPushAttrib(GL_TRANSFORM_BIT); /* save current clip planes */ glPushAttrib(GL_TRANSFORM_BIT); /* save current clip planes */
double halfheight = (*m_args)[1] / 2.0; double halfheight = (*m_args)[1] / 2.0;
glPushMatrix(); glPushMatrix();

2
ag.cc
View File

@ -516,7 +516,7 @@ namespace ag
refptr< vector<float> > args = new vector<float>(); refptr< vector<float> > args = new vector<float>();
args->push_back(lua_tonumber(L, 1)); args->push_back(lua_tonumber(L, 1));
args->push_back(lua_tonumber(L, 2)); args->push_back(lua_tonumber(L, 2));
addManagedObject(L, is_static, OdeWorld::CCYLINDER, args); addManagedObject(L, is_static, OdeWorld::CAPSULE, args);
} }
else else
lua_pushnil(L); lua_pushnil(L);