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

Timestamp:

Oct 16, 2005, 2:25:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: renamed Array to tArray

Location:

trunk/src/lib/graphics

Files:

• importer/model.cc (modified) (1 diff)
• importer/model.h (modified) (2 diffs)
• shader.cc (modified) (3 diffs)
• shader.h (modified) (2 diffs)

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

@@ -162 +162 @@
   this->scaleFactor = 1;
 
-  this->vertices = new Array<GLfloat>();
-  this->vTexture = new Array<GLfloat>();
-  this->normals = new Array<GLfloat>();
+  this->vertices = new tArray<GLfloat>();
+  this->vTexture = new tArray<GLfloat>();
+  this->normals = new tArray<GLfloat>();
 
   this->materialList = new tList<ModelMaterial>;

trunk/src/lib/graphics/importer/model.h

@@ -15 +15 @@
 
 // FORWARD DEFINITION //
-template<class T> class Array;
+template<class T> class tArray;
 template<class T> class tList;
 
@@ -184 +184 @@
   unsigned int           faceCount;       //!< A modelwide Counter for the faces
   unsigned int           triangleCount;   //!< Number of triangles >= faceCount
-  Array<GLfloat>*        vertices;        //!< The Array that handles the Vertices.
-  Array<GLfloat>*        normals;         //!< The Array that handles the Normals.
-  Array<GLfloat>*        vTexture;        //!< The Array that handles the VertexTextureCoordinates.
+  tArray<GLfloat>*       vertices;        //!< The Array that handles the Vertices.
+  tArray<GLfloat>*       normals;         //!< The Array that handles the Normals.
+  tArray<GLfloat>*       vTexture;        //!< The Array that handles the VertexTextureCoordinates.
   sTriangleExt*          triangles;       //!< The Array of triangles in the abstract_model.h style
 

trunk/src/lib/graphics/shader.cc

@@ -126 +126 @@
 
 
-  Array<char*>* program = fileReadArray(fileName);
+  tArray<char*>* program = fileReadArray(fileName);
   if (program == NULL)
     return false;
@@ -190 +190 @@
 
 
-Array<char*>* Shader::fileReadArray(const char* fileName)
+tArray<char*>* Shader::fileReadArray(const char* fileName)
 {
   FILE*    stream;           //< The stream we use to read the file.
@@ -199 +199 @@
     return NULL;
   }
-  Array<char*>* file = new Array<char*>;
+  tArray<char*>* file = new tArray<char*>;
 
   char lineBuffer[PARSELINELENGHT];

trunk/src/lib/graphics/shader.h

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