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

Timestamp:

Oct 7, 2005, 3:28:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: so, ResourceManager now operates on BaseObjects. If this is better, i do not know, but at least it is more intuitive, i think

File:

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

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

@@ -96 +96 @@
 };
 
+struct ModelMaterial
+{
+  Material* material;
+  bool external;
+};
+
 /////////////
 /// MODEL ///
 /////////////
-
 //! Class that handles 3D-Models. it can also read them in and display them.
 class Model : public AbstractModel
@@ -172 +177 @@
 
  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
-  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.
-  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
+  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.
+  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<Material>* materialList;    //!< A list for all the Materials in this Model
-  bool             materialsExtern; //!< If the materials given to this Object are extern.
+  tList<ModelMaterial>*  materialList;    //!< A list for all the Materials in this Model
 };