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

Timestamp:

Sep 23, 2006, 10:34:42 AM (18 years ago)

Author:

bensch

Message:

added new_resource_manager

File:

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

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

@@ -53 +53 @@
   {
   public:
-    Type(const ClassID& classID) : _id(-1), _classID(classID) { };
+    Type(const ClassID& classID);
+    bool operator==(const ClassID& classID) const { return this->_classID == classID; };
+    bool operator==(const std::string& resourceName) const { return this->_classID.name() == resourceName; };
 
     void addExtension(const std::string& extension);
 
-    void addResourcePath(const std::string& path);
-    void addResourceSubPath(const std::string& subPath);
+    bool addResourcePath(const std::string& path);
+    bool addResourceSubPath(const std::string& subPath);
 
     /// Retrieve Functions
     const ClassID& storedClassID() const { return _classID; };
     int id() const { return _id; };
-    const std::vector<std::string>& resourcePaths() const { return _resourcePaths; };
-    const std::vector<std::string>& resourceSubPaths() const { return _resourceSubPaths; };
+    const std::vector<Directory>& resourcePaths() const { return _resourcePaths; };
+    const std::vector<Directory>& resourceSubPaths() const { return _resourceSubPaths; };
     const std::vector<NewResource::StorePointer*>& storedResources() const { return _storedResources; };
 
@@ -73 +75 @@
     int                             _id;
     const ClassID&                  _classID;
-    std::vector<std::string>        _resourcePaths;
-    std::vector<std::string>        _resourceSubPaths;
+    std::vector<Directory>          _resourcePaths;
+    std::vector<Directory>          _resourceSubPaths;
     std::vector<std::string>        _fileExtensions;
 
@@ -88 +90 @@
   virtual bool unload() { return false; };
 
-  std::string locateFile(const std::string& fileName);
+  std::string locateFile(const std::string& fileName) const;
 
 
@@ -95 +97 @@
   static void addGlobalPath(const Directory& directory);
 
+  static bool addResourcePath(const std::string& resourceName, const std::string& pathName);
+  static bool addResourceSubPath(const std::string& resourceName, const std::string& pathName);
 
+  static void registerType(NewResource::Type* type);
+
+  static void debug();
 protected:
   NewResource::StorePointer* acquireResource(const std::string& loadString);
@@ -101 +108 @@
 
 private:
+  std::string locateFileInSubDir(const Directory& directory, const std::string& fileName) const;
+
+private:
   NewResource::StorePointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
-  NewResource::Type*          _type;                            //!< Type of the NewResource.
+  NewResource::Type*               _type;                            //!< Type of the NewResource.
 
 
-  static std::vector<NewResource::Type*>    _resourceTypes;
+  static std::vector<NewResource::Type*>  _resourceTypes;
 
   //! GLOBALS