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

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()

File:

• branches/new_class_id/src/lib/graphics/importer/md2/resource_md2.cc (modified) (3 diffs)

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);
 }