Changeset 9869 in orxonox.OLD for trunk/src/world_entities/terrain.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/terrain.cc (modified) (8 diffs)

trunk/src/world_entities/terrain.cc

@@ -18 +18 @@
 #include "terrain.h"
 
+#include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
 #include "spatial_separation.h"
 
-#include "util/loading/resource_manager.h"
 #include "model.h"
 #include "network_game_manager.h"
@@ -32 +32 @@
 
 #include "state.h"
-
-
-
-CREATE_FACTORY(Terrain, CL_TERRAIN);
+#include "debug.h"
+
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Terrain, CL_TERRAIN);
+CREATE_FACTORY(Terrain);
 
 /**
@@ -88 +89 @@
 Terrain::~Terrain ()
 {
-  if (objectList)
-    glDeleteLists(this->objectList, 1);
+  if (modelList)
+    glDeleteLists(this->modelList, 1);
   if( this->ssp)
     delete ssp;
-  if (this->vegetation)
-  {
-    ResourceManager::getInstance()->unload(this->vegetation);
-  }
 
   if(this->heightMap)
@@ -104 +101 @@
 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;
@@ -147 +144 @@
   this->heightMap = NULL;
 
-  std::string hmName = ResourceManager::getFullName(heightMapFile);
-  std::string hmColorName = ResourceManager::getFullName(colorMap);
+  std::string hmName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(heightMapFile);
+  std::string hmColorName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(colorMap);
 
 
@@ -180 +177 @@
   PRINTF(4)("loadVegetation: %s\n", vegetationFile.c_str());
   if (this->vegetation)
-    ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
+    this->vegetation = 0;
   if (!vegetationFile.empty())
   {
     PRINTF(4)("fetching %s\n", vegetationFile.c_str());
-    this->vegetation = dynamic_cast<Model*>(ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN));
+    this->loadModel(vegetationFile, 1.0, 2);
+    this->vegetation = this->getModel(2);
   }
   else
@@ -206 +204 @@
   //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  if (this->objectList)
-    glCallList(this->objectList);
+  if (this->modelList)
+    glCallList(this->modelList);
   else if (this->getModel())
     this->getModel()->draw();
@@ -256 +254 @@
   if (debugTerrain == TERRAIN_DAVE)
   {
-    objectList = glGenLists(1);
-    glNewList (objectList, GL_COMPILE);
+    modelList = glGenLists(1);
+    glNewList (modelList, GL_COMPILE);
 
     glColor3f(1.0,0,0);