Changeset 9786 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

ResourceLoading is working perfectly.

Location:

branches/new_class_id/src/lib

Files:

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

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

@@ -11 +11 @@
 
   if (ptr)
+  {
+    printf("FOUNT TEXTURE: %s\n", imageName.c_str());
     this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+  }
   else
   {
+    printf("NOT FOUNT TEXTURE: %s\n", imageName.c_str());
     std::string fileName = this->Resource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);

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

@@ -61 +61 @@
     return (Resource::_mainGlobalPath + File(fileName)).name();
 
-
   return std::string("/home/bensch/svn/orxonox/data/") + fileName;
 
@@ -72 +71 @@
 
   for (unsigned int i = 0; i < _type->storedResources().size(); ++i)
-    if (_type->storedResources()[i]->_pointer->loadString() == loadString)
-      return _type->storedResources()[i]->_pointer;
+  {
+    printf("Compare %s with %s\n", _type->storedResources()[i]->loadString().c_str(), loadString.c_str());
+    if (_type->storedResources()[i]->loadString() == loadString)
+      return _type->storedResources()[i];
+  }
 
   return NULL;
@@ -94 +96 @@
 
 void Resource::addResource(Resource::Pointer* pointer)
-{}
+{
+  this->_type->addResource(pointer);
+}
 
 
@@ -114 +118 @@
 
 
+void Resource::Type::addResource(Resource::Pointer* resource)
+{
+  this->_storedResources.push_back(resource);
 
-
-
-
-
+}
 
 
 Resource::Pointer::Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel)
-{
-}
+  : _loadString(loadString), _keepLevel(keeplevel)
+{}
+
 
 void Resource::Type::setID(int id)

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.