Changeset 6031 in orxonox.OLD for trunk/src/lib/graphics/importer/static_model.h

Timestamp:

Dec 10, 2005, 11:18:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cleanup in the StaticModel class, as my idea changed

File:

• trunk/src/lib/graphics/importer/static_model.h (modified) (5 diffs)

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

@@ -16 +16 @@
 // FORWARD DECLARATION //
 template<class T> class tArray;
-
-
-//! an enumerator fot the different Model Types.
-/**
-   MODEL_DISPLAY_LIST means, that a DisplayList will be built out of the model. This model will be STATIC, meaning it cannot be changed after initialisation.
-   MODEL_VERTEX_ARRAY means, that a VertexArray will be built out of the model. This moel will be DYNAMIX, meaning that one can change the properties from outside of the model.
- * @todo implement this stuff
-*/
-typedef enum MODEL_TYPE {
-  MODEL_DISPLAY_LIST,
-  MODEL_VERTEX_ARRAY
-};
-
 
 // definition of different modes for setting up Faces
@@ -111 +98 @@
 {
  public:
-  StaticModel(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
+  StaticModel(const char* modelName = NULL);
   virtual ~StaticModel();
 
@@ -120 +107 @@
   void rebuild();
 
-  /** @returns Count of the Models (Groups) in this File */
-  inline int getGroupCount() const { return this->groupCount; };
-
-  /** @returns a Pointer to the Vertex-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getVertexArray() const { return this->vertices->getArray(); };
-  /** @returns the VertexCount of this Model */
-  inline unsigned int getVertexCount() const { return this->vertexCount; };
-
-  /** @returns a Pointer to the Normals-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getNormalsArray() const { return this->normals->getArray(); };
-  /** @returns the NormalsCount of this Model */
-  inline unsigned int getNormalsCount() const { return this->normalCount; };
-
-  /** @returns a Pointer to the TexCoord-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getTexCoordArray() const { return this->vTexture->getArray(); };
-  /** @returns the TexCoord-Count of this Model */
-  inline unsigned int getTexCoordCount() const { return this->texCoordCount; };
-
-  /** @returns the Count of Faces of this Model */
-  inline unsigned int getFaceCount() const { return this->faceCount; };
-
-
   Material* addMaterial(Material* material);
   Material* addMaterial(const char* materialName);
 
   bool addGroup(const char* groupString);
+
   bool addVertex(const char* vertexString);
   bool addVertex(float x, float y, float z);
+
   bool addFace(const char* faceString);
   bool addFace(int faceElemCount, VERTEX_FORMAT type, ...);
+
   bool addVertexNormal(const char* normalString);
   bool addVertexNormal(float x, float y, float z);
+
   bool addVertexTexture(const char* vTextureString);
   bool addVertexTexture(float u, float v);
+
   bool setMaterial(const char* mtlString);
   bool setMaterial(Material* mtl);
+
   void finalize();
 
@@ -163 +134 @@
 
   Material* findMaterialByName(const char* materialName);
-
 
  protected:
@@ -173 +143 @@
   bool importToDisplayList();
   bool buildTriangleList();
+
   bool addGLElement(ModelFaceElement* elem);
 
-  bool importToVertexArray();
-
-  bool deleteArrays();
   bool cleanup();
 
  private:
-  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 model.h style
+
+  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.
 
   ModelGroup*                firstGroup;      //!< The first of all groups.