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

renamed CCylinder to Capsule globally

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@139 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-10-29 02:58:37 +00:00
parent c802886b11
commit acae74107a
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.todo
View File

@ -1,4 +1,3 @@
- rename CCylinder to Capsule
- add plane constructor taking 4 parameters for (a,b,c,d) - add plane constructor taking 4 parameters for (a,b,c,d)
- support loading and applying textures for managed objects - support loading and applying textures for managed objects
- debug hooks for loading and execution to halt infinite lua loops - debug hooks for loading and execution to halt infinite lua loops

2
Engine.cc
View File

@ -704,7 +704,7 @@ void Engine::Object::createManagedObject()
case OdeWorld::CCYLINDER: case OdeWorld::CCYLINDER:
while (m_args->size() < 8) while (m_args->size() < 8)
m_args->push_back(0); m_args->push_back(0);
m_ode_object->addCCylinder(m_args); m_ode_object->addCapsule(m_args);
break; break;
} }
m_ode_object->finalize(); m_ode_object->finalize();

14
ag.cc
View File

@ -49,8 +49,8 @@ namespace ag
{ "createStaticPlane", createStaticPlane}, { "createStaticPlane", createStaticPlane},
{ "createCylinder", createCylinder}, { "createCylinder", createCylinder},
{ "createStaticCylinder", createStaticCylinder}, { "createStaticCylinder", createStaticCylinder},
{ "createCCylinder", createCCylinder}, { "createCapsule", createCapsule},
{ "createStaticCCylinder", createStaticCCylinder}, { "createStaticCapsule", createStaticCapsule},
{ NULL, NULL } { NULL, NULL }
}; };
@ -413,7 +413,7 @@ namespace ag
return createCylinderSpecify(L, true); return createCylinderSpecify(L, true);
} }
static int createCCylinderSpecify(lua_State * L, bool is_static) static int createCapsuleSpecify(lua_State * L, bool is_static)
{ {
int argc = lua_gettop(L); int argc = lua_gettop(L);
if (argc == 2 && lua_isnumber(L, 1) && lua_isnumber(L, 2)) if (argc == 2 && lua_isnumber(L, 1) && lua_isnumber(L, 2))
@ -428,14 +428,14 @@ namespace ag
return 1; return 1;
} }
int createCCylinder(lua_State * L) int createCapsule(lua_State * L)
{ {
return createCCylinderSpecify(L, false); return createCapsuleSpecify(L, false);
} }
int createStaticCCylinder(lua_State * L) int createStaticCapsule(lua_State * L)
{ {
return createCCylinderSpecify(L, true); return createCapsuleSpecify(L, true);
} }
namespace object namespace object

4
ag.h
View File

@ -35,8 +35,8 @@ namespace ag
int createStaticPlane(lua_State * L); int createStaticPlane(lua_State * L);
int createCylinder(lua_State * L); int createCylinder(lua_State * L);
int createStaticCylinder(lua_State * L); int createStaticCylinder(lua_State * L);
int createCCylinder(lua_State * L); int createCapsule(lua_State * L);
int createStaticCCylinder(lua_State * L); int createStaticCapsule(lua_State * L);
namespace object namespace object
{ {

2
tests/managed_objects.lua
View File

@ -18,7 +18,7 @@ function key_down_event(key)
cyl = ag.createCylinder(0.5, 1) cyl = ag.createCylinder(0.5, 1)
init(cyl) init(cyl)
elseif (key == "a") then elseif (key == "a") then
ccyl = ag.createCCylinder(0.5, 1) ccyl = ag.createCapsule(0.5, 1)
init(ccyl) init(ccyl)
elseif (key == "s") then elseif (key == "s") then
sphere = ag.createSphere(0.8) sphere = ag.createSphere(0.8)