From cb1186d9e88269c8e9b1caa1fee5b217e36b07a2 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sun, 27 Sep 2009 23:11:16 +0000 Subject: [PATCH] added loadPhy() to Engine::Object git-svn-id: svn://anubis/anaglym/trunk@36 99a6e188-d820-4881-8870-2d33a10e2619 --- ag.cc | 6 +----- anaglym.cc | 5 +++++ anaglym.h | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ag.cc b/ag.cc index 325033d..b8b41fd 100644 --- a/ag.cc +++ b/ag.cc @@ -119,11 +119,7 @@ namespace ag lua_setfield(L, -2, "draw"); if (physpath != "") { - /* TODO: ODE info */ -#if 0 - dGeomID gid = - g_engine->getWorld().loadPhy(physpath); -#endif + g_engine->getObject(id)->loadPhy(physpath); } return 1; } diff --git a/anaglym.cc b/anaglym.cc index 614f1a2..0fb19ff 100644 --- a/anaglym.cc +++ b/anaglym.cc @@ -170,3 +170,8 @@ Engine::Object * Engine::getObject(int id) void Engine::run() { } + +void Engine::Object::loadPhy(const std::string & path, bool static_data) +{ + m_geoms = g_engine->m_world.loadPhy(path, static_data); +} diff --git a/anaglym.h b/anaglym.h index 829af9e..3d5a372 100644 --- a/anaglym.h +++ b/anaglym.h @@ -19,8 +19,11 @@ class Engine public: WFObj * wfobj; GLuint display_list; + std::vector m_geoms; void draw() { glCallList(display_list); } + void loadPhy(const std::string & path, + bool static_data = false); }; Engine();