Changeset 9848 in orxonox.OLD

Timestamp:

Sep 27, 2006, 11:39:47 PM (18 years ago)

Author:

bensch

Message:

new_class_id: dynamic loading works completely

try the shell with:
ResourceManger load Texture some-pic-from-data

Location:

branches/new_class_id/src/lib

Files:

• shell/some_shell_commands.cc (modified) (1 diff)
• util/loading/resource.h (modified) (4 diffs)
• util/loading/resource_manager.cc (modified) (1 diff)
• util/loading/resource_manager.h (modified) (2 diffs)

branches/new_class_id/src/lib/shell/some_shell_commands.cc

@@ -53 +53 @@
 
 #include "loading/resource_manager.h"
-namespace Resources
-{SHELL_COMMAND(debug, ResourceManager, debug);}
+namespace Resources {
+  SHELL_COMMAND(debug, ResourceManager, debug);
+  SHELL_COMMAND(load, ResourceManager, loadFromLoadString);
+}
 
 #include "loading/load_param_class_description.h"

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

@@ -42 +42 @@
 
 
-
+  ///////////////////
+  // STORE POINTER //
+  ///////////////////
   //! Stores a Resource-Pointer, the LoadString and it's keepLevel.
   class StorePointer
@@ -70 +72 @@
 
 
-
+  ///////////////////
+  // RESOURCE TYPE //
+  ///////////////////
   //! A Type of Resources.
   /**
@@ -122 +126 @@
   };
 
+  /**
+   * @brief A Type Definition Class for any Object that is resourceable.
+   *
+   * This Class's main reason of Existence is, that resources can be dynamically
+   * created over a loadString. For this the Type of Resource is required, and the Resource must
+   * itself support the 'void createFromString(const std::string&)' function.
+   */
   template<class T> class tType : public Type
   {
   public:
+    /** Create the ResourceType @see Type(const std::string&) */
     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); }
   };
@@ -131 +144 @@
 
 
+  /////////////////////
+  // RESOURCE ITSELF //
+  /////////////////////
 
   //! A Resource is an Object, that can be loaded from Disk

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

@@ -144 +144 @@
   }
 
+  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString)
+  {
+    std::vector<Resources::Type*>::const_iterator it;
+    for (it = this->_resourceTypes.begin(); it != this->_resourceTypes.end(); ++it)
+    {
+      if (*(*it) == resourceTypeName)
+      {
+        (*it)->createFromString(loadString);
+        /// TODO check if the resource was allocated!!
+        return ;
+      }
+    }
+    return ;
+  }
+
 
   void ResourceManager::unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel)

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

@@ -47 +47 @@
 
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
+    void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString);
 
     void debug() const;
@@ -58 +59 @@
 
   private:
-    static ResourceManager*         _singletonRef;       //!< singleton Reference
+    static ResourceManager*            _singletonRef;       //!< singleton Reference
 
     Directory                          _mainGlobalPath;     //!< The main include directory (default at "./")