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

branches/new_class_id/src/lib/graphics/resource_shader.cc

@@ -5 +5 @@
 
 ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
-    : NewResource(&ResourceShader::type)
+    : Resource(&ResourceShader::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(vertexShaderName +','+fragmentShaderName);
@@ -17 +17 @@
   {
     PRINTF(5)("NOT FOUND SHADER: %s\n", vertexShaderName.c_str());
-    std::string vertexFileName = this->NewResource::locateFile(vertexShaderName);
+    std::string vertexFileName = this->Resource::locateFile(vertexShaderName);
     std::string fragmentFileName;
     if (!fragmentShaderName.empty())
-      fragmentFileName = this->NewResource::locateFile(fragmentShaderName);
+      fragmentFileName = this->Resource::locateFile(fragmentShaderName);
 
     this->Shader::load(vertexFileName, fragmentFileName);
-    this->NewResource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
+    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
   }
 }