Changeset 9709 in orxonox.OLD for branches/new_class_id/src/world_entities/terrain.cc

Timestamp:

Aug 31, 2006, 10:51:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

File:

• branches/new_class_id/src/world_entities/terrain.cc (modified) (5 diffs)

branches/new_class_id/src/world_entities/terrain.cc

@@ -34 +34 @@
 
 
-
-CREATE_FACTORY(Terrain, CL_TERRAIN);
+#include "class_id.h"
+NewObjectListDefinitionID(Terrain, CL_TERRAIN);
+CREATE_FACTORY(Terrain);
 
 /**
@@ -89 +90 @@
 {
   if (objectList)
-    glDeleteLists(this->objectList, 1);
+    glDeleteLists(this->modelList, 1);
   if( this->ssp)
     delete ssp;
@@ -104 +105 @@
 void Terrain::init()
 {
-  this->setClassID(CL_TERRAIN, "Terrain");
+  this->registerObject(this, Terrain::_objectList);
   this->toList(OM_ENVIRON_NOTICK);
   this->toReflectionList();
 
-  this->objectList = 0;
+  this->modelList = 0;
   this->ssp = NULL;
   this->vegetation = NULL;
@@ -207 +208 @@
 
   if (this->objectList)
-    glCallList(this->objectList);
+    glCallList(this->modelList);
   else if (this->getModel())
     this->getModel()->draw();
@@ -256 +257 @@
   if (debugTerrain == TERRAIN_DAVE)
   {
-    objectList = glGenLists(1);
-    glNewList (objectList, GL_COMPILE);
+    modelList = glGenLists(1);
+    glNewList (modelList, GL_COMPILE);
 
     glColor3f(1.0,0,0);