Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5390 in orxonox.OLD


Ignore:
Timestamp:
Oct 16, 2005, 2:25:22 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: renamed Array to tArray

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r5308 r5390  
    162162  this->scaleFactor = 1;
    163163
    164   this->vertices = new Array<GLfloat>();
    165   this->vTexture = new Array<GLfloat>();
    166   this->normals = new Array<GLfloat>();
     164  this->vertices = new tArray<GLfloat>();
     165  this->vTexture = new tArray<GLfloat>();
     166  this->normals = new tArray<GLfloat>();
    167167
    168168  this->materialList = new tList<ModelMaterial>;

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

    r5321 r5390  
    1515
    1616// FORWARD DEFINITION //
    17 template<class T> class Array;
     17template<class T> class tArray;
    1818template<class T> class tList;
    1919
    … …  
    184184  unsigned int           faceCount;       //!< A modelwide Counter for the faces
    185185  unsigned int           triangleCount;   //!< Number of triangles >= faceCount
    186   Array<GLfloat>*        vertices;        //!< The Array that handles the Vertices.
    187   Array<GLfloat>*        normals;         //!< The Array that handles the Normals.
    188   Array<GLfloat>*        vTexture;        //!< The Array that handles the VertexTextureCoordinates.
     186  tArray<GLfloat>*       vertices;        //!< The Array that handles the Vertices.
     187  tArray<GLfloat>*       normals;         //!< The Array that handles the Normals.
     188  tArray<GLfloat>*       vTexture;        //!< The Array that handles the VertexTextureCoordinates.
    189189  sTriangleExt*          triangles;       //!< The Array of triangles in the abstract_model.h style
    190190

  • trunk/src/lib/graphics/shader.cc

    r5364 r5390  
    126126
    127127
    128   Array<char*>* program = fileReadArray(fileName);
     128  tArray<char*>* program = fileReadArray(fileName);
    129129  if (program == NULL)
    130130    return false;
    … …  
    190190
    191191
    192 Array<char*>* Shader::fileReadArray(const char* fileName)
     192tArray<char*>* Shader::fileReadArray(const char* fileName)
    193193{
    194194  FILE*    stream;           //< The stream we use to read the file.
    … …  
    199199    return NULL;
    200200  }
    201   Array<char*>* file = new Array<char*>;
     201  tArray<char*>* file = new tArray<char*>;
    202202
    203203  char lineBuffer[PARSELINELENGHT];

  • trunk/src/lib/graphics/shader.h

    r5323 r5390  
    1010#include "glincl.h"
    1111
    12 template<class T> class Array;
     12template<class T> class tArray;
    1313
    1414typedef enum
    … …  
    3838
    3939  char* fileRead(const char* fileName);
    40   Array<char*>* fileReadArray(const char* fileName);
     40  tArray<char*>* fileReadArray(const char* fileName);
    4141
    4242  static bool checkShaderAbility();

  • trunk/src/lib/util/array.h

    r5388 r5390  
    1616/*!
    1717  @file array.h
    18   @brief Contains the Array Class that handles arrays of classes.
     18  @brief Contains the tArray Class that handles arrays of classes.
    1919  this class creates a Array of a semi-Dynamic length.
    2020  beware, that after finalizing the array may not be resized again.
    … …  
    2727using namespace std;
    2828
    29 //! Array Class that handles dynamic-type arrays.
    30 template<class T> class Array
     29//! tArray Class that handles dynamic-type arrays.
     30template<class T> class tArray
    3131{
    3232  public:
    33     Array ();
    34     ~Array();
     33    tArray ();
     34    ~tArray();
    3535
    3636    void finalizeArray ();
    … …  
    6767*/
    6868template<class T>
    69 Array<T>::Array ()
    70 {
    71   PRINTF(5)("crating new Array\n");
     69tArray<T>::tArray ()
     70{
     71  PRINTF(5)("crating new tArray\n");
    7272  this->firstEntry = new Entry;
    7373  this->firstEntry->next =NULL;
    … …  
    7878
    7979template<class T>
    80     const T Array<T>::getEntry(unsigned int number) const
     80    const T tArray<T>::getEntry(unsigned int number) const
    8181{
    8282  if (this->finalized && number < this->entryCount)
    … …  
    8989*/
    9090template<class T>
    91 Array<T>::~Array()
     91tArray<T>::~tArray()
    9292{
    9393  PRINTF(5)("deleting array\n");
    … …  
    112112*/
    113113template<class T>
    114 void Array<T>::finalizeArray ()
     114void tArray<T>::finalizeArray ()
    115115{
    116116  if (this->finalized)
    … …  
    142142*/
    143143template<class T>
    144 void Array<T>::addEntry (T entry)
     144void tArray<T>::addEntry (T entry)
    145145{
    146146  if (!this->finalized)
    … …  
    162162*/
    163163template<class T>
    164 void Array<T>::addEntry (T entry0, T entry1, T entry2)
     164void tArray<T>::addEntry (T entry0, T entry1, T entry2)
    165165{
    166166  this->addEntry(entry0);
    … …  
    176176 */
    177177template<class T>
    178 int Array<T>::getIndex(T* entry) const
     178int tArray<T>::getIndex(T* entry) const
    179179{
    180180  if( unlikely(this->finalized == false))
    … …  
    193193*/
    194194template<class T>
    195 void Array<T>::debug () const
     195void tArray<T>::debug () const
    196196{
    197197  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);

  • trunk/src/story_entities/world.cc

    r5389 r5390  
    1 
    2 
    31/*
    42   orxonox - the future of 3D-vertical-scrollers
    … …  
    1412   main-programmer: Patrick Boenzli
    1513   co-programmer: Christian Meyer
     14   co-programmer: Benjamin Grauer
    1615*/
    1716
Note: See TracChangeset for help on using the changeset viewer.