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

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.cc (modified) (7 diffs)

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

@@ -33 +33 @@
    \brief Creates a 3D-Model. and assigns it a Name.
 */
-Model::Model(const char* modelName)
+Model::Model(const char* modelName, MODEL_TYPE type)
 {
   PRINTF(4)("new 3D-Model is being created\n"); 
   this->name = NULL;
   this->setName(modelName);
-
+  this->type = type;
 
   this->finalized = false;
@@ -82 +82 @@
     }
 
+  // deleting Arrays
+  this->deleteArrays();
+
   // deleting the MaterialList
   PRINTF(5)("Deleting Materials.\n");
-
   tIterator<Material>* tmpIt = this->materialList->getIterator();
   Material* material = tmpIt->nextElement();
@@ -101 +103 @@
 void Model::finalize(void)
 {
-  this->importToGL ();
+  // this creates the display List.
+  this->importToDisplayList();
   
+
+  // deletes everything we allocated.
+  if (this->type == MODEL_DISPLAY_LIST)
+    this->deleteArrays();
   this->cleanup();
 
@@ -248 +255 @@
 
 /**
-   \brief finalizes an Model.
-   This funcion is needed, to delete all the Lists, and arrays that are no more needed because they are already imported into openGL. This will be applied at the end of the importing Process.
-*/
-bool Model::cleanup(void)
-{
-  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
-
+   \brief deletes all the arrays
+*/
+bool Model::deleteArrays(void)
+{
   if (this->vertices)
     delete this->vertices;
@@ -261 +265 @@
   if (this->normals)
     delete this->normals;
-
+  this->vertices = NULL;
+  this->vTexture = NULL;
+  this->normals = NULL;
+}
+
+/**
+   \brief finalizes an Model.
+   This funcion is needed, to delete all the Lists, and arrays that are no more needed because they are already imported into openGL. This will be applied at the end of the importing Process.
+*/
+bool Model::cleanup(void)
+{
+  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
   this->cleanupGroup(this->firstGroup);
   return true; 
@@ -703 +718 @@
    \brief reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToGL (void)
-{
-
+bool Model::importToDisplayList(void)
+{
   // finalize the Arrays
   this->vertices->finalizeArray();
@@ -794 +808 @@
 
 /**
+   \brief reads and includes the Faces/Materials into the openGL state Machine
+*/
+bool Model::importToVertexArray(void)
+{
+  // finalize the Arrays
+  this->vertices->finalizeArray();
+  this->vTexture->finalizeArray();
+  if (normals->getCount() == 0) // vertices-Array must be built for this
+    this->buildVertexNormals();
+  this->normals->finalizeArray();
+
+  this->currentGroup = this->firstGroup;
+
+
+}
+
+
+
+/**
    \brief Adds a Face-element (one vertex of a face) with all its information. 
    \param elem The FaceElement to add to the OpenGL-environment.