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

Timestamp:

Oct 6, 2005, 8:31:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer quit-modi
TextEngine is now deleted by GraphicsEngine
trying to fix errors in the Element2D deletion

File:

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

trunk/src/lib/graphics/shader.cc

@@ -49 +49 @@
 
        if (vertexShaderFile != NULL)
-         this->loadShaderProgramm(SHADER_VERTEX, vertexShaderFile);
+         this->loadShaderProgramm(SHADER_VERTEX, vertexShaderFile);
        if (fragmentShaderFile != NULL)
-         this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
+         this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
        try  {
-         glLinkProgramARB(this->shaderProgram); }
+         glLinkProgramARB(this->shaderProgram); }
        catch(GLenum errorCode)  {
-         this->printError(this->shaderProgram); }
+         this->printError(this->shaderProgram); }
      }
    else
@@ -84 +84 @@
 bool Shader::loadShaderProgramm(SHADER_TYPE type, const char* fileName)
 {
+  GLenum shader = 0;
+
   if (type != SHADER_VERTEX && type != SHADER_FRAGMENT)
     return false;
@@ -92 +94 @@
   if (program == NULL)
     return false;
-  GLenum shader = 0;
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
   {
@@ -113 +114 @@
       glShaderSourceARB(shader, 1, (const GLcharARB**)&program, NULL);
       try {
-        glCompileShaderARB(shader);
+        glCompileShaderARB(shader);
       }
       catch (...)
-        {
-          this->printError(shader);
-        }
+        {
+          this->printError(shader);
+        }
       glAttachObjectARB(this->shaderProgram, shader);
       delete[] program;