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

Timestamp:

Sep 26, 2006, 5:16:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Taken out the old ResourceManager.
On the way, i had to desintegrate the old MD3-model loading process (via ResourceManager) MD3 is untouched, but also not loaded anymore neither from ResourceMangers nor from the WorldEntity

@patrick: MD3-ModelLoading class must be implemented… this should be quite easy, with the way MD3 is, and the new Resource-paradigm
cheers

Location:

branches/new_class_id/src/world_entities

Files:

• bsp_entity.cc (modified) (2 diffs)
• terrain.cc (modified) (2 diffs)
• world_entity.cc (modified) (4 diffs)

branches/new_class_id/src/world_entities/bsp_entity.cc

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

branches/new_class_id/src/world_entities/terrain.cc

@@ -18 +18 @@
 #include "terrain.h"
 
-#include "util/loading/new_resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
@@ -144 +144 @@
   this->heightMap = NULL;
 
-  std::string hmName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(heightMapFile);
-  std::string hmColorName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(colorMap);
+  std::string hmName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(heightMapFile);
+  std::string hmColorName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(colorMap);
 
 

branches/new_class_id/src/world_entities/world_entity.cc

@@ -20 +20 @@
 #include "shell_command.h"
 
-#include "util/loading/new_resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "resource_obj.h"
 #include "md2/md2Model.h"
@@ -162 +162 @@
   std::string name = fileName;
 
-  if (  name.find( Resources::NewResourceManager::getInstance()->mainGlobalPath().name() ) == 0 )
-  {
-    name.erase(Resources::NewResourceManager::getInstance()->mainGlobalPath().name().size());
+  if (  name.find( Resources::ResourceManager::getInstance()->mainGlobalPath().name() ) == 0 )
+  {
+    name.erase(Resources::ResourceManager::getInstance()->mainGlobalPath().name().size());
   }
 
@@ -180 +180 @@
       {
         lodFile[offset] = 48+(int)i;
-        if (Resources::NewResourceManager::getInstance()->checkFileInMainPath( lodFile))
+        if (Resources::ResourceManager::getInstance()->checkFileInMainPath( lodFile))
           this->loadModel(lodFile, scaling, i);
       }
@@ -220 +220 @@
     {
       PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
-      Model* m = new md3::MD3Model(fileName, this->scaling);
-      this->setModel(m, 0);
+//      Model* m = new md3::MD3Model(fileName, this->scaling);
+//      this->setModel(m, 0);
 
       //       if( m != NULL)