Changeset 9847 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/resource_obj.cc

Timestamp:

Sep 27, 2006, 11:25:43 PM (18 years ago)

Author:

bensch

Message:

renamed NewResource to Resource

File:

• branches/new_class_id/src/lib/graphics/importer/resource_obj.cc (modified) (2 diffs)

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

@@ -7 +7 @@
 
 ResourceOBJ::ResourceOBJ(const std::string& imageName, float scaling)
-    : NewResource(&ResourceOBJ::type)
+    : Resource(&ResourceOBJ::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + MultiType(scaling).getString());
@@ -19 +19 @@
   {
     PRINTF(5)("NOT FOUND OBJ: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
+    std::string fileName = this->Resource::locateFile(imageName);
     this->acquireData(OBJModel(fileName, scaling).dataPointer());
-    this->NewResource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
+    this->Resource::addResource(new ResourceOBJ::OBJResourcePointer(imageName + ',' + MultiType(scaling).getString(), Resources::KeepLevel(0), this->StaticModel::dataPointer()));
   }
 }