Changeset 5319 in orxonox.OLD for trunk

Timestamp:

Oct 8, 2005, 3:10:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor file-handling

Location:

trunk/src/lib

Files:

• graphics/importer/objModel.cc (modified) (1 diff)
• graphics/shader.cc (modified) (3 diffs)
• graphics/shader.h (modified) (2 diffs)
• gui/gtk_gui/gui_exec.h (modified) (1 diff)
• util/ini_parser.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/objModel.cc

@@ -176 +176 @@
   Material* tmpMat = NULL;
 
-  while(fgets(buffer, PARSELINELENGTH, stream))
+  while(fgets(buffer, PARSELINELENGTH, stream) != NULL)
     {
       PRINTF(5)("found line in mtlFile: %s\n", buffer);

trunk/src/lib/graphics/shader.cc

@@ -91 +91 @@
 bool Shader::loadShaderProgramm(SHADER_TYPE type, const char* fileName)
 {
-  GLenum shader = 0;
+  GLhandleARB shader = 0;
 
   if (type != SHADER_VERTEX && type != SHADER_FRAGMENT)
@@ -119 +119 @@
 
   if (shader != 0)
-    {
-      glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
-        glCompileShaderARB(shader);
-          this->printError(shader);
-      glAttachObjectARB(this->shaderProgram, shader);
-    }
-    delete program;
+  {
+    glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
+      glCompileShaderARB(shader);
+        this->printError(shader);
+    glAttachObjectARB(this->shaderProgram, shader);
+  }
+  for (unsigned int i=0; i< program->getCount(); i++)
+    delete[] program->getArray()[i];
+  delete program;
 }
 
@@ -218 +220 @@
 
 
-void Shader::printError(GLenum program)
+void Shader::printError(GLhandleARB program)
 {
   if (program == 0)

trunk/src/lib/graphics/shader.h

@@ -45 +45 @@
 
 
-  void printError(GLenum program);
+  void printError(GLhandleARB program);
   void debug() const;
 
@@ -53 +53 @@
    char*                  fragmentShaderFile;
    char*                  vertexShaderFile;
-   GLenum                 shaderProgram;
-   GLenum                 vertexShader;
-   GLenum                 fragmentShader;
+   GLhandleARB            shaderProgram;
+   GLhandleARB            vertexShader;
+   GLhandleARB            fragmentShader;
 
    static Shader*         storedShader;

trunk/src/lib/gui/gtk_gui/gui_exec.h

@@ -24 +24 @@
   char* confDir;               //!< The directory of the orxonox-configuration-files.
   char* confFile;              //!< The name of the .orxonox.conf(ig)-file.
-  FILE* CONFIG_FILE;           //!< Filehandler for reading and writing.
 
   //! A struct that holds informations about variables.

trunk/src/lib/util/ini_parser.cc

@@ -119 +119 @@
     char* ptr;
 
-    while( !feof( stream))
-    {
-      // get next line
-      fgets (lineBuffer, PARSELINELENGHT, stream);
+    while( fgets (lineBuffer, PARSELINELENGHT, stream))
+    {
       lineBegin = lineBuffer;
       // remove newline char, and \0-terminate