Changeset 9830 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/static_model_data.cc

Timestamp:

Sep 26, 2006, 2:54:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Static Model splitted up into Data and Logic part

File:

• branches/new_class_id/src/lib/graphics/importer/static_model_data.cc (modified) (5 diffs)

branches/new_class_id/src/lib/graphics/importer/static_model_data.cc

@@ -555 +555 @@
  * @param type The information Passed with each Vertex
 */
-bool StaticModelData::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
+bool StaticModelData::addFace(int faceElemCount, VERTEX_FORMAT type, va_list args)
 {
   if (this->currentGroup->faceCount > 0)
@@ -562 +562 @@
   ModelFaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new ModelFaceElement;
 
-  va_list itemlist;
-  va_start (itemlist, type);
-
   for (int i = 0; i < faceElemCount; i++)
   {
@@ -570 +567 @@
       tmpElem = tmpElem->next = new ModelFaceElement;
 
-    tmpElem->vertexNumber = va_arg (itemlist, int);
+    tmpElem->vertexNumber = va_arg (args, int);
     if (type & TEXCOORD)
-      tmpElem->texCoordNumber = va_arg (itemlist, int);
+      tmpElem->texCoordNumber = va_arg (args, int);
     if (type & NORMAL)
-      tmpElem->normalNumber = va_arg(itemlist, int);
+      tmpElem->normalNumber = va_arg(args, int);
     this->currentGroup->currentFace->vertexCount++;
   }
-  va_end(itemlist);
 
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
@@ -846 +842 @@
 
   /* allocate memory for the new triangle structures */
-  this->triangles.reserve(numTriangles);
+  this->triangles.resize(numTriangles);
 
   /* now iterate through all groups and build up the triangle list */
@@ -951 +947 @@
   return true;
 }
-
-/**
- *  Includes a default model
-
-   This will inject a Cube, because this is the most basic model.
-*/
-void StaticModelData::cubeModel()
-{
-  this->addVertex (-0.5, -0.5, 0.5);
-  this->addVertex (0.5, -0.5, 0.5);
-  this->addVertex (-0.5, 0.5, 0.5);
-  this->addVertex (0.5, 0.5, 0.5);
-  this->addVertex (-0.5, 0.5, -0.5);
-  this->addVertex (0.5, 0.5, -0.5);
-  this->addVertex (-0.5, -0.5, -0.5);
-  this->addVertex (0.5, -0.5, -0.5);
-
-  this->addVertexTexture (0.0, 0.0);
-  this->addVertexTexture (1.0, 0.0);
-  this->addVertexTexture (0.0, 1.0);
-  this->addVertexTexture (1.0, 1.0);
-  this->addVertexTexture (0.0, 2.0);
-  this->addVertexTexture (1.0, 2.0);
-  this->addVertexTexture (0.0, 3.0);
-  this->addVertexTexture (1.0, 3.0);
-  this->addVertexTexture (0.0, 4.0);
-  this->addVertexTexture (1.0, 4.0);
-  this->addVertexTexture (2.0, 0.0);
-  this->addVertexTexture (2.0, 1.0);
-  this->addVertexTexture (-1.0, 0.0);
-  this->addVertexTexture (-1.0, 1.0);
-
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 0.0, 1.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 1.0, 0.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, 0.0, -1.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (0.0, -1.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-  this->addVertexNormal (-1.0, 0.0, 0.0);
-
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,1, 3,3,2, 2,2,3);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,4, 3,3,5, 5,5,6, 4,4,7);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,4,8, 5,5,9, 7,7,10, 6,6,11);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,6,12, 7,7,13, 1,9,14, 0,8,15);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,16, 7,10,17, 5,11,18, 3,3,19);
-  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,12,20, 0,0,21, 2,2,22, 4,13,23);
-}