Changeset 5264 in orxonox.OLD

Timestamp:

Sep 27, 2005, 1:00:35 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reading Shaders now, and throw error

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• shader.cc (modified) (5 diffs)
• shader.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -274 +274 @@
   PRINTF(4)("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
 
-  Shader* shader = new Shader("test.txt");
-  shader->debug();
-  delete shader;
-//  exit(-1);
+  Shader* shader = new Shader("test.txt", "shader.cg");
+//  delete shader;
+  shader->activateShader();
+  exit(-1);
 
 }

trunk/src/lib/graphics/shader.cc

@@ -56 +56 @@
    if (fragmentShaderFile != NULL)
      this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
+   glLinkProgramARB(this->shaderProgram);
+   this->printError(this->shaderProgram);
+
 }
 
@@ -108 +111 @@
       // 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
+//     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];
@@ -133 +136 @@
     glCompileShaderARB(this->vertexShader);
     glAttachObjectARB(this->shaderProgram, this->vertexShader);
+    this->printError(this->vertexShader);
   }
 
@@ -141 +145 @@
     glCompileShaderARB(this->fragmentShader);
     glAttachObjectARB(this->shaderProgram, this->fragmentShader);
-  }
-  glLinkProgramARB(this->shaderProgram);
+    this->printError(this->fragmentShader);
+  }
 }
 
@@ -192 +196 @@
 }
 
+
+void Shader::printError(GLenum program)
+{
+  GLint length = 5000;
+//  glGetObjectParameterARBfiv(program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+  char* text = new char[length+1];
+  glGetInfoLogARB(program, length, &length, text);
+  printf("%s\n", text);
+  delete[] text;
+}
+
+
+
 void Shader::debug() const
 {

trunk/src/lib/graphics/shader.h

@@ -34 +34 @@
   void deleteProgram(SHADER_TYPE type);
 
+  void printError(GLenum program);
   void debug() const;