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

Timestamp:

Apr 21, 2005, 3:07:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: prepare for VertexArrays

File:

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

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

@@ -14 +14 @@
 template<class T> class tList;
 
+//! 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.
+*/
+typedef enum MODEL_TYPE {MODEL_DISPLAY_LIST,
+                         MODEL_VERTEX_ARRAY};
 
-
-using namespace std;
 
 // definition of different modes for setting up Faces
@@ -23 +28 @@
 #define TEXCOORD 2     //!< If Faces are created WITH TextureCoordinate
 //! an enumerator for VERTEX_FORMAT
-enum VERTEX_FORMAT {VERTEX_ONLY = VERTEX,
+typedef enum VERTEX_FORMAT {VERTEX_ONLY = VERTEX,
                     VERTEX_NORMAL = NORMAL,
                     VERTEX_TEXCOORD = TEXCOORD,
@@ -70 +75 @@
 
   char* name;            //!< This is the name of the Model.
+  MODEL_TYPE type;
   bool finalized;        //!< Sets the Object to be finalized.
 
@@ -81 +87 @@
   int groupCount;       //!< The Count of Groups.
 
+  tList<Material>* materialList;
+  
+
   bool initGroup(Group* group);
   bool initFace (Face* face);
@@ -86 +95 @@
   bool buildVertexNormals(void);
 
-  bool importToGL(void);
+  bool importToDisplayList(void);
   bool addGLElement(FaceElement* elem);
 
+  bool importToVertexArray(void);
+
+  bool deleteArrays(void);
   bool cleanup(void);
   bool cleanupGroup(Group* group);
@@ -94 +106 @@
   bool cleanupFaceElement(FaceElement* faceElem);
 
-  tList<Material>* materialList;
 
  protected:
@@ -104 +115 @@
 
  public:
-  Model(const char* modelName = NULL);
+  Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
   virtual ~Model(void);