Changeset 9854 in orxonox.OLD

Timestamp:

Sep 28, 2006, 10:17:56 AM (18 years ago)

Author:

bensch

Message:

more nice comments, and also updated the KeepLevel loading (if you want to load a Resource to a KeepLevel just append it at loadtime:
eg.:
Texture tex = ResourceTexture(orxonox.png, GL_TEXTURE_2D, GameEnd);
where GameEnd is the KeepLevel as defined in orxonox.cc→initResources()

Location:

branches/new_class_id/src

Files:

• lib/graphics/importer/md2/resource_md2.cc (modified) (3 diffs)
• lib/graphics/importer/md2/resource_md2.h (modified) (1 diff)
• lib/graphics/importer/resource_obj.cc (modified) (3 diffs)
• lib/graphics/importer/resource_obj.h (modified) (1 diff)
• lib/graphics/importer/resource_texture.cc (modified) (3 diffs)
• lib/graphics/importer/resource_texture.h (modified) (1 diff)
• lib/graphics/resource_shader.cc (modified) (3 diffs)
• lib/graphics/resource_shader.h (modified) (1 diff)
• lib/graphics/text_engine/resource_font.cc (modified) (3 diffs)
• lib/graphics/text_engine/resource_font.h (modified) (1 diff)
• lib/shell/some_shell_commands.cc (modified) (1 diff)
• lib/sound/resource_sound_buffer.cc (modified) (2 diffs)
• lib/sound/resource_sound_buffer.h (modified) (1 diff)
• lib/util/loading/resource.cc (modified) (1 diff)
• lib/util/loading/resource.h (modified) (4 diffs)
• lib/util/loading/resource_manager.cc (modified) (4 diffs)
• lib/util/loading/resource_manager.h (modified) (5 diffs)
• orxonox.cc (modified) (1 diff)

branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.cc

@@ -6 +6 @@
 
 
-ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale)
+ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceMD2::type)
 {
@@ -22 +22 @@
     //std::string skinFileName = this->Resource::locateFile(skinName);
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), Resources::KeepLevel(0), this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
   }
 
 }
 
-ResourceMD2 ResourceMD2::createFromString(const std::string& loadString)
+ResourceMD2 ResourceMD2::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   SubString loadValues(loadString, ',');
@@ -40 +40 @@
     scale = MultiType(loadValues[2]).getFloat();
 
-  return ResourceMD2(modelName, skinName, scale);
+  return ResourceMD2(modelName, skinName, scale, keepLevel);
 }
 

branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.h

@@ -15 +15 @@
 {
 public:
-  ResourceMD2(const std::string& modelName, const std::string& skinName = "", float scale = 1.0f);
-  static ResourceMD2 createFromString(const std::string& loadString);
+  ResourceMD2(const std::string& modelName,
+              const std::string& skinName = "",
+              float scale = 1.0f,
+              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceMD2 createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
   static std::string loadString(const std::string& modelName, const std::string& skinName = "", float scale = 1.0f);
 

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

@@ -6 +6 @@
 
 
-ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling)
+ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceOBJ::type)
 {
@@ -21 +21 @@
     std::string fileName = this->Resource::locateFile(imageName);
     this->acquireData(OBJModel(fileName, scaling).dataPointer());
-    this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
+    this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), keepLevel, this->StaticModel::dataPointer()));
   }
 }
 
-ResourceOBJ ResourceOBJ::createFromString(const std::string& loadString)
+ResourceOBJ ResourceOBJ::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   SubString loadValues(loadString, ',');
@@ -35 +35 @@
     scaling = (GLenum)MultiType(loadValues[2]).getFloat();
 
-  return ResourceOBJ(imageName, scaling);
+  return ResourceOBJ(imageName, scaling, keepLevel);
 }
 

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

