Changeset 9789 in orxonox.OLD

Timestamp:

Sep 22, 2006, 10:20:14 PM (18 years ago)

Author:

bensch

Message:

nicer definition of the StorePointer

Location:

branches/new_class_id/src

Files:

• lib/graphics/importer/resource_texture.cc (modified) (3 diffs)
• lib/graphics/importer/resource_texture.h (modified) (1 diff)
• lib/util/loading/resource.cc (modified) (5 diffs)
• lib/util/loading/resource.h (modified) (5 diffs)
• orxonox.cc (modified) (1 diff)

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

@@ -8 +8 @@
     : NewResource(&ResourceTexture::type)
 {
-  NewResource::Pointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  NewResource::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
 
   if (ptr)
@@ -20 +20 @@
     std::string fileName = this->NewResource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(), this->Texture::dataPointer()));
+    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(0), this->Texture::dataPointer()));
   }
 }
@@ -32 +32 @@
 
 ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const NewResource::KeepLevel& keepLevel, const TextureData::Pointer& data)
-    : NewResource::Pointer(loadString, keepLevel) , pointer(data)
+    : NewResource::StorePointer(loadString, keepLevel) , pointer(data)
 {}
 

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

@@ -19 +19 @@
 
 private:
-class TextureResourcePointer : public NewResource::Pointer
+class TextureResourcePointer : public NewResource::StorePointer
   {
   public:

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

@@ -42 +42 @@
     this->_type->setID(NewResource::_resourceTypes.size()-1);
   }
-
 }
 
@@ -66 +65 @@
 
 
-NewResource::Pointer* NewResource::acquireResource(const std::string& loadString)
+NewResource::StorePointer* NewResource::acquireResource(const std::string& loadString)
 {
   //const NewResource::Type* const type = NewResource::_resourceTypes[this->_type->id()];
@@ -94 +93 @@
 
 
-void NewResource::addResource(NewResource::Pointer* pointer)
+void NewResource::addResource(NewResource::StorePointer* pointer)
 {
   this->_type->addResource(pointer);
@@ -107 +106 @@
 
 
-
-void NewResource::KeepLevel::setKeepLevelName(unsigned int level, const std::string& name)
+std::vector<std::string>  NewResource::KeepLevel::_keepLevelNames;
+void NewResource::KeepLevel::defineKeepLevelName(unsigned int level, const std::string& name)
 {
-  if (_keepLevelName.size() <= level)
-    _keepLevelName.resize(level+1);
-  _keepLevelName[level] = name;
+  if (_keepLevelNames.size() <= level)
+    _keepLevelNames.resize(level+1);
+  _keepLevelNames[level] = name;
 }
 
 
 
-void NewResource::Type::addResource(NewResource::Pointer* resource)
+void NewResource::Type::addResource(NewResource::StorePointer* resource)
 {
   this->_storedResources.push_back(resource);
@@ -124 +123 @@
 
 
-NewResource::Pointer::Pointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel)
-  : _loadString(loadString), _keepLevel(keeplevel)
+NewResource::StorePointer::StorePointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel)
+    : _loadString(loadString), _keepLevel(keeplevel)
 {}
 

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

@@ -8 +8 @@
 
 #include "base_object.h"
-#include "multi_type.h"
 #include <string>
 #include <vector>
@@ -26 +25 @@
   {
   public:
-    void setKeepLevelName(unsigned int level, const std::string& name);
+    KeepLevel(unsigned int keepLevel) { _keepLevel = keepLevel; };
+    KeepLevel(const std::string& keepLevelName);
+
+    static void defineKeepLevelName(unsigned int level, const std::string& name);
   private:
-    std::vector<std::string>     _keepLevelName;
+    unsigned int                        _keepLevel;
+  private:
+    static std::vector<std::string>     _keepLevelNames;
   };
 
+
 protected:
-  class Pointer
+  class StorePointer
   {
   public:
-    Pointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel);
+    StorePointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel);
     const std::string& loadString() const { return _loadString; };
     const NewResource::KeepLevel& keepLevel() const { return _keepLevel; };
 
   private:
-    std::string              _loadString;             //!< An identifier, to match when loading a File.
+    std::string                 _loadString;             //!< An identifier, to match when loading a File.
     NewResource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
   };
@@ -60 +65 @@
     const std::vector<std::string>& resourcePaths() const { return _resourcePaths; };
     const std::vector<std::string>& resourceSubPaths() const { return _resourceSubPaths; };
-    const std::vector<NewResource::Pointer*>& storedResources() const { return _storedResources; };
+    const std::vector<NewResource::StorePointer*>& storedResources() const { return _storedResources; };
 
     void setID(int id);
-    void addResource(NewResource::Pointer* resource);
+    void addResource(NewResource::StorePointer* resource);
 
   private:
@@ -72 +77 @@
     std::vector<std::string>        _fileExtensions;
 
-    std::vector<NewResource::Pointer*> _storedResources;
+    std::vector<NewResource::StorePointer*> _storedResources;
   };
 
@@ -92 +97 @@
 
 protected:
-  NewResource::Pointer* acquireResource(const std::string& loadString);
-  void addResource(NewResource::Pointer* pointer);
+  NewResource::StorePointer* acquireResource(const std::string& loadString);
+  void addResource(NewResource::StorePointer* pointer);
 
 private:
-  NewResource::Pointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
+  NewResource::StorePointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
   NewResource::Type*          _type;                            //!< Type of the NewResource.
 

branches/new_class_id/src/orxonox.cc

@@ -327 +327 @@
 
 //#include "util/loading/dynamic_loader.h"
-
+#include "loading/resource.h"
 /**
  * initializes and loads resource files