Changeset 5267 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: nicer error-checking

Location:

trunk/src

Files:

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

trunk/src/lib/graphics/shader.cc

@@ -65 +65 @@
   this->deleteProgram(SHADER_FRAGMENT);
 
+  glDeleteObjectARB(this->fragmentShader);
+  glDeleteObjectARB(this->vertexShader);
   glDeleteObjectARB(this->shaderProgram);
 }
@@ -167 +169 @@
 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;
+  int infologLength = 0;
+  int charsWritten  = 0;
+  char *infoLog;
+
+  glGetObjectParameterivARB(program, GL_OBJECT_INFO_LOG_LENGTH_ARB,
+                            &infologLength);
+
+  if (infologLength > 0)
+  {
+    infoLog = (char *)malloc(infologLength);
+    glGetInfoLogARB(program, infologLength, &charsWritten, infoLog);
+    printf("%s\n",infoLog);
+    free(infoLog);
+  }
 }
 

trunk/src/world_entities/npc2.cc

@@ -42 +42 @@
 
 
-NPC2::~NPC2 () {}
+NPC2::~NPC2 ()
+{
+  delete this->shader;
+
+}