@@ -14 +14 @@
 {
 public:
-  ResourceOBJ(const std::string& imageName, float scaling = 1.0f);
-  static ResourceOBJ createFromString(const std::string& loadString);
+  ResourceOBJ(const std::string& imageName,
+              float scaling = 1.0f,
+              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceOBJ createFromString(const std::string& loadString,
+                                      const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
 
 private:

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

@@ -6 +6 @@
 
 
-ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
+ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceTexture::type)
 {
@@ -21 +21 @@
     std::string fileName = this->Resource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), Resources::KeepLevel(0), this->Texture::dataPointer()));
+    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), keepLevel, this->Texture::dataPointer()));
   }
 }
 
-ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
+ResourceTexture ResourceTexture::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   SubString loadValues(loadString, ',');
@@ -35 +35 @@
     target = (GLenum)MultiType(loadValues[2]).getInt();
 
-  return ResourceTexture(imageName, target);
+  return ResourceTexture(imageName, target, keepLevel);
 }
 

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

@@ -15 +15 @@
 {
 public:
-  ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
-  static ResourceTexture createFromString(const std::string& loadString);
+  ResourceTexture(const std::string& imageName,
+                  GLenum target = GL_TEXTURE_2D,
+                  const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceTexture createFromString(const std::string& loadString,
+                                          const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
 
 private:

branches/new_class_id/src/lib/graphics/resource_shader.cc

@@ -4 +4 @@
 #include "substring.h"
 
-ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
+ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceShader::type)
 {
@@ -23 +23 @@
 
     this->Shader::load(vertexFileName, fragmentFileName);
-    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
+    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, keepLevel, this->Shader::dataPointer()));
   }
 }
 
-ResourceShader ResourceShader::createFromString(const std::string& loadString)
+ResourceShader ResourceShader::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   std::string vertexShaderName;
@@ -38 +38 @@
     fragmentShaderName = shaderNames[1];
 
-  return ResourceShader(vertexShaderName, fragmentShaderName);
+  return ResourceShader(vertexShaderName, fragmentShaderName, keepLevel);
 }
 

branches/new_class_id/src/lib/graphics/resource_shader.h

@@ -15 +15 @@
 {
 public:
-  ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName);
-  static ResourceShader createFromString(const std::string& loadString);
+  ResourceShader(const std::string& vertexShaderName,
+                 const std::string& fragmentShaderName,
+                 const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceShader createFromString(const std::string& loadString,
+                                         const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
 
 private:

branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc

@@ -6 +6 @@
 
 
-ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
+ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel)
   : Font(), Resource(&ResourceFont::type)
 {
@@ -25 +25 @@
 
     this->Font::loadFontFromTTF(fileName, renderSize);
-    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
+    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), keepLevel, this->Font::dataPointer()));
   }
 }
 
-ResourceFont ResourceFont::createFromString(const std::string& loadString)
+ResourceFont ResourceFont::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   SubString loadValues(loadString, ',');
@@ -39 +39 @@
     renderSize = (unsigned int)MultiType(loadValues[2]).getInt();
 
-  return ResourceFont(fontName, renderSize);
+  return ResourceFont(fontName, renderSize, keepLevel);
 }
 

branches/new_class_id/src/lib/graphics/text_engine/resource_font.h

@@ -15 +15 @@
 {
 public:
-  ResourceFont(const std::string& fontName, unsigned int renderSize);
-  static ResourceFont createFromString(const std::string& loadString);
+  ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceFont createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
 
 private:

branches/new_class_id/src/lib/shell/some_shell_commands.cc

@@ -55 +55 @@
 namespace Resources {
   SHELL_COMMAND(debug, ResourceManager, debug);
-  SHELL_COMMAND(load, ResourceManager, loadFromLoadString);
+  SHELL_COMMAND(load, ResourceManager, loadFromLoadStringHACK);
   SHELL_COMMAND(unload, ResourceManager, unloadAllBelowKeepLevelINT);
 }

branches/new_class_id/src/lib/sound/resource_sound_buffer.cc

@@ -8 +8 @@
   ObjectListDefinition(ResourceSoundBuffer);
 
-  ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName)
+  ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName, const Resources::KeepLevel& keepLevel)
       : SoundBuffer(), Resource(&ResourceSoundBuffer::type)
   {
@@ -25 +25 @@
       std::string fileName = this->Resource::locateFile(soundName);
       this->SoundBuffer::load(fileName);
-      this->Resource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, Resources::KeepLevel(0), this->SoundBuffer::dataPointer()));
+      this->Resource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, keepLevel, this->SoundBuffer::dataPointer()));
     }
   }

