Changeset 5266 in orxonox.OLD for trunk/src/lib/graphics/shader.h

Timestamp:

Sep 27, 2005, 4:10:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders now work

File:

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

trunk/src/lib/graphics/shader.h

@@ -20 +20 @@
 
 // FORWARD DECLARATION
-template<class T> class Array;
 
 
@@ -31 +30 @@
 
   bool loadShaderProgramm(SHADER_TYPE type, const char* fileName);
-  bool activateShader();
+  void activateShader();
+  static void deactivateShader();
   void deleteProgram(SHADER_TYPE type);
+
+  char* fileRead(const char* fileName);
 
   void printError(GLenum program);
@@ -42 +44 @@
    char*                  fragmentShaderFile;
    char*                  vertexShaderFile;
-   Array<char*>*          fragmentShaderSource;
-   Array<char*>*          vertexShaderSource;
-   Array<int>*            fragmentShaderLengths;
-   Array<int>*            vertexShaderLenghts;
    GLenum                 shaderProgram;
    GLenum                 vertexShader;