Changeset 5271 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Sep 28, 2005, 6:04:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better checking, and not loading shader if it is non-existent

File:

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

trunk/src/lib/graphics/shader.cc

@@ -80 +80 @@
 
   const char* program = fileRead(fileName);
+  if (program == NULL)
+    return false;
   GLenum shader = 0;
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
@@ -116 +118 @@
   int count = 0;
 
-  if (fileName != NULL) {
-    fileHandle = fopen(fileName, "rt");
-
-    if (fileHandle != NULL) {
-
-      fseek(fileHandle, 0, SEEK_END);
-      count = ftell(fileHandle);
-      rewind(fileHandle);
-
-      if (count > 0) {
-        content = new char[count+1];
-        count = fread(content, sizeof(char), count, fileHandle);
-        content[count] = '\0';
-      }
-      fclose(fileHandle);
-    }
-  }
-  return content;
+  if (fileName == NULL)
+    return NULL;
+
+  fileHandle = fopen(fileName, "rt");
+
+  if (fileHandle == NULL)
+    return NULL;
+  fseek(fileHandle, 0, SEEK_END);
+  count = ftell(fileHandle);
+  rewind(fileHandle);
+  if (count > 0) {
+     content = new char[count+1];
+     count = fread(content, sizeof(char), count, fileHandle);
+     content[count] = '\0';
+   }
+   fclose(fileHandle);
+ return content;
 }