branches/new_class_id/src/lib/sound/resource_sound_buffer.h

@@ -17 +17 @@
     ObjectListDeclaration(ResourceSoundBuffer);
   public:
-    ResourceSoundBuffer(const std::string& soundName);
-    static ResourceSoundBuffer createFromString(const std::string& loadString) { return ResourceSoundBuffer(loadString); };
+    ResourceSoundBuffer(const std::string& soundName,
+                        const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+    static ResourceSoundBuffer createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel())
+    { return ResourceSoundBuffer(loadString, keepLevel); };
 
   private:

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

@@ -134 +134 @@
   //// KEEPLEVEL ////
   ///////////////////
+
+  //! Constructs a default KeepLevel as Set in the ResourceManager via setDefaultKeepLevel.
+  KeepLevel::KeepLevel()
+  {
+    this->_keepLevel = ResourceManager::getInstance()->defaultKeepLevel().keepLevel();
+  }
+  /**
+   * @param keepLevel the level to set.
+   */
+  KeepLevel::KeepLevel(unsigned int keepLevel)
+  {
+    _keepLevel = keepLevel;
+  }
+
   /**
    * @brief constructor of a KeepLevel.

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

@@ -26 +26 @@
   {
   public:
-    /** @param keepLevel the level to set. */
-    inline KeepLevel(unsigned int keepLevel) { _keepLevel = keepLevel; };
+    KeepLevel();
+    KeepLevel(unsigned int keepLevel);
     KeepLevel(const std::string& keepLevelName);
 
@@ -93 +93 @@
     bool operator==(const std::string& typeName) const { return this->_typeName == typeName; };
 
+    ////////////////////
+    //// EXTENSIONS ////
     void addExtension(const std::string& extension);
 
+    ///////////////
+    //// PATHS ////
     bool addResourcePath(const std::string& path);
     bool addResourceSubPath(const std::string& subPath);
@@ -109 +113 @@
     const std::vector<Resources::StorePointer*>& storedResources() const { return _storedResources; };
 
-    virtual void createFromString(const std::string& loadString) = 0;
-
+    ///////////////////////////////
+    //// LOADING AND UNLOADING ////
+    virtual void createFromString(const std::string& loadString, const KeepLevel& keepLevel = KeepLevel()) = 0;
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
 
+    ///////////////////
+    //// INTERNALS ////
     void addResource(Resources::StorePointer* resource);
 
+    ///////////////
+    //// DEBUG ////
     void debug() const;
 
@@ -144 +153 @@
     tType(const std::string& typeName) : Type(typeName) {};
     /** @param loadString the String to load a Resource with @brief tries to create a Resource of Type T with a loadString */
-    virtual void createFromString(const std::string& loadString) { T::createFromString(loadString); }
+    virtual void createFromString(const std::string& loadString, const KeepLevel& keepLevel = KeepLevel()) { T::createFromString(loadString, keepLevel); }
   };
 

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

@@ -35 +35 @@
   */
   ResourceManager::ResourceManager ()
