added body parameter to Engine::Object
git-svn-id: svn://anubis/anaglym/trunk@43 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
1 parent
99a8835954
commit
0753f243c5
3 files changed
+16
-4
No files matched your search
@@ -223,10 +223,8 @@ namespace ag
|
||||
{
|
||||
Engine::Object * obj = getObject(L, -1);
|
||||
if (obj != NULL)
|
||||
{
|
||||
obj->draw();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -235,6 +233,9 @@ namespace ag
|
||||
int argc = lua_gettop(L);
|
||||
|
||||
if (argc == 4)
|
||||
{
|
||||
Engine::Object * obj = getObject(L, 1);
|
||||
if (obj != NULL)
|
||||
{
|
||||
double position[3];
|
||||
for (int i = 0; i < 3; i++)
|
||||
@@ -246,12 +247,21 @@ namespace ag
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int getPosition(lua_State * L)
|
||||
{
|
||||
int argc = lua_gettop(L);
|
||||
if (argc == 1)
|
||||
{
|
||||
Engine::Object * obj = getObject(L, 1);
|
||||
if (obj != NULL)
|
||||
{
|
||||
}
|
||||
}
|
||||
return 3;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -237,5 +237,5 @@ void Engine::run()
|
||||
|
||||
void Engine::Object::loadPhy(const std::string & path, bool static_data)
|
||||
{
|
||||
m_geoms = g_engine->m_world.loadPhy(path, static_data);
|
||||
geoms = g_engine->m_world.loadPhy(path, &body, static_data);
|
||||
}
|
||||
Reference in new issue
Block a user