Changeset 9786 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.h

Timestamp:

Sep 22, 2006, 6:38:28 PM (18 years ago)

Author:

bensch

Message:

ResourceLoading is working perfectly.

File:

• branches/new_class_id/src/lib/util/loading/resource.h (modified) (4 diffs)

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

@@ -32 +32 @@
 
 protected:
+  class Pointer
+  {
+  public:
+    Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel);
+    const std::string& loadString() const { return _loadString; };
+    const Resource::KeepLevel& keepLevel() const { return _keepLevel; };
+
+  private:
+    std::string              _loadString;             //!< An identifier, to match when loading a File.
+    Resource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
+  };
+
+
   class Type
   {
@@ -47 +60 @@
     const std::vector<std::string>& resourcePaths() const { return _resourcePaths; };
     const std::vector<std::string>& resourceSubPaths() const { return _resourceSubPaths; };
-    const std::vector<Resource*>& storedResources() const { return _storedResources; };
+    const std::vector<Resource::Pointer*>& storedResources() const { return _storedResources; };
 
     void setID(int id);
-    void addResource(Resource* resource);
+    void addResource(Resource::Pointer* resource);
 
   private:
-    int                           _id;
-    const ClassID&                _classID;
-    std::vector<std::string>      _resourcePaths;
-    std::vector<std::string>      _resourceSubPaths;
-    std::vector<std::string>      _fileExtensions;
+    int                             _id;
+    const ClassID&                  _classID;
+    std::vector<std::string>        _resourcePaths;
+    std::vector<std::string>        _resourceSubPaths;
+    std::vector<std::string>        _fileExtensions;
 
-    std::vector<Resource*>        _storedResources;
-  };
-
-  class Pointer
-  {
-  public:
-    Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel);
-    const std::string& loadString() const { return _loadString; };
-    const Resource::KeepLevel& keepLevel() const { return _keepLevel; };
-
-  private:
-    std::string              _loadString;             //!< An identifier, to match when loading a File.
-    Resource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
+    std::vector<Resource::Pointer*> _storedResources;
   };
 
@@ -85 +86 @@
 
 
-  public:
-    static void setMainGlobalPath(const Directory& directory);
-    static void addGlobalPath(const Directory& directory);
+public:
+  static void setMainGlobalPath(const Directory& directory);
+  static void addGlobalPath(const Directory& directory);
 
 
@@ -95 +96 @@
 
 private:
-  Resource::Pointer*       _pointer;                //!< Virtual Pointer to the ResourceData.
-  Resource::Type*          _type;                   //!< Type of the Resource.
+  Resource::Pointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
+  Resource::Type*          _type;                            //!< Type of the Resource.