Changeset 9836 in orxonox.OLD for branches/new_class_id/src/story_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/story_entities

Files:

• game_world_data.cc (modified) (2 diffs)
• story_entity.cc (modified) (2 diffs)

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -25 +25 @@
 
 #include "util/loading/game_loader.h"
-#include "util/loading/new_resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 #include "world_entity.h"
@@ -379 +379 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
-    std::string oggFile = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(name);
+    std::string oggFile = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(name);
     this->music = new OrxSound::OggPlayer(oggFile);
     if (this->localPlayer != NULL)

branches/new_class_id/src/story_entities/story_entity.cc

@@ -23 +23 @@
 
 #include "loading/load_param.h"
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 
 #include "debug.h"
@@ -107 +107 @@
   }
   else
-    this->loadFile = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
+    this->loadFile = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
 
   this->grabWorldInfo();