Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/resource_obj.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/resource_obj.cc (modified) (3 diffs)

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