Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource_manager.h

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.h (modified) (3 diffs)

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

@@ -1 +1 @@
 /*!
- * @file new_resource_manager.h
+ * @file resource_manager.h
  */
 
-#ifndef _NEW_RESOURCE_MANAGER_H
-#define _NEW_RESOURCE_MANAGER_H
+#ifndef _RESOURCE_MANAGER_H
+#define _RESOURCE_MANAGER_H
 
 #include "resource.h"
@@ -13 +13 @@
 {
 
-  class NewResourceManager : public BaseObject
+  class ResourceManager : public BaseObject
   {
-    ObjectListDeclaration(NewResourceManager);
+    ObjectListDeclaration(ResourceManager);
   public:
     /** @returns a Pointer to the only object of this Class */
-    inline static NewResourceManager* getInstance() { if (!_singletonRef) _singletonRef = new NewResourceManager();  return _singletonRef; };
+    inline static ResourceManager* getInstance() { if (!_singletonRef) _singletonRef = new ResourceManager();  return _singletonRef; };
     /** @brief deletes the Instance if it exists. */
     inline static void deleteInstance() { if (_singletonRef) delete _singletonRef; };
@@ -54 +54 @@
     static bool isInDataDir(const std::string& fileName);
   private:
-    NewResourceManager();
-    virtual ~NewResourceManager();
+    ResourceManager();
+    virtual ~ResourceManager();
 
   private:
-    static NewResourceManager*         _singletonRef;       //!< singleton Reference
+    static ResourceManager*         _singletonRef;       //!< singleton Reference
 
     Directory                          _mainGlobalPath;     //!< The main include directory (default at "./")