Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.cc

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

File:

• branches/new_class_id/src/lib/util/loading/resource.cc (modified) (6 diffs)

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -17 +17 @@
 
 #include "resource.h"
-#include "new_resource_manager.h"
+#include "resource_manager.h"
 
 #include "debug.h"
@@ -47 +47 @@
   std::string NewResource::locateFile(const std::string& fileName) const
   {
-    if ((NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
-      return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
+    if ((ResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
+      return (ResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
 
     std::string locatedFile;
-    locatedFile = locateFileInSubDir(NewResourceManager::getInstance()->mainGlobalPath(), fileName);
+    locatedFile = locateFileInSubDir(ResourceManager::getInstance()->mainGlobalPath(), fileName);
     if (!locatedFile.empty())
     {
@@ -61 +61 @@
       return fileName;
 
-    return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
+    return (ResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
   }
 
@@ -115 +115 @@
   KeepLevel::KeepLevel(const std::string& keepLevelName)
   {
-    this->_keepLevel = NewResourceManager::getInstance()->getKeepLevelID(keepLevelName);
+    this->_keepLevel = ResourceManager::getInstance()->getKeepLevelID(keepLevelName);
   }
 
   const std::string& KeepLevel::name() const
   {
-    return NewResourceManager::getInstance()->getKeepLevelName(this->_keepLevel);
+    return ResourceManager::getInstance()->getKeepLevelName(this->_keepLevel);
   }
 
@@ -141 +141 @@
       : _id(-1), _typeName(typeName)
   {
-    NewResourceManager::getInstance()->registerType(this);
+    ResourceManager::getInstance()->registerType(this);
     PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
   }
@@ -147 +147 @@
   Type::~Type()
   {
-    NewResourceManager::getInstance()->unregisterType(this);
+    ResourceManager::getInstance()->unregisterType(this);
   }