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

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/lib/graphics/importer

Files:

• md2/resource_md2.cc (modified) (3 diffs)
• md2/resource_md2.h (modified) (1 diff)
• resource_obj.cc (modified) (3 diffs)
• resource_obj.h (modified) (1 diff)
• resource_texture.cc (modified) (3 diffs)
• resource_texture.h (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: