From d1a57b673e3f0ad98c65518c0a77b201e768cc08 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 26 Oct 2009 02:31:47 +0000 Subject: [PATCH] moved Engine::Object::ObjectType to OdeWorld::GeomType; using refptr in Engine::Object to keep track of object arguments for managed objects git-svn-id: svn://anubis/anaglym/trunk@123 99a6e188-d820-4881-8870-2d33a10e2619 --- Engine.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Engine.h b/Engine.h index 5cd061f..d58d405 100644 --- a/Engine.h +++ b/Engine.h @@ -11,6 +11,7 @@ #include "TextureCache/TextureCache.h" #include "wfobj/WFObj.h" #include "Video.h" +#include "refptr/refptr.h" class Engine { @@ -18,10 +19,10 @@ class Engine class Object { public: - enum ObjectType { CUBE, SPHERE, PLANE, CYLINDER, CCYLINDER }; Object(bool is_static, OdeWorld & world, GLuint dl, float scale = 1.0f); - Object(bool is_static, OdeWorld & world, ObjectType obj, + Object(bool is_static, OdeWorld & world, + OdeWorld::GeomType geom_type, const std::vector & args); Object(const Object & orig); ~Object(); @@ -67,6 +68,8 @@ class Engine bool m_is_visible; float m_scale; bool m_is_scaled; + OdeWorld::GeomType m_geom_type; + refptr< std::vector > m_args; }; class EngineFileLoader : public FileLoader