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

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

@@ -4 +4 @@
 #include "substring.h"
 
-ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
+ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName, const Resources::KeepLevel& keepLevel)
     : Resource(&ResourceShader::type)
 {
@@ -23 +23 @@
 
     this->Shader::load(vertexFileName, fragmentFileName);
-    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
+    this->Resource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+','+fragmentShaderName, keepLevel, this->Shader::dataPointer()));
   }
 }
 
-ResourceShader ResourceShader::createFromString(const std::string& loadString)
+ResourceShader ResourceShader::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   std::string vertexShaderName;
@@ -38 +38 @@
     fragmentShaderName = shaderNames[1];
 
-  return ResourceShader(vertexShaderName, fragmentShaderName);
+  return ResourceShader(vertexShaderName, fragmentShaderName, keepLevel);
 }