Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/graphics


Ignore:
Timestamp:
Sep 28, 2006, 10:17:56 AM (19 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/lib/graphics
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r9847 r9854  
    66
    77
    8 ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale)
     8ResourceMD2::ResourceMD2(const std::string& modelName, const std::string& skinName, float scale, const Resources::KeepLevel& keepLevel)
    99    : Resource(&ResourceMD2::type)
    1010{
    … …  
    2222    //std::string skinFileName = this->Resource::locateFile(skinName);
    2323    this->MD2Model::load(modelFileName, skinName, scale);
    24     this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), Resources::KeepLevel(0), this->MD2Model::dataPointer()));
     24    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
    2525  }
    2626
    2727}
    2828
    29 ResourceMD2 ResourceMD2::createFromString(const std::string& loadString)
     29ResourceMD2 ResourceMD2::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
    3030{
    3131  SubString loadValues(loadString, ',');
    … …  
    4040    scale = MultiType(loadValues[2]).getFloat();
    4141
    42   return ResourceMD2(modelName, skinName, scale);
     42  return ResourceMD2(modelName, skinName, scale, keepLevel);
    4343}
    4444

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

    r9847 r9854  
    1515{
    1616public:
    17   ResourceMD2(const std::string& modelName, const std::string& skinName = "", float scale = 1.0f);
    18   static ResourceMD2 createFromString(const std::string& loadString);
     17  ResourceMD2(const std::string& modelName,
     18              const std::string& skinName = "",
     19              float scale = 1.0f,
     20              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
     21  static ResourceMD2 createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
    1922  static std::string loadString(const std::string& modelName, const std::string& skinName = "", float scale = 1.0f);
    2023

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

    r9847 r9854  
    66
    77
    8 ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling)
     8ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling, const Resources::KeepLevel& keepLevel)
    99    : Resource(&ResourceOBJ::type)
    1010{
    … …  
    2121    std::string fileName = this->Resource::locateFile(imageName);
    2222    this->acquireData(OBJModel(fileName, scaling).dataPointer());
    23     this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
     23    this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), keepLevel, this->StaticModel::dataPointer()));
    2424  }
    2525}
    2626
    27 ResourceOBJ ResourceOBJ::createFromString(const std::string& loadString)
     27ResourceOBJ ResourceOBJ::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
    2828{
    2929  SubString loadValues(loadString, ',');
    … …  
    3535    scaling = (GLenum)MultiType(loadValues[2]).getFloat();
    3636
    37   return ResourceOBJ(imageName, scaling);
     37  return ResourceOBJ(imageName, scaling, keepLevel);
    3838}
    3939

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

    r9847 r9854  
    1414{
    1515public:
    16   ResourceOBJ(const std::string& imageName, float scaling = 1.0f);
    17   static ResourceOBJ createFromString(const std::string& loadString);
     16  ResourceOBJ(const std::string& imageName,
     17              float scaling = 1.0f,
     18              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
     19  static ResourceOBJ createFromString(const std::string& loadString,
     20                                      const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
    1821
    1922private:

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

    r9847 r9854  
    66
    77
    8 ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
     8ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target, const Resources::KeepLevel& keepLevel)
    99    : Resource(&ResourceTexture::type)
    1010{
    … …  
    2121    std::string fileName = this->Resource::locateFile(imageName);
    2222    this->Texture::loadImage(fileName, target);
    23     this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), Resources::KeepLevel(0), this->Texture::dataPointer()));
     23    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + MultiType((int)target).getString(), keepLevel, this->Texture::dataPointer()));
    2424  }
    2525}
    2626
    27 ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
     27ResourceTexture ResourceTexture::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
    2828{
    2929  SubString loadValues(loadString, ',');
    … …  
    3535    target = (GLenum)MultiType(loadValues[2]).getInt();
    3636
    37   return ResourceTexture(imageName, target);
     37  return ResourceTexture(imageName, target, keepLevel);
    3838}
    3939

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

    r9847 r9854  
    1515{
    1616public:
    17   ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
    18   static ResourceTexture createFromString(const std::string& loadString);
     17  ResourceTexture(const std::string& imageName,
     18                  GLenum target = GL_TEXTURE_2D,
     19                  const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
     20  static ResourceTexture createFromString(const std::string& loadString,
     21                                          const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
    1922
    2023private:

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

    r9847 r9854  
    44#include "substring.h"
    55
    6 ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
     6ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName, const Resources::KeepLevel& keepLevel)
    77    : Resource(&ResourceShader::type)
    88{
    … …  
    2323
    2424    this->Shader::load(vertexFileName, fragmentFileName);
    25     this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
     25    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, keepLevel, this->Shader::dataPointer()));
    2626  }
    2727}
    2828
    29 ResourceShader ResourceShader::createFromString(const std::string& loadString)
     29ResourceShader ResourceShader::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
    3030{
    3131  std::string vertexShaderName;
    … …  
    3838    fragmentShaderName = shaderNames[1];
    3939
    40   return ResourceShader(vertexShaderName, fragmentShaderName);
     40  return ResourceShader(vertexShaderName, fragmentShaderName, keepLevel);
    4141}
    4242

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

    r9847 r9854  
    1515{
    1616public:
    17   ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName);
    18   static ResourceShader createFromString(const std::string& loadString);
     17  ResourceShader(const std::string& vertexShaderName,
     18                 const std::string& fragmentShaderName,
     19                 const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
     20  static ResourceShader createFromString(const std::string& loadString,
     21                                         const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
    1922
    2023private:

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

    r9847 r9854  
    66
    77
    8 ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
     8ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel)
    99  : Font(), Resource(&ResourceFont::type)
    1010{
    … …  
    2525
    2626    this->Font::loadFontFromTTF(fileName, renderSize);
    27     this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
     27    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), keepLevel, this->Font::dataPointer()));
    2828  }
    2929}
    3030
    31 ResourceFont ResourceFont::createFromString(const std::string& loadString)
     31ResourceFont ResourceFont::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
    3232{
    3333  SubString loadValues(loadString, ',');
    … …  
    3939    renderSize = (unsigned int)MultiType(loadValues[2]).getInt();
    4040
    41   return ResourceFont(fontName, renderSize);
     41  return ResourceFont(fontName, renderSize, keepLevel);
    4242}
    4343

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

    r9847 r9854  
    1515{
    1616public:
    17   ResourceFont(const std::string& fontName, unsigned int renderSize);
    18   static ResourceFont createFromString(const std::string& loadString);
     17  ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
     18  static ResourceFont createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
    1919
    2020private:
Note: See TracChangeset for help on using the changeset viewer.