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

Timestamp:

Sep 24, 2006, 10:30:13 PM (19 years ago)

Author:

bensch

Message:

try with the shader

File:

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

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

@@ -16 +16 @@
 
 
-//! A class for ...
+//! The Shader is a Class-wrapper around the OpenGL Shader Language (GLSL).
 class Shader : public BaseObject
 {
@@ -38 +38 @@
     void set(int v0, int v1, int v2, int v3) const { glUniform4i(this->uniform, v0, v1, v2, v3); }
 
-    void setV(unsigned int count, float* vv) const
-    {
-      switch (count)
-      {
-        case 1:
-        glUniform1fv(this->uniform, 1, vv);
-        break;
-        case 2:
-        glUniform2fv(this->uniform, 2, vv);
-        break;
-        case 3:
-        glUniform3fv(this->uniform, 3, vv);
-        break;
-        case 4:
-        glUniform4fv(this->uniform, 4, vv);
-        break;
-      }
-    }
-    void setV(unsigned int count, int* vv) const
-    {
-      switch (count)
-      {
-        case 1:
-        glUniform1iv(this->uniform, 1, vv);
-        break;
-        case 2:
-        glUniform2iv(this->uniform, 2, vv);
-        break;
-        case 3:
-        glUniform3iv(this->uniform, 3, vv);
-        break;
-        case 4:
-        glUniform4iv(this->uniform, 4, vv);
-        break;
-      }
-    }
+    void setV(unsigned int count, float* vv) const;
+    void setV(unsigned int count, int* vv) const;
+
   private:
     GLint uniform;
   };
 
+  //! The Type of Shader.
   typedef enum
   {
-    None       = 0,
-    Fragment   = 1,
-    Vertex     = 2,
-
-    Program    = 4,
-  }
-  Type;
+    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();
-  static Shader* getShader(const std::string& vertexShaderFile, const std::string& fragmentShaderFile);
-  static bool unload(Shader* shader);
 
+
+  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; }
 
   static bool checkShaderAbility();
   void activateShader();
-  void bindShader(const char* name, const float* value, size_t size);
   static void deactivateShader();
 
-Shader::Uniform getUniform(const std::string& location) { return Shader::Uniform(this, location); }
+  void debug() const;
 
-  bool loadShaderProgramm(Shader::Type type, const std::string& fileName);
-  void deleteProgram(Shader::Type type);
-
-  void linkShaderProgram();
-
-
-  bool readShader(const std::string& fileName, std::string& output);
-
-
-inline static bool shaderActive() { return (Shader::storedShader != NULL)? true : false; };
+  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 void restoreShader() { if (storedShader != NULL) storedShader->activateShader(); storedShader = NULL; };
 
-
-
-
-GLhandleARB getProgram() const { return this->shaderProgram; }
-  GLhandleARB getVertexS() const { return this->vertexShader; }
-  GLhandleARB getFragmentS() const { return this->fragmentShader; }
-
-  void debug() const;
-
   static void printError(GLhandleARB program);
 
+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: