Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.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.h (modified) (4 diffs)

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