Changeset 10052 in orxonox.OLD for branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc

Timestamp:

Dec 13, 2006, 12:22:11 AM (17 years ago)

Author:

patrick

Message:

integrating loading to we

File:

• branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc (modified) (2 diffs)

branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc

@@ -7 +7 @@
 
 
-ResourceOIF::ResourceOIF(const std::string& modelName, const Resources::KeepLevel& keepLevel)
+ResourceOIF::ResourceOIF(const std::string& fileName, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceOIF::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(loadString(modelName));
+  Resources::StorePointer* ptr = this->acquireResource(fileName);
 
   if (ptr)
   {
-    PRINTF(0)("FOUND OIF: %s\n", modelName.c_str());
+    PRINTF(0)("FOUND OIF: %s\n", fileName.c_str());
     //this->acquireData(static_cast<ResourceOIF::OIFResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(0)("NOT FOUND OIF: %s\n", modelName.c_str());
+    PRINTF(0)("NOT FOUND OIF: %s\n", fileName.c_str());
 //     std::string modelFileName = this->Resource::locateFile(modelName);
 //     //std::string skinFileName = this->Resource::locateFile(skinName);
@@ -31 +31 @@
 {
   SubString loadValues(loadString, ',');
-  std::string modelName;
-  std::string skinName;
-  float scale = 1.0f;
+  std::string fileName;
   if (loadValues.size() > 0)
-    modelName = loadValues[0];
-  if (loadValues.size() > 1)
-    skinName = loadValues[1];
-  if (loadValues.size() > 2)
-    scale = MultiType(loadValues[2]).getFloat();
+    fileName = loadValues[0];
 
-  return ResourceOIF(modelName);
+  return ResourceOIF(fileName);
 }
 
-std::string ResourceOIF::loadString(const std::string& modelName)
-{
-  return modelName;
-}