Changeset 5268 in orxonox.OLD

Timestamp:

Sep 27, 2005, 6:21:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better error-handling through try and catch

Location:

trunk/src

Files:

• lib/graphics/shader.cc (modified) (3 diffs)
• world_entities/npc2.cc (modified) (1 diff)

trunk/src/lib/graphics/shader.cc

@@ -50 +50 @@
    if (fragmentShaderFile != NULL)
      this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
-   glLinkProgramARB(this->shaderProgram);
-   this->printError(this->shaderProgram);
-
+  try  {
+   glLinkProgramARB(this->shaderProgram); }
+  catch(char* str)  {
+   this->printError(this->shaderProgram); }
 }
 
@@ -86 +87 @@
 
     this->vertexShader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
-    glShaderSourceARB(this->vertexShader, 1, (const GLcharARB**)&program, NULL);
-    glCompileShaderARB(this->vertexShader);
-    glAttachObjectARB(this->shaderProgram, this->vertexShader);
-    this->printError(this->vertexShader);
+    try {
+      glShaderSourceARB(this->vertexShader, 1, (const GLcharARB**)&program, NULL);
+      glCompileShaderARB(this->vertexShader);
+      glAttachObjectARB(this->shaderProgram, this->vertexShader);
+    }
+    catch (char * tmp)
+    {
+      this->printError(this->vertexShader);
+    }
   }
 
@@ -98 +104 @@
 
     this->fragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
-    glShaderSourceARB(this->fragmentShader, 1, (const GLcharARB**)&program, NULL);
-    glCompileShaderARB(this->fragmentShader);
-    glAttachObjectARB(this->shaderProgram, this->fragmentShader);
-    this->printError(this->fragmentShader);
+    try
+    {
+      glShaderSourceARB(this->fragmentShader, 1, (const GLcharARB**)&program, NULL);
+      glCompileShaderARB(this->fragmentShader);
+      glAttachObjectARB(this->shaderProgram, this->fragmentShader);
+    }
+    catch (char* tmp)
+    {
+      this->printError(this->fragmentShader);
+    }
   }
 

trunk/src/world_entities/npc2.cc

@@ -87 +87 @@
 
   shader->activateShader();
-  gluSphere(this->obj, 3, 20, 20);
+  gluSphere(this->obj, 3, 10, 10);
   shader->deactivateShader();