+  : _defaultKeepLevel(0)
   {
     this->registerObject(this, ResourceManager::_objectList);
@@ -47 +48 @@
   ResourceManager::~ResourceManager ()
   {
-    // deleting the Resources-List
-    //this->unloadAllByPriority(RP_GAME);
-
-    //   if (!this->resourceList.empty())
-    //     PRINTF(1)("Not removed all Resources, since there are still %d resources registered\n", this->resourceList.size());
-
     ResourceManager::_singletonRef = NULL;
   }
@@ -195 +190 @@
    * @param loadString the loadString to load in the Type.
    */
-  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString)
+  void ResourceManager::loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString, const KeepLevel& keepLevel)
   {
     std::vector<Resources::Type*>::const_iterator it;
@@ -202 +197 @@
       if (*(*it) == resourceTypeName)
       {
-        (*it)->createFromString(loadString);
+        (*it)->createFromString(loadString, keepLevel);
         /// TODO check if the resource was allocated!!
         return ;

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

@@ -17 +17 @@
     ObjectListDeclaration(ResourceManager);
   public:
+    ///////////////////////
+    //// INSTANZIATION ////
     /** @returns a Pointer to the only object of this Class */
     inline static ResourceManager* getInstance() { if (!_singletonRef) _singletonRef = new ResourceManager();  return _singletonRef; };
@@ -22 +24 @@
     inline static void deleteInstance() { if (_singletonRef) delete _singletonRef; };
 
-
+    ////////////////////////
+    //// RESOURCE PATHS ////
     void setMainGlobalPath(const Directory& directory);
     void addGlobalPath(const Directory& directory);
@@ -31 +34 @@
     void unregisterType(Resources::Type* type);
 
-    unsigned int addKeepLevelName(const std::string& keepLevelName);
-    unsigned int getKeepLevelID(const std::string& keepLevelName) const;
-    const std::string& getKeepLevelName(unsigned int keepLevelID) const;
-
-    /** @returns the Types of Resources */
-    const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };
     /** @returns the main global search Path */
     const Directory& mainGlobalPath() const { return _mainGlobalPath; };
@@ -42 +39 @@
     const std::vector<Directory>& globalPaths() const { return _globalPaths; };
 
+    ////////////////////
+    //// KEEPLEVELS ////
+    unsigned int addKeepLevelName(const std::string& keepLevelName);
+    unsigned int getKeepLevelID(const std::string& keepLevelName) const;
+    const std::string& getKeepLevelName(unsigned int keepLevelID) const;
+    void setDefaultKeepLevel(const KeepLevel& keepLevel) { this->_defaultKeepLevel = keepLevel; };
+    const KeepLevel& defaultKeepLevel() const { return this->_defaultKeepLevel; };
+
+    //////////////////////////
+    //// GENERAL QUERIES ////
+    /** @returns the Types of Resources */
+    const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };
 
     bool checkFileInMainPath(const File& fileInside);
     std::string prependAbsoluteMainPath(const std::string& fileName);
 
+    ////////////////////////////////////////
+    //// RESOURCE LOADING AND UNLOADING ////
+    void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString, const KeepLevel& keepLevel = KeepLevel());
+    void loadFromLoadStringHACK(const std::string& resourceTypeName, const std::string& loadString) { this->loadFromLoadString(resourceTypeName, loadString); };
+
     void unloadAllBelowKeepLevel(const Resources::KeepLevel& keepLevel);
     void unloadAllBelowKeepLevelINT(unsigned int level) { unloadAllBelowKeepLevel(level); };
-    void loadFromLoadString(const std::string& resourceTypeName, const std::string& loadString);
 
+    ///////////////
+    //// DEBUG ////
     void debug() const;
 
-    // utility functions for handling files in and around the data-directory
-    static std::string getFullName(const std::string& fileName);
-    static bool isInDataDir(const std::string& fileName);
   private:
     ResourceManager();
@@ -66 +78 @@
 
     std::vector<Resources::Type*>      _resourceTypes;      //!< A Vector of all the stored ResourceTypes @see Resources::Type
+
     std::vector<std::string>           _keepLevelNames;     //!< Names of KeepLevels @see Resources::KeepLevel
+    KeepLevel                          _defaultKeepLevel;   //!< The default KeepLevel.
   };
 

branches/new_class_id/src/orxonox.cc

@@ -377 +377 @@
   Resources::ResourceManager::getInstance()->addKeepLevelName("CampaignEnd");
   Resources::ResourceManager::getInstance()->addKeepLevelName("GameEnd");
-
-  //  DynamicLoader::loadDyLib("libtest.so");
+  Resources::ResourceManager::getInstance()->setDefaultKeepLevel(std::string("GameEnd"));
+
   return 0;
 }