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

moved Object contructor/destructor into .cc file, keeping track of number of references to OpenGL display list and deleting it when the last reference goes away

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@66 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-10-12 15:00:46 +00:00
parent bd2d3d8b25
commit 5bf9e9f2ec
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
anaglym.cc
View File

@ -343,10 +343,32 @@ void Engine::drawObjects()
} }
} }
Engine::Object::Object(bool is_static, OdeWorld & world, GLuint dl)
{
m_ode_object = world.createObject(is_static);
m_display_list = dl;
m_display_list_refcnt = new int;
*m_display_list_refcnt = 1;
}
Engine::Object::Object(const Engine::Object & orig) Engine::Object::Object(const Engine::Object & orig)
{ {
m_display_list = orig.m_display_list;
m_ode_object = new OdeWorld::Object(*orig.m_ode_object); m_ode_object = new OdeWorld::Object(*orig.m_ode_object);
m_display_list = orig.m_display_list;
m_display_list_refcnt = orig.m_display_list_refcnt;
(*m_display_list_refcnt)++;
}
Engine::Object::~Object()
{
delete m_ode_object;
(*m_display_list_refcnt)--;
if (*m_display_list_refcnt < 1)
{
/* we hold the last reference to the OpenGL display list */
delete m_display_list_refcnt;
glDeleteLists(m_display_list, 1);
}
} }
void Engine::Object::draw() void Engine::Object::draw()

12
anaglym.h
View File

@ -17,16 +17,9 @@ class Engine
class Object class Object
{ {
public: public:
Object(bool is_static, OdeWorld & world, GLuint dl) Object(bool is_static, OdeWorld & world, GLuint dl);
{
m_ode_object = world.createObject(is_static);
m_display_list = dl;
}
Object(const Object & orig); Object(const Object & orig);
~Object() ~Object();
{
delete m_ode_object;
}
void setPosition(double x, double y, double z) void setPosition(double x, double y, double z)
{ {
@ -46,6 +39,7 @@ class Engine
protected: protected:
OdeWorld::Object * m_ode_object; OdeWorld::Object * m_ode_object;
GLuint m_display_list; GLuint m_display_list;
int * m_display_list_refcnt;
}; };
Engine(); Engine();