Changeset 9820 in orxonox.OLD for branches/new_class_id/src/lib/graphics/resource_shader.cc

Timestamp:

Sep 25, 2006, 12:25:00 PM (18 years ago)

Author:

bensch

Message:

added resource_shader, the new ResourceLoadHandler for the Shader

File:

• branches/new_class_id/src/lib/graphics/resource_shader.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.cc) (2 diffs)

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

@@ -1 +1 @@
 
-#include "resource_texture.h"
+#include "resource_shader.h"
 #include "debug.h"
 
 
-ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+ResourceShader::ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName)
+    : NewResource(&ResourceShader::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  Resources::StorePointer* ptr = this->acquireResource(vertexShaderName +'|'+fragmentShaderName);
 
   if (ptr)
   {
-    PRINTF(5)("FOUNT TEXTURE: %s\n", imageName.c_str());
-    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND SHADER: %s\n", vertexShaderName.c_str());
+    this->acquireData(static_cast<ResourceShader::ShaderResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUNT TEXTURE: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
-    this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Texture::dataPointer()));
+    PRINTF(5)("NOT FOUND SHADER: %s\n", vertexShaderName.c_str());
+    std::string vertexFileName = this->NewResource::locateFile(vertexShaderName);
+    std::string fragmentFileName;
+    if (!fragmentShaderName.empty())
+      fragmentFileName = this->NewResource::locateFile(fragmentShaderName);
+
+    this->Shader::load(vertexFileName, fragmentFileName);
+    this->NewResource::addResource(new ResourceShader::ShaderResourcePointer(vertexShaderName+'|'+fragmentShaderName, Resources::KeepLevel(0), this->Shader::dataPointer()));
   }
 }
 
 
-Resources::Type ResourceTexture::type("Texture");
+Resources::Type ResourceShader::type("Shader");
 
 
@@ -30 +34 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data)
+ResourceShader::ShaderResourcePointer::ShaderResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const ShaderData::Pointer& data)
     : Resources::StorePointer(loadString, keepLevel) , pointer(data)
 {}
-
-