Changeset 5266 in orxonox.OLD for trunk/src/lib

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Shaders now work

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (3 diffs)
• shader.cc (modified) (10 diffs)
• shader.h (modified) (3 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -29 +29 @@
 
 using namespace std;
-
-
-#include "shader.h"
 
 /**
@@ -274 +271 @@
   PRINTF(4)("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
 
-  Shader* shader = new Shader("test.txt", "shader.cg");
-//  delete shader;
-  shader->activateShader();
-//  exit(-1);
-
 }
 
@@ -301 +293 @@
       //    return -1;
     }
+    glMatrixMode(GL_PROJECTION_MATRIX);
+    glLoadIdentity();
     glViewport(0,0,width,height);                                                   // Reset The Current Viewport
 }

trunk/src/lib/graphics/shader.cc

@@ -18 +18 @@
 #include "shader.h"
 
-
-#include "array.h"
 #include "stdlibincl.h"
 #include <stdio.h>
@@ -41 +39 @@
    this->fragmentShaderFile = NULL;
    this->vertexShaderFile = NULL;
-   this->fragmentShaderSource = NULL;
-   this->vertexShaderSource = NULL;
-   this->fragmentShaderLengths = NULL;
-   this->vertexShaderLenghts = NULL;
    this->shaderProgram = 0;
    this->vertexShader = 0;
@@ -50 +44 @@
 
    if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100)
-     this->shaderProgram = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
+     this->shaderProgram = glCreateProgramObjectARB();
 
    if (vertexShaderFile != NULL)
@@ -81 +75 @@
   this->deleteProgram(type);
 
-  FILE*    stream;           //< The stream we use to read the file.
 
-  if( (stream = fopen (fileName, "r")) == NULL)
-  {
-    PRINTF(1)("Shader could not open %s\n", fileName);
-    return false;
-  }
-  Array<char*>* program = new Array<char*>;
-  Array<int>* lengths = new Array<int>;
-  if (type == SHADER_VERTEX)
+  const char* program = fileRead(fileName);
+
+  if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
   {
     this->vertexShaderFile = new char[strlen(fileName)+1];
     strcpy(this->vertexShaderFile, fileName);
-    this->vertexShaderSource = program;
-    this->vertexShaderLenghts = lengths;
-  }
-  else
-  {
-    this->fragmentShaderFile = new char[strlen(fileName)+1];
-    strcpy(this->fragmentShaderFile, fileName);
-    this->fragmentShaderSource = program;
-    this->fragmentShaderLengths = lengths;
-  }
 
-  char lineBuffer[PARSELINELENGHT];
-  char* addString;
-  while( !feof( stream))
-  {
-      // get next line
-    fgets (lineBuffer, PARSELINELENGHT, stream);
-//     if (strchr(lineBuffer, '\n'))
-//     {
-//       addString = new char[strlen(lineBuffer)];
-//       strncpy(addString, lineBuffer, strlen (lineBuffer)-1);
-//       addString[strlen(lineBuffer)-1] ='\0';
-//     }
-//     else
-    {
-      addString = new char[strlen(lineBuffer)+1];
-      strcpy(addString, lineBuffer);
-    }
-    program->addEntry(addString);
-    lengths->addEntry(strlen(addString));
-  }
-  fclose(stream);
-
-  program->finalizeArray();
-  lengths->finalizeArray();
-
-  if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
-  {
     this->vertexShader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
-    glShaderSourceARB(this->vertexShader, program->getCount(), (const GLcharARB**)program->getArray(), lengths->getArray());
+    glShaderSourceARB(this->vertexShader, 1, (const GLcharARB**)&program, NULL);
     glCompileShaderARB(this->vertexShader);
     glAttachObjectARB(this->shaderProgram, this->vertexShader);
@@ -141 +92 @@
   if (type == SHADER_FRAGMENT && GLEW_ARB_fragment_shader)
   {
+    this->fragmentShaderFile = new char[strlen(fileName)+1];
+    strcpy(this->fragmentShaderFile, fileName);
+
     this->fragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
-    glShaderSourceARB(this->fragmentShader, program->getCount(), (const GLcharARB**)program->getArray(), lengths->getArray());
+    glShaderSourceARB(this->fragmentShader, 1, (const GLcharARB**)&program, NULL);
     glCompileShaderARB(this->fragmentShader);
     glAttachObjectARB(this->shaderProgram, this->fragmentShader);
     this->printError(this->fragmentShader);
   }
+
+  delete[] program;
 }
 
-bool Shader::activateShader()
+
+char* Shader::fileRead(const char* fileName)
+{
+  FILE* fileHandle;
+  char* content = NULL;
+
+  int count = 0;
+
+  if (fileName != NULL) {
+    fileHandle = fopen(fileName, "rt");
+
+    if (fileHandle != NULL) {
+
+      fseek(fileHandle, 0, SEEK_END);
+      count = ftell(fileHandle);
+      rewind(fileHandle);
+
+      if (count > 0) {
+        content = new char[count+1];
+        count = fread(content, sizeof(char), count, fileHandle);
+        content[count] = '\0';
+      }
+      fclose(fileHandle);
+    }
+  }
+  return content;
+}
+
+void Shader::activateShader()
 {
   glUseProgramObjectARB(this->shaderProgram);
+}
+
+void Shader::deactivateShader()
+{
+  glUseProgramObjectARB(0);
 }
 
@@ -157 +146 @@
 void Shader::deleteProgram(SHADER_TYPE type)
 {
-  Array<char*>* deleteArray = NULL;
   if (type == SHADER_VERTEX)
   {
-    deleteArray = this->vertexShaderSource;
-    this->vertexShaderSource = NULL;
-    delete this->vertexShaderLenghts;
-    this->vertexShaderLenghts = NULL;
     delete[] this->vertexShaderFile;
     this->vertexShaderFile = NULL;
@@ -171 +155 @@
   else if (type == SHADER_FRAGMENT)
   {
-    deleteArray = this->fragmentShaderSource;
-    delete this->fragmentShaderLengths;
-    this->fragmentShaderLengths = NULL;
-    this->fragmentShaderSource = NULL;
     delete[] this->fragmentShaderFile;
     this->fragmentShaderFile = NULL;
@@ -182 +162 @@
   else
     return;
-
-  if (deleteArray == NULL)
-    return;
-  else
-  {
-    deleteArray->finalizeArray();
-    for (unsigned int i = 0; i < deleteArray->getCount(); i++)
-    {
-      delete[] deleteArray->getEntry(i);
-    }
-    delete deleteArray;
-  }
 }
 
@@ -214 +182 @@
   if (this->vertexShader != 0)
   {
-    PRINT(3)("VertexShaderProgramm: number=%d, file='%s'\n", this->vertexShader, this->vertexShaderFile);
+/*    PRINT(3)("VertexShaderProgramm: number=%d, file='%s'\n", this->vertexShader, this->vertexShaderFile);
     if (this->vertexShaderSource != NULL)
       for (unsigned int i = 0; i < this->vertexShaderSource->getCount(); i++)
@@ -224 +192 @@
     if (this->fragmentShaderSource != NULL)
       for (unsigned int i = 0; i < this->fragmentShaderSource->getCount(); i++)
-        PRINT(3)("%d: %s\n", i, this->fragmentShaderSource->getEntry(i));
+        PRINT(3)("%d: %s\n", i, this->fragmentShaderSource->getEntry(i));*/
   }
 

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;