Changeset 9847 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/resource_texture.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_texture.cc (modified) (2 diffs)

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

@@ -7 +7 @@
 
 ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+    : Resource(&ResourceTexture::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + MultiType((int)target).getString());
@@ -19 +19 @@
   {
     PRINTF(5)("NOT FOUND TEXTURE: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
+    std::string fileName = this->Resource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->NewResource::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(), Resources::KeepLevel(0), this->Texture::dataPointer()));
   }
 }