Changeset 5774 in orxonox.OLD for trunk/src/lib/graphics/importer/model.h

Timestamp:

Nov 25, 2005, 1:36:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: stl in Model

File:

• trunk/src/lib/graphics/importer/model.h (modified) (2 diffs)

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

@@ -12 +12 @@
 #include "glincl.h"
 #include "array.h"
-
+#include <list>
 
 // FORWARD DECLARATION //
 template<class T> class tArray;
-template<class T> class tList;
 
 
@@ -176 +175 @@
 
  private:
-  MODEL_TYPE             type;            //!< A type for the Model
-  bool                   finalized;       //!< Sets the Object to be finalized.
+  MODEL_TYPE                 type;            //!< A type for the Model
+  bool                       finalized;       //!< Sets the Object to be finalized.
 
-  unsigned int           vertexCount;     //!< A modelwide Counter for vertices.
-  unsigned int           normalCount;     //!< A modelwide Counter for the normals.
-  unsigned int           texCoordCount;   //!< A modelwide Counter for the texCoord.
-  unsigned int           faceCount;       //!< A modelwide Counter for the faces
-  unsigned int           triangleCount;   //!< Number of triangles >= faceCount
-  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
+  unsigned int               vertexCount;     //!< A modelwide Counter for vertices.
+  unsigned int               normalCount;     //!< A modelwide Counter for the normals.
+  unsigned int               texCoordCount;   //!< A modelwide Counter for the texCoord.
+  unsigned int               faceCount;       //!< A modelwide Counter for the faces
+  unsigned int               triangleCount;   //!< Number of triangles >= faceCount
+  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
 
-  ModelGroup*            firstGroup;      //!< The first of all groups.
-  ModelGroup*            currentGroup;    //!< The currentGroup. this is the one we will work with.
-  int                    groupCount;      //!< The Count of Groups.
+  ModelGroup*                firstGroup;      //!< The first of all groups.
+  ModelGroup*                currentGroup;    //!< The currentGroup. this is the one we will work with.
+  int                        groupCount;      //!< The Count of Groups.
 
-  tList<ModelMaterial>*  materialList;    //!< A list for all the Materials in this Model
+  std::list<ModelMaterial*>  materialList;    //!< A list for all the Materials in this Model
 };