Changeset 9784 in orxonox.OLD for branches

Timestamp:

Sep 22, 2006, 12:19:51 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: new Resources stuff

Location:

branches/new_class_id/src/lib

Files:

• graphics/importer/resource_texture.cc (modified) (1 diff)
• graphics/importer/resource_texture.h (modified) (1 diff)
• graphics/importer/texture.h (modified) (1 diff)
• util/loading/resource.cc (modified) (2 diffs)
• util/loading/resource.h (modified) (2 diffs)

branches/new_class_id/src/lib/graphics/importer/resource_texture.cc

@@ -5 +5 @@
 
 
+ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
+{
+  Resource::Pointer* ptr = this->acquireResource(ResourceTexture::type, imageName + ',' + "TEST");
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(TextureData* data)
-{
-  this->pointer = new TextureData::Pointer(data);
+  if (ptr)
+    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+  else
+  {
+    this->loadImage(imageName, target);
+  }
 }
 
 
 Resource::Type ResourceTexture::type(Texture::staticClassID());
+
+
+
+
+
+ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data)
+    : Resource::Pointer(loadString, keepLevel) , pointer(data)
+{
+}
+
+

branches/new_class_id/src/lib/graphics/importer/resource_texture.h

@@ -18 +18 @@
 
 private:
-  class TextureResourcePointer
+  class TextureResourcePointer : public Resource::Pointer
   {
   public:
-    TextureResourcePointer(TextureData* data);
+    TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, TextureData* data);
+    inline const TextureData::Pointer& ptr() const { return pointer; }
   private:
-    TextureData::Pointer* pointer;
+    TextureData::Pointer pointer;
   };
 

branches/new_class_id/src/lib/graphics/importer/texture.h

@@ -30 +30 @@
   Texture& operator=(const Texture& texture);
   Texture& operator=(const TextureData::Pointer& textureDataPointer);
+  void acquireData(const TextureData::Pointer& textureDataPointer) { this->data = textureDataPointer; };
+  const TextureData::Pointer& dataPointer() const { return data; }
 
   virtual ~Texture();

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

@@ -24 +24 @@
  * standard constructor
 */
-Resource::Resource (const std::string& fileName)
+Resource::Resource ()
+    : _pointer(NULL)
 {
   this->registerObject(this, Resource::_objectList);
@@ -40 +41 @@
 
 
+Resource::Pointer* Resource::acquireResource(Resource::Type& resourceType, const std::string& loadString)
+{
+  if(resourceType.id() == -1)
+  {
+    Resource::_resourceTypes.push_back(&resourceType);
+    resourceType.setID(Resource::_resourceTypes.size());
+  }
+  const Resource::Type* const type = Resource::_resourceTypes[resourceType.id()];
+
+  for (unsigned int i = 0; i < type->storedResources().size(); ++i)
+    if (type->storedResources()[i]->_pointer->loadString() == loadString)
+      return type->storedResources()[i]->_pointer;
+
+  return NULL;
+}
+
 
 

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

@@ -37 +37 @@
     void addExtension(const std::string& extension);
 
+    void addResourcePath(const std::string& path);
+    void 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<Resource*>& storedResources() const { return _storedResources; };
 
     void setID(int id);
@@ -50 +55 @@
     std::vector<std::string>      _resourceSubPaths;
     std::vector<std::string>      _fileExtensions;
+
+    std::vector<Resource*>        _storedResources;
   };
 
-  class Pointer {};
+  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)
+  };
 
 
 public:
-  Resource(const std::string& fileName);
+  Resource();
   virtual ~Resource();
 
-  bool loadResource(std::string& fileName, Resource::Pointer* ptr);
   virtual bool reload();
   virtual bool unload();
 
+protected:
+  Resource::Pointer* acquireResource(Resource::Type& resourceType, const std::string& loadString);
+
+private:
+  Resource::Pointer*       _pointer;                //!< Virtual Pointer to the ResourceData.
 
 
-private:
-  std::string              _loadString;             //!< An identifier, to match when loading a File.
-  std::string              _fileName;
-  MultiType                _parameters[3];          //!< The Parameters given to this Resource.
-  Resource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
-
-
-  static std::vector<Resource::Type>     _resourceTypes;
+  static std::vector<Resource::Type*>    _resourceTypes;
 
   //! GLOBALS