Changeset 10141 in orxonox.OLD for trunk/src/lib/graphics/importer/static_model_data.h

Timestamp:

Dec 23, 2006, 12:05:13 PM (17 years ago)

Author:

bensch

Message:

orxonox/trunk: ported the static_model to std::vectort.
Took me 90 minutes, and i hope everything is still working as it did before

File:

• trunk/src/lib/graphics/importer/static_model_data.h (modified) (4 diffs)

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

@@ -27 +27 @@
 };
 
-////////////////////
-/// SUB-ELEMENTS ///
-////////////////////
-//! This is the placeholder of one Vertex beloning to a Face.
-class ModelFaceElement
-{
-public:
-  ModelFaceElement();
-  ~ModelFaceElement();
 
-  int                 vertexNumber;         //!< The number of the Vertex out of the Array* vertices, this vertex points to.
-  int                 normalNumber;         //!< The number of the Normal out of the Array* normals, this vertex points to.
-  int                 texCoordNumber;       //!< The number of the textureCoordinate out of the Array* vTexture, this vertex points to.
-
-  ModelFaceElement*   next;                 //!< Point to the next FaceElement in this List.
-};
-
-//! This is the placeholder of a Face belonging to a Group of Faces.
-class ModelFace
-{
-public:
-  ModelFace();
-  ~ModelFace();
-
-  unsigned int        vertexCount;     //!< The Count of vertices this Face has.
-  ModelFaceElement*   firstElem;       //!< Points to the first Vertex (FaceElement) of this Face.
-  Material*           material;        //!< The Material to use.
-
-  ModelFace*          next;            //!< Pointer to the next Face.
-};
-
-//! Group to handle multiple Models per obj-file.
-class ModelGroup
-{
-public:
-  ModelGroup();
-  ~ModelGroup();
-
-  void cleanup();
-
-  std::string  name;           //!< the Name of the Group. this is an identifier, that can be accessed via the draw (std::string name) function.
-  GLubyte*     indices;        //!< The indices of the Groups. Needed for vertex-arrays
-  GLuint       listNumber;     //!< The number of the GL-List this Group gets.
-  ModelFace*   firstFace;      //!< The first Face in this group.
-  ModelFace*   currentFace;    //!< The current Face in this Group (the one we are currently working with.)
-  int          faceMode;       //!< The Mode the Face is in: initially -1, 0 for FaceList opened, 1 for Material,  3 for triangle, 4 for Quad, 5+ for Poly @todo ENUM...
-  int          faceCount;      //!< The Number of Faces this Group holds.
-
-  ModelGroup*  next;           //!< Pointer to the next Group.
-};
-
-struct ModelMaterial
-{
-  Material* material;
-  bool external;
-};
 
 /////////////
@@ -95 +40 @@
 {
   ObjectListDeclaration(StaticModelData);
+
+private:
+  ////////////////////
+  /// SUB-ELEMENTS ///
+  ////////////////////
+  //! This is the placeholder of one Vertex beloning to a Face.
+  class FaceElement
+  {
   public:
-    typedef CountPointer<StaticModelData> Pointer;
+    FaceElement();
+
+    int                 vertexNumber;         //!< The number of the Vertex out of the Array* vertices, this vertex points to.
+    int                 normalNumber;         //!< The number of the Normal out of the Array* normals, this vertex points to.
+    int                 texCoordNumber;       //!< The number of the textureCoordinate out of the Array* vTexture, this vertex points to.
+  };
+
+  //! This is the placeholder of a Face belonging to a Group of Faces.
+  class Face
+  {
+  public:
+    Face();
+
+    std::vector<FaceElement>  _elements; //!< Elements of the Face.
+    Material*                 _material;        //!< The Material to use.
+  };
+
+  //! Group to handle multiple Models per obj-file.
+  class Group
+  {
+  public:
+    Group();
+    ~Group();
+
+    //! Compares the name with the groups name.
+    bool operator==(const std::string& name) const { return this->name == name; };
+    void cleanup();
+
+    std::string  name;           //!< the Name of the Group. this is an identifier, that can be accessed via the draw (std::string name) function.
+    GLubyte*     indices;        //!< The indices of the Groups. Needed for vertex-arrays
+    GLuint       listNumber;     //!< The number of the GL-List this Group gets.
+    int          faceMode;       //!< The Mode the Face is in: initially -1, 0 for FaceList opened, 1 for Material,  3 for triangle, 4 for Quad, 5+ for Poly @todo ENUM...
+
+    std::vector<Face> _faces;    //!< Faces.
+  };
 
   public:
+  typedef CountPointer<StaticModelData> Pointer;
+
+public:
   StaticModelData(const std::string& modelName = "");
   virtual ~StaticModelData();
 
   void draw() const;
-  void draw(int groupNumber) const;
+  void draw(unsigned int groupNumber) const;
   void draw(const std::string& groupName) const;
 
   void rebuild();
 
-  Material* addMaterial(Material* material);
+  Material* addMaterial(const Material& material);
   Material* addMaterial(const std::string& materialName);
 
@@ -151 +141 @@
   bool buildTriangleList();
 
-  bool addGLElement(ModelFaceElement* elem);
+  bool addGLElement(const StaticModelData::FaceElement& elem);
 
   bool cleanup();
@@ -168 +158 @@
   std::vector<sTriangleExt>  triangles;       //!< The Triangles if built.
 
-  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.
 
-  std::list<ModelMaterial*>  materialList;    //!< A list for all the Materials in this Model
+  std::vector<Group>         _modelGroups;
+
+  std::list<Material>        materialList;    //!< A list for all the Materials in this Model
 };