Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource_manager.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_manager.cc (modified) (16 diffs)

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOAD
 
-#include "new_resource_manager.h"
+#include "resource_manager.h"
 #include "debug.h"
 
@@ -25 +25 @@
 namespace Resources
 {
-  ObjectListDefinition(NewResourceManager);
-  //! Singleton Reference to the NewResourceManager
-  NewResourceManager* NewResourceManager::_singletonRef = NULL;
+  ObjectListDefinition(ResourceManager);
+  //! Singleton Reference to the ResourceManager
+  ResourceManager* ResourceManager::_singletonRef = NULL;
 
 
@@ -33 +33 @@
    * @brief standard constructor
   */
-  NewResourceManager::NewResourceManager ()
+  ResourceManager::ResourceManager ()
   {
-    this->registerObject(this, NewResourceManager::_objectList);
-    this->setName("NewResourceManager");
+    this->registerObject(this, ResourceManager::_objectList);
+    this->setName("ResourceManager");
     this->_mainGlobalPath = Directory("./");
   }
@@ -44 +44 @@
    * @brief standard destructor
   */
-  NewResourceManager::~NewResourceManager ()
+  ResourceManager::~ResourceManager ()
   {
     // deleting the Resources-List
@@ -52 +52 @@
     //     PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList.size());
 
-    NewResourceManager::_singletonRef = NULL;
+    ResourceManager::_singletonRef = NULL;
   }
 
@@ -58 +58 @@
 
 
-  void NewResourceManager::registerType(Resources::Type* type)
+  void ResourceManager::registerType(Resources::Type* type)
   {
     if(type->id() == -1)
@@ -68 +68 @@
   }
 
-  void NewResourceManager::unregisterType(Resources::Type* type)
+  void ResourceManager::unregisterType(Resources::Type* type)
   {
     std::vector<Resources::Type*>::iterator it = std::find (this->_resourceTypes.begin(), this->_resourceTypes.end(), type);
@@ -79 +79 @@
 
 
-  void NewResourceManager::setMainGlobalPath(const Directory& directory)
+  void ResourceManager::setMainGlobalPath(const Directory& directory)
   {
     this->_mainGlobalPath = directory;
@@ -85 +85 @@
   }
 
-  void NewResourceManager::addGlobalPath(const Directory& directory)
+  void ResourceManager::addGlobalPath(const Directory& directory)
   {
     std::vector<Directory>::const_iterator it = std::find(this->_globalPaths.begin(), this->_globalPaths.end(), directory);
@@ -93 +93 @@
 
 
-  bool NewResourceManager::addResourcePath(const std::string& resourceName, const std::string& pathName)
+  bool ResourceManager::addResourcePath(const std::string& resourceName, const std::string& pathName)
   {
     std::vector<Resources::Type*>::iterator it;
@@ -103 +103 @@
   }
 
-  bool NewResourceManager::addResourceSubPath(const std::string& resourceName, const std::string& pathName)
+  bool ResourceManager::addResourceSubPath(const std::string& resourceName, const std::string& pathName)
   {
     std::vector<Resources::Type*>::iterator it;
@@ -115 +115 @@
 
 
-  bool NewResourceManager::checkFileInMainPath(const File& fileInside)
+  bool ResourceManager::checkFileInMainPath(const File& fileInside)
   {
     return (this->_mainGlobalPath + fileInside).exists();
   }
 
-  std::string NewResourceManager::prependAbsoluteMainPath(const std::string& fileName)
+  std::string ResourceManager::prependAbsoluteMainPath(const std::string& fileName)
   {
     return (this->_mainGlobalPath + File(fileName)).name();
@@ -126 +126 @@
 
 
-  unsigned int NewResourceManager::addKeepLevelName(const std::string& keepLevelName)
+  unsigned int ResourceManager::addKeepLevelName(const std::string& keepLevelName)
   {
     this->_keepLevelNames.push_back(keepLevelName);
@@ -132 +132 @@
   }
 
-  unsigned int NewResourceManager::getKeepLevelID(const std::string& keepLevelName) const
+  unsigned int ResourceManager::getKeepLevelID(const std::string& keepLevelName) const
   {
     for (unsigned int i = 0; i < this->_keepLevelNames.size(); ++i)
@@ -142 +142 @@
   }
 
-  const std::string& NewResourceManager::getKeepLevelName(unsigned int keepLevelID) const
+  const std::string& ResourceManager::getKeepLevelName(unsigned int keepLevelID) const
   {
     assert(keepLevelID < this->_keepLevelNames.size());
@@ -150 +150 @@
 
   /**
-   * @brief outputs debug information about the NewResourceManager
+   * @brief outputs debug information about the ResourceManager
    */
-  void NewResourceManager::debug() const
+  void ResourceManager::debug() const
   {
     PRINT(0)("=RM===================================\n");