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

Timestamp:

Sep 25, 2006, 11:28:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: now it should also be possible, to cache the resources, by suppling a LoadString.
This is vital to loading Resources, when you only know the TypeName and a LoadString, but not the c++-type and the LoadParameters as is the case when loading over the internet.

Location:

branches/new_class_id/src/lib/util

Files:

• filesys/directory.cc (modified) (1 diff)
• filesys/directory.h (modified) (1 diff)
• loading/resource.h (modified) (3 diffs)

branches/new_class_id/src/lib/util/filesys/directory.cc

@@ -215 +215 @@
 File operator+(const Directory& dir, const File& file)
 {
-   return File(dir.name() + '/' + file.name());
-}
+  return File(dir.name() + Directory::delimiter + file.name());
+}

branches/new_class_id/src/lib/util/filesys/directory.h

@@ -65 +65 @@
   const std::string& operator[](unsigned int fileNumber) const { return this->_fileNames[fileNumber]; };
   /** @returns a formated string containing the FileName, prepended with the directory-Name */
-  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + "/" + _fileNames[fileNumber]; };
+  std::string fileNameInDir(unsigned int fileNumber) const { return this->name() + Directory::delimiter + _fileNames[fileNumber]; };
   /** @returns a File pointing to the File @param fileNumber the fileNumber (must not bigger than fileCount()) */
   File getFile(unsigned int fileNumber) const { return File(fileNameInDir(fileNumber)); };

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

@@ -61 +61 @@
   public:
     Type(const std::string& typeName);
-    ~Type();
+    virtual ~Type();
     /** @returns true if the names match @param resourceName the Name to compare. @brief compare the Type with a Name */
     bool operator==(const std::string& resourceName) const { return this->_typeName == resourceName; };
@@ -82 +82 @@
     const std::vector<Resources::StorePointer*>& storedResources() const { return _storedResources; };
 
+    virtual void createFromString(const std::string& loadString) = 0;
+
     void setID(int id);
     void addResource(Resources::StorePointer* resource);
@@ -95 +97 @@
 
     std::vector<Resources::StorePointer*> _storedResources;   //!< An array of all the stored Resources.
+  };
+
+  template<class T> class tType : public Type
+  {
+  public:
+    tType(const std::string& typeName) : Type(typeName) {};
+    virtual void createFromString(const std::string& loadString) { T::createFromString(loadString); }
   };