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

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()

Location:

branches/new_class_id/src/lib/util/loading

Files:

• resource.cc (modified) (1 diff)
• resource.h (modified) (4 diffs)
• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (5 diffs)

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

@@ -134 +134 @@
   //// KEEPLEVEL ////
   ///////////////////
+
+  //! Constructs a default KeepLevel as Set in the ResourceManager via setDefaultKeepLevel.
+  KeepLevel::KeepLevel()
+  {
+    this->_keepLevel = ResourceManager::getInstance()->defaultKeepLevel().keepLevel();
+  }
+  /**
+   * @param keepLevel the level to set.
+   */
+  KeepLevel::KeepLevel(unsigned int keepLevel)
+  {
+    _keepLevel = keepLevel;
+  }
+
   /**
    * @brief constructor of a KeepLevel.

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

@@ -26 +26 @@
   {
   public:
-    /** @param keepLevel the level to set. */
-    inline KeepLevel(unsigned int keepLevel) { _keepLevel = keepLevel; };
+    KeepLevel();
+    KeepLevel(unsigned int keepLevel);
     KeepLevel(const std::string& keepLevelName);
 
@@ -93 +93 @@
     bool operator==(const std::string& typeName) const { return this->_typeName == typeName; };
 
+    ////////////////////
+    //// EXTENSIONS ////
     void addExtension(const std::string& extension);
 
+    ///////////////
+    //// PATHS ////
     bool addResourcePath(const std::string& path);
     bool addResourceSubPath(const std::string& subPath);
@@ -109 +113 @@
     const std::vector<Resources::StorePointer*>& storedResources() const { return _storedResources; };
 
-    virtual void createFromString(const std::string& loadString) = 0;
-
+    ///////////////////////////////
+    //// LOADING AND UNLOADING ////
+    virtual void createFromString(const std::string& loadString, const KeepLevel& keepLevel = KeepLevel()) = 0;
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
 
+    ///////////////////
+    //// INTERNALS ////
     void addResource(Resources::StorePointer* resource);
 
+    ///////////////
+    //// DEBUG ////
     void debug() const;
 
@@ -144 +153 @@
     tType(const std::string& typeName) : Type(typeName) {};
     /** @param loadString the String to load a Resource with @brief tries to create a Resource of Type T with a loadString */
-    virtual void createFromString(const std::string& loadString) { T::createFromString(loadString); }
+    virtual void createFromString(const std::string& loadString, const KeepLevel& keepLevel = KeepLevel()) { T::createFromString(loadString, keepLevel); }
   };
 

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

@@ -35 +35 @@
   */
   ResourceManager::ResourceManager ()
+  : _defaultKeepLevel(0)
   {
     this->registerObject(this, ResourceManager::_objectList);
@@ -47 +48 @@
   ResourceManager::~ResourceManager ()
   {
-    // deleting the Resources-List
-    //this->unloadAllByPriority(RP_GAME);
-
-    //   if (!this->resourceList.empty())
-    //     PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList.size());
-
     ResourceManager::_singletonRef = NULL;
   }
@@ -195 +190 @@
    * @param loadString the loadString to load in the Type.
    */
-  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString)
+  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString, const KeepLevel& keepLevel)
   {
     std::vector<Resources::Type*>::const_iterator it;
@@ -202 +197 @@
       if (*(*it) == resourceTypeName)
       {
-        (*it)->createFromString(loadString);
+        (*it)->createFromString(loadString, keepLevel);
         /// TODO check if the resource was allocated!!
         return ;

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.
   };