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

Timestamp:

Sep 26, 2006, 4:59:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

File:

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

branches/new_class_id/src/world_entities/terrain.cc

@@ -18 +18 @@
 #include "terrain.h"
 
+#include "util/loading/new_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"
@@ -93 +93 @@
   if( this->ssp)
     delete ssp;
-  if (this->vegetation)
-  {
-    ResourceManager::getInstance()->unload(this->vegetation);
-  }
 
   if(this->heightMap)
@@ -148 +144 @@
   this->heightMap = NULL;
 
-  std::string hmName = ResourceManager::getFullName(heightMapFile);
-  std::string hmColorName = ResourceManager::getFullName(colorMap);
+  std::string hmName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(heightMapFile);
+  std::string hmColorName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(colorMap);
 
 
@@ -181 +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