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

getting ready to add user-defined object types

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@122 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-10-24 21:16:00 +00:00
parent 1ade25beaa
commit 8e858a2aa1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Engine.h
View File

@ -5,6 +5,7 @@
#include <string> #include <string>
#include <lua.hpp> #include <lua.hpp>
#include <map> #include <map>
#include <vector>
#include <SDL.h> #include <SDL.h>
#include "OdeWorld/OdeWorld.h" #include "OdeWorld/OdeWorld.h"
#include "TextureCache/TextureCache.h" #include "TextureCache/TextureCache.h"
@ -17,8 +18,11 @@ 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,
const std::vector<float> & args);
Object(const Object & orig); Object(const Object & orig);
~Object(); ~Object();