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

Timestamp:

Sep 28, 2006, 10:17:56 AM (18 years ago)

Author:

bensch

Message:

more nice comments, and also updated the KeepLevel loading (if you want to load a Resource to a KeepLevel just append it at loadtime:
eg.:
Texture tex = ResourceTexture(orxonox.png, GL_TEXTURE_2D, GameEnd);
where GameEnd is the KeepLevel as defined in orxonox.cc→initResources()

File:

• branches/new_class_id/src/lib/util/loading/resource_manager.h (modified) (5 diffs)

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

@@ -17 +17 @@
     ObjectListDeclaration(ResourceManager);
   public:
+    ///////////////////////
+    //// INSTANZIATION ////
     /** @returns a Pointer to the only object of this Class */
     inline static ResourceManager* getInstance() { if (!_singletonRef) _singletonRef = new ResourceManager();  return _singletonRef; };
@@ -22 +24 @@
     inline static void deleteInstance() { if (_singletonRef) delete _singletonRef; };
 
-
+    ////////////////////////
+    //// RESOURCE PATHS ////
     void setMainGlobalPath(const Directory& directory);
     void addGlobalPath(const Directory& directory);
@@ -31 +34 @@
     void unregisterType(Resources::Type* type);
 
-    unsigned int addKeepLevelName(const std::string& keepLevelName);
-    unsigned int getKeepLevelID(const std::string& keepLevelName) const;
-    const std::string& getKeepLevelName(unsigned int keepLevelID) const;
-
-    /** @returns the Types of Resources */
-    const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };
     /** @returns the main global search Path */
     const Directory& mainGlobalPath() const { return _mainGlobalPath; };
@@ -42 +39 @@
     const std::vector<Directory>& globalPaths() const { return _globalPaths; };
 
+    ////////////////////
+    //// KEEPLEVELS ////
+    unsigned int addKeepLevelName(const std::string& keepLevelName);
+    unsigned int getKeepLevelID(const std::string& keepLevelName) const;
+    const std::string& getKeepLevelName(unsigned int keepLevelID) const;
+    void setDefaultKeepLevel(const KeepLevel& keepLevel) { this->_defaultKeepLevel = keepLevel; };
+    const KeepLevel& defaultKeepLevel() const { return this->_defaultKeepLevel; };
+
+    //////////////////////////
+    //// GENERAL QUERIES ////
+    /** @returns the Types of Resources */
+    const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };
 
     bool checkFileInMainPath(const File& fileInside);
     std::string prependAbsoluteMainPath(const std::string& fileName);
 
+    ////////////////////////////////////////
+    //// RESOURCE LOADING AND UNLOADING ////
+    void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString, const KeepLevel& keepLevel = KeepLevel());
+    void loadFromLoadStringHACK(const std::string& resourceTypeName, const std::string& loadString) { this->loadFromLoadString(resourceTypeName, loadString); };
+
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
     void unloadAllBelowKeepLevelINT(unsigned int level) { unloadAllBelowKeepLevel(level); };
-    void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString);
 
+    ///////////////
+    //// DEBUG ////
     void debug() const;
 
-    // utility functions for handling files in and around the data-directory
-    static std::string getFullName(const std::string& fileName);
-    static bool isInDataDir(const std::string& fileName);
   private:
     ResourceManager();
@@ -66 +78 @@
 
     std::vector<Resources::Type*>      _resourceTypes;      //!< A Vector of all the stored ResourceTypes @see Resources::Type
+
     std::vector<std::string>           _keepLevelNames;     //!< Names of KeepLevels @see Resources::KeepLevel
+    KeepLevel                          _defaultKeepLevel;   //!< The default KeepLevel.
   };