Changeset 9818 in orxonox.OLD for branches/new_class_id/src/lib/graphics/shader.h

Timestamp:

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

Author:

bensch

Message:

Switching to new Shader layout, with Shader and ShaderData. Shaders do not render for the time being

File:

• branches/new_class_id/src/lib/graphics/shader.h (modified) (3 diffs)

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

@@ -8 +8 @@
 
 #include "base_object.h"
-#include "glincl.h"
-#include <vector>
-
+#include "shader_data.h"
 
 // FORWARD DECLARATION
@@ -24 +22 @@
   {
   public:
-    Uniform(const Shader* shader, const std::string& location) { this->uniform = glGetUniformLocationARB(shader->getProgram(), location.c_str()) ; }
     Uniform(const Shader& shader, const std::string& location) { this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
     Uniform(GLhandleARB shaderProgram, const std::string& location) { this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
@@ -45 +42 @@
   };
 
-  //! The Type of Shader.
-  typedef enum
-  {
-    None       = 0,     //!< No Type at all
-    Fragment   = 1,     //!< Fragment Shader.
-    Vertex     = 2,     //!< Vertex Shader.
-    Program    = 4,     //!< Compiled Shader Programm.
-  }  Type;
 
 public:
-  Shader(const std::string& vertexShaderFile = "", const std::string& fragmentShaderFile = "");
-  virtual ~Shader();
+  Shader();
+  Shader(const std::string& vertexShaderFile, const std::string& fragmentShaderFile = "");
+
+  Shader& operator=(const Shader& shader) { this->data = shader.data; return *this; };
+  const ShaderData::Pointer& dataPointer() const { return data; };
+  void acquireData(const ShaderData::Pointer& pointer) { this->data = pointer; };
+
+  bool load(const std::string& vertexShaderFile, const std::string& fragmentShaderFile = "")
+    { return this->data->load(vertexShaderFile, fragmentShaderFile); }
 
 
-  Shader::Uniform getUniform(const std::string& location) { return Shader::Uniform(this, location); }
+  Shader::Uniform getUniform(const std::string& location) { return Shader::Uniform(*this, location); }
 
-  GLhandleARB getProgram() const { return this->shaderProgram; }
-  GLhandleARB getVertexS() const { return this->vertexShader; }
-  GLhandleARB getFragmentS() const { return this->fragmentShader; }
+  GLhandleARB getProgram() const { return this->data->getProgram(); }
+  GLhandleARB getVertexS() const { return this->data->getVertexS(); }
+  GLhandleARB getFragmentS() const { return this->data->getFragmentS(); }
+
+  void activateShader() const;
+  static void deactivateShader();
+
+  void debug() const { this->data->debug(); };
+
 
   static bool checkShaderAbility();
-  void activateShader();
-  static void deactivateShader();
-
-  void debug() const;
 
   inline static bool isShaderActive() { return (Shader::storedShader != NULL) ? true : false; };
-  inline static Shader* getActiveShader() { return Shader::storedShader; };
-  inline static void suspendShader() { Shader* currShader = storedShader; if (storedShader!= NULL) { Shader::deactivateShader(); Shader::storedShader = currShader;} };
+  inline static const Shader* getActiveShader() { return Shader::storedShader; };
+
+  inline static void suspendShader() { const Shader* currShader = storedShader; if (storedShader!= NULL) { Shader::deactivateShader(); Shader::storedShader = currShader;} };
   inline static void restoreShader() { if (storedShader != NULL) storedShader->activateShader(); storedShader = NULL; };
 
-  static void printError(GLhandleARB program);
+private:
+  ShaderData::Pointer    data;
 
-private:
-  void bindShader(const char* name, const float* value, size_t size);
-  void linkShaderProgram();
-  bool readShader(const std::string& fileName, std::string& output);
-  bool loadShaderProgramm(Shader::Type type, const std::string& fileName);
-  void deleteProgram(Shader::Type type);
-
-private:
-  std::string            fragmentShaderFile;
-  std::string            vertexShaderFile;
-
-  GLhandleARB            shaderProgram;
-
-  GLhandleARB            vertexShader;
-  GLhandleARB            fragmentShader;
-
-
-  static Shader*         storedShader;
+  static const Shader*         storedShader;
 };