Changeset 5263 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

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

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• defs/glincl.h (modified) (2 diffs)
• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/shader.cc (modified) (8 diffs)
• lib/graphics/shader.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -31 +31 @@
                 lib/tinyxml/libtinyxml.a \
                 lib/shell/libORXshell.a \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
-
+                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
+                -lGLEW
 
 orxonox_SOURCES = orxonox.cc \

trunk/src/Makefile.in

@@ -292 +292 @@
                 lib/tinyxml/libtinyxml.a \
                 lib/shell/libORXshell.a \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
+                -lGLEW
 
 orxonox_SOURCES = orxonox.cc \

trunk/src/defs/glincl.h

@@ -2 +2 @@
   \file glincl.h
   \brief This file includes gl Headers.
-  
+
   no Class is defined here, but the opengl Headers
 */
@@ -10 +10 @@
 
 #ifndef __APPLE__
+#include <GL/glew.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <OpenGL/glew.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>

trunk/src/lib/graphics/graphics_engine.cc

@@ -61 +61 @@
   this->hwVersion = NULL;
   this->hwExtensions = NULL;
-
-  Shader shader("test.txt");
-  shader.debug();
-  exit(-1);
 }
 
@@ -267 +263 @@
     for (unsigned int i = 0; i < this->hwExtensions->getCount(); i++)
       PRINT(4)("%d: %s\n", i, this->hwExtensions->getString(i));
+
+
+  // inizializing GLEW
+  GLenum err = glewInit();
+  if (GLEW_OK != err)
+  {
+    /* Problem: glewInit failed, something is seriously wrong. */
+    PRINTF(1)("%s\n", glewGetErrorString(err));
+  }
+  PRINTF(4)("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
+
+  Shader* shader = new Shader("test.txt");
+  shader->debug();
+  delete shader;
+//  exit(-1);
+
 }
 

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

trunk/src/lib/graphics/shader.h

@@ -43 +43 @@
    Array<char*>*          fragmentShaderSource;
    Array<char*>*          vertexShaderSource;
+   Array<int>*            fragmentShaderLengths;
+   Array<int>*            vertexShaderLenghts;
    GLenum                 shaderProgram;
    GLenum                 vertexShader;