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

Timestamp:

Feb 18, 2006, 5:32:35 PM (19 years ago)

Author:

bensch

Message:

deleted unused stuff

Location:

trunk/src/lib/graphics

Files:

• shader.cc (modified) (7 diffs)
• shader.h (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -22 +22 @@
 #include <stdio.h>
 #include "debug.h"
-#include "array.h"
 
 #include "resource_manager.h"
@@ -126 +125 @@
 
 
-  tArray<char*>* program = fileReadArray(fileName);
-  if (program == NULL)
-    return false;
+  std::vector<char*>* program = fileReadArray(fileName);
 
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
@@ -149 +146 @@
   {
     GLint status = 0;
-    glShaderSourceARB(shader, program->getCount(), (const char**)program->getArray(), NULL);
+    glShaderSourceARB(shader, program->size(), (const char**)&(*program)[0], NULL);
     glCompileShaderARB(shader);
     // checking on error.
@@ -158 +155 @@
       glAttachObjectARB(this->shaderProgram, shader);
   }
-  for (unsigned int i=0; i< program->getCount(); i++)
-    delete[] program->getArray()[i];
+  for (unsigned int i=0; i< program->size(); i++)
+    delete[] (*program)[i];
   delete program;
 }
@@ -190 +187 @@
 
 
-tArray<char*>* Shader::fileReadArray(const char* fileName)
+std::vector<char*>* Shader::fileReadArray(const char* fileName)
 {
   FILE*    stream;           //< The stream we use to read the file.
@@ -199 +196 @@
     return NULL;
   }
-  tArray<char*>* file = new tArray<char*>;
+  std::vector<char*>* file = new std::vector<char*>;
 
   char lineBuffer[PARSELINELENGHT];
@@ -207 +204 @@
     addString = new char[strlen(lineBuffer)+1];
     strcpy(addString, lineBuffer);
-    file->addEntry(addString);
+    file->push_back(addString);
   }
   fclose(stream);
-  file->finalizeArray();
   return file;
 }

trunk/src/lib/graphics/shader.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "glincl.h"
+#include <vector>
 
-template<class T> class tArray;
 
 typedef enum
@@ -38 +38 @@
 
   char* fileRead(const char* fileName);
-  tArray<char*>* fileReadArray(const char* fileName);
+  std::vector<char*>* fileReadArray(const char* fileName);
 
   static bool checkShaderAbility();