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

moved Engine::Object::ObjectType to OdeWorld::GeomType; using refptr in Engine::Object to keep track of object arguments for managed objects

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@123 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-10-26 02:31:47 +00:00
parent 8e858a2aa1
commit d1a57b673e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Engine.h
View File

@ -11,6 +11,7 @@
#include "TextureCache/TextureCache.h" #include "TextureCache/TextureCache.h"
#include "wfobj/WFObj.h" #include "wfobj/WFObj.h"
#include "Video.h" #include "Video.h"
#include "refptr/refptr.h"
class Engine class Engine
{ {
@ -18,10 +19,10 @@ class Engine
class Object class Object
{ {
public: public:
enum ObjectType { CUBE, SPHERE, PLANE, CYLINDER, CCYLINDER };
Object(bool is_static, OdeWorld & world, GLuint dl, Object(bool is_static, OdeWorld & world, GLuint dl,
float scale = 1.0f); 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<float> & args); const std::vector<float> & args);
Object(const Object & orig); Object(const Object & orig);
~Object(); ~Object();
@ -67,6 +68,8 @@ class Engine
bool m_is_visible; bool m_is_visible;
float m_scale; float m_scale;
bool m_is_scaled; bool m_is_scaled;
OdeWorld::GeomType m_geom_type;
refptr< std::vector<float> > m_args;
}; };
class EngineFileLoader : public FileLoader class EngineFileLoader : public FileLoader