From d595278039a0e3151421ba491fcb0673cabe0902 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 8 Oct 2009 00:46:57 +0000 Subject: [PATCH] migrating some Engine::Object functionality to OdeWorld::Object git-svn-id: svn://anubis/anaglym/trunk@54 99a6e188-d820-4881-8870-2d33a10e2619 --- anaglym.cc | 1 + anaglym.h | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/anaglym.cc b/anaglym.cc index c516129..fc07e75 100644 --- a/anaglym.cc +++ b/anaglym.cc @@ -331,6 +331,7 @@ void Engine::doPhysics() void Engine::Object::loadPhy(const std::string & path, bool static_data) { + is_static = static_data; geoms = g_engine->m_world.loadPhy(path, &body, static_data); } diff --git a/anaglym.h b/anaglym.h index fe5617d..e8556a7 100644 --- a/anaglym.h +++ b/anaglym.h @@ -17,17 +17,13 @@ class Engine class Object { public: - Object() { body = 0; } + Object() { body = 0; is_static = false; } WFObj * wfobj; GLuint display_list; std::vector geoms; dBodyID body; void draw(); - void loadPhy(const std::string & path, - bool static_data = false); - void setPosition(double x, double y, double z); - void getPosition(double * x, double * y, double * z); }; Engine();