Changeset 9820 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

added resource_shader, the new ResourceLoadHandler for the Shader

Location:

branches/new_class_id/src

Files:

• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/resource_shader.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.cc) (2 diffs)
• lib/graphics/resource_shader.h (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.h) (2 diffs)
• world_entities/environments/mapped_water.cc (modified) (1 diff)

branches/new_class_id/src/lib/graphics/Makefile.am

@@ -10 +10 @@
                 shader.cc \
                 shader_data.cc \
+                resource_shader.cc \
                 \
                 render2D/render_2d.cc \
@@ -28 +29 @@
                 shader.h \
                 shader_data.h \
+                resource_shader.h \
                 \
                 render2D/render_2d.h \

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)
 {}
-
-

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

@@ -1 +1 @@
 /*!
- * @file resource_texture.h
- * @brief Contains the ResourceTexture class, that handles the Resource-specific loading part of the Texture.
+ * @file resource_shader.h
+ * @brief Contains the ResourceShader class, that handles the Resource-specific loading part of the Shader.
  *
  */
 
-#ifndef _RESOURCE_TEXTURE_H
-#define _RESOURCE_TEXTURE_H
+#ifndef _RESOURCE_SHADER_H
+#define _RESOURCE_SHADER_H
 
 #include "util/loading/resource.h"
-#include "texture.h"
+#include "shader.h"
 
 
-class ResourceTexture : public Texture, public Resources::NewResource
+class ResourceShader : public Shader, public Resources::NewResource
 {
 public:
-  ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
+  ResourceShader(const std::string& vertexShaderName, const std::string& fragmentShaderName);
 
 
 private:
-class TextureResourcePointer : public Resources::StorePointer
+class ShaderResourcePointer : public Resources::StorePointer
   {
   public:
-    TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
-    inline const TextureData::Pointer& ptr() const { return pointer; }
+    ShaderResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const ShaderData::Pointer& data);
+    inline const ShaderData::Pointer& ptr() const { return pointer; }
   private:
-    TextureData::Pointer pointer;
+    ShaderData::Pointer pointer;
   };
 
@@ -33 +33 @@
 
 
-#endif /* _RESOURCE_TEXTURE_H */
+#endif /* _RESOURCE_SHADER_H */

branches/new_class_id/src/world_entities/environments/mapped_water.cc

@@ -164 +164 @@
 {
   // load shader files
-  shader = Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
+  shader = Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert",
+                   ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
 
   this->shader.activateShader();