Changeset 7818 in orxonox.OLD for branches/water/src/lib/graphics/shader.h

Timestamp:

May 24, 2006, 5:38:28 PM (19 years ago)

Author:

bensch

Message:

Better nicer Shader

File:

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

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

@@ -12 +12 @@
 
 
-typedef enum
-{
-  SHADER_NONE       = 0,
-  SHADER_FRAGMENT   = 1,
-  SHADER_VERTEX     = 0,
-
-} SHADER_TYPE;
-
 // FORWARD DECLARATION
 
 
 //! A class for ...
-class Shader : public BaseObject {
+class Shader : public BaseObject
+{
+  public:
+  typedef enum
+  {
+    None       = 0,
+    Fragment   = 1,
+    Vertex     = 2,
+
+    Program    = 4,
+  } Type;
 
   public:
@@ -32 +34 @@
   static bool unload(Shader* shader);
 
-  bool loadShaderProgramm(SHADER_TYPE type, const std::string& fileName);
+
+  static bool checkShaderAbility();
   void activateShader();
   static void deactivateShader();
-  void deleteProgram(SHADER_TYPE type);
+
+
+  bool loadShaderProgramm(Shader::Type type, const std::string& fileName);
+  void deleteProgram(Shader::Type type);
+
+  void linkShaderProgram();
+
 
   char* fileRead(const std::string& fileName);
   std::vector<char*>* fileReadArray(const std::string& fileName);
 
-  static bool checkShaderAbility();
 
   inline static bool shaderActive() { return (Shader::storedShader != NULL)? true : false; };
@@ -47 +55 @@
   inline static void restoreShader() { if (storedShader != NULL) storedShader->activateShader(); storedShader = NULL; };
 
-  GLhandleARB getProgram() { return this->shaderProgram; }
-  GLhandleARB getVertexS() { return this->vertexShader; }
-  GLhandleARB getFragmentS() { return this->fragmentShader; }
 
-  void printError(GLhandleARB program);
+  GLhandleARB getProgram() const { return this->shaderProgram; }
+  GLhandleARB getVertexS() const { return this->vertexShader; }
+  GLhandleARB getFragmentS() const { return this->fragmentShader; }
+
   void debug() const;
 
-  private:
+  static void printError(GLhandleARB program);
+
 
  private:
    std::string            fragmentShaderFile;
    std::string            vertexShaderFile;
+
    GLhandleARB            shaderProgram;
+
    GLhandleARB            vertexShader;
    GLhandleARB            fragmentShader;