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

Timestamp:

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

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

Location:

branches/new_class_id/src/world_entities

Files:

• bsp_entity.cc (modified) (2 diffs)
• creatures/md2_creature.cc (modified) (1 diff)
• environment.cc (modified) (1 diff)
• environments/mapped_water.cc (modified) (1 diff)
• npcs/generic_npc.cc (modified) (1 diff)
• recorder.cc (modified) (1 diff)
• satellite.h (modified) (1 diff)
• skydome.cc (modified) (1 diff)
• terrain.cc (modified) (4 diffs)
• weather_effects/atmospheric_engine.cc (modified) (1 diff)
• weather_effects/cloud_effect.cc (modified) (1 diff)

branches/new_class_id/src/world_entities/bsp_entity.cc

@@ -15 +15 @@
 
 #include "bsp_entity.h"
-#include "util/loading/resource_manager.h"
-#include "util/loading/resource_manager.h"
 
 #include "debug.h"
+#include "loading/new_resource_manager.h"
 
 #include "class_id_DEPRECATED.h"
@@ -72 +71 @@
 
   // Check wether file exists....
-  if ( File(ResourceManager::getFullName(name)).exists()  ) {
+  if ( File(Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(name)).exists()  ) {
 
     this->bspManager = new BspManager(this);

branches/new_class_id/src/world_entities/creatures/md2_creature.cc

@@ -22 +22 @@
 #include "objModel.h"
 #include "md2/md2Model.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 

branches/new_class_id/src/world_entities/environment.cc

@@ -19 +19 @@
 
 #include "environment.h"
-
-#include "util/loading/resource_manager.h"
 
 #include "objModel.h"

branches/new_class_id/src/world_entities/environments/mapped_water.cc

@@ -17 +17 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "t_animation.h"

branches/new_class_id/src/world_entities/npcs/generic_npc.cc

@@ -29 +29 @@
 #include "resource_sound_buffer.h"
 
-#include "loading/resource_manager.h"
 #include "sound/resource_sound_buffer.h"
 

branches/new_class_id/src/world_entities/recorder.cc

@@ -18 +18 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "debug.h"

branches/new_class_id/src/world_entities/satellite.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "comincl.h"
-#include "util/loading/resource_manager.h"
-
 
 class CharacterAttributes;

branches/new_class_id/src/world_entities/skydome.cc

@@ -23 +23 @@
 #include "network_game_manager.h"
 #include "converter.h"
-#include "util/loading/resource_manager.h"
 
 #include "debug.h"

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

branches/new_class_id/src/world_entities/weather_effects/atmospheric_engine.cc

@@ -15 +15 @@
 
 #include "atmospheric_engine.h"
-
-#include "util/loading/resource_manager.h"
 
 #include "weather_effects/fog_effect.h"

branches/new_class_id/src/world_entities/weather_effects/cloud_effect.cc

@@ -19 +19 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
 
 #include "material.h"