Changeset 5263 in orxonox.OLD for trunk/src/lib/graphics/shader.cc

Timestamp:

Sep 27, 2005, 12:33:05 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: using glew, and Shaders are now read

File:

• trunk/src/lib/graphics/shader.cc (modified) (8 diffs)

trunk/src/lib/graphics/shader.cc

@@ -18 +18 @@
 #include "shader.h"
 
+
 #include "array.h"
 #include "stdlibincl.h"
@@ -42 +43 @@
    this->fragmentShaderSource = NULL;
    this->vertexShaderSource = NULL;
+   this->fragmentShaderLengths = NULL;
+   this->vertexShaderLenghts = NULL;
    this->shaderProgram = 0;
    this->vertexShader = 0;
    this->fragmentShader = 0;
+
+   if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100)
+     this->shaderProgram = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
 
    if (vertexShaderFile != NULL)
@@ -61 +67 @@
   this->deleteProgram(SHADER_VERTEX);
   this->deleteProgram(SHADER_FRAGMENT);
-  // DELETE THE PROGRAMS
-/*  this->shaderProgram = 0;
-  this->vertexShader = 0;
-  this->fragmentShader = 0;*/
+
+  glDeleteObjectARB(this->shaderProgram);
 }
 
@@ -82 +86 @@
   }
   Array<char*>* program = new Array<char*>;
+  Array<int>* lengths = new Array<int>;
   if (type == SHADER_VERTEX)
   {
@@ -87 +92 @@
     strcpy(this->vertexShaderFile, fileName);
     this->vertexShaderSource = program;
+    this->vertexShaderLenghts = lengths;
   }
   else
@@ -93 +99 @@
     strcpy(this->fragmentShaderFile, fileName);
     this->fragmentShaderSource = program;
+    this->fragmentShaderLengths = lengths;
   }
 
@@ -113 +120 @@
     }
     program->addEntry(addString);
-
-    printf(lineBuffer);
+    lengths->addEntry(strlen(addString));
   }
   fclose(stream);
 
   program->finalizeArray();
-
-
-//  this->shaderProgram = glCreateProgramObjectARB();
-  this->vertexShader =1;
+  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());
+    glCompileShaderARB(this->vertexShader);
+    glAttachObjectARB(this->shaderProgram, this->vertexShader);
+  }
+
+  if (type == SHADER_FRAGMENT && GLEW_ARB_fragment_shader)
+  {
+    this->fragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+    glShaderSourceARB(this->fragmentShader, program->getCount(), (const GLcharARB**)program->getArray(), lengths->getArray());
+    glCompileShaderARB(this->fragmentShader);
+    glAttachObjectARB(this->shaderProgram, this->fragmentShader);
+  }
+  glLinkProgramARB(this->shaderProgram);
 }
 
 bool Shader::activateShader()
 {
-
+  glUseProgramObjectARB(this->shaderProgram);
 }
 
@@ -138 +158 @@
     deleteArray = this->vertexShaderSource;
     this->vertexShaderSource = NULL;
+    delete this->vertexShaderLenghts;
+    this->vertexShaderLenghts = NULL;
     delete[] this->vertexShaderFile;
     this->vertexShaderFile = NULL;
+    glDeleteObjectARB(this->vertexShader);
+    this->vertexShader = 0;
   }
   else if (type == SHADER_FRAGMENT)
   {
     deleteArray = this->fragmentShaderSource;
+    delete this->fragmentShaderLengths;
+    this->fragmentShaderLengths = NULL;
     this->fragmentShaderSource = NULL;
     delete[] this->fragmentShaderFile;
     this->fragmentShaderFile = NULL;
+    glDeleteObjectARB(this->fragmentShader);
+    this->fragmentShader = 0;
   }
   else