Changeset 3895 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Apr 19, 2005, 6:56:16 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: more logic in adding face with the numerical adder

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• model.cc (modified) (2 diffs)
• model.h (modified) (2 diffs)
• primitive_model.cc (modified) (4 diffs)

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

@@ -441 +441 @@
    \param type 0: vertex only, 1: vertex and normal, 2: vertex and Texture, 3 vertex, normal and texture
 */
-bool Model::addFace(int faceElemCount, int type, ...)
+bool Model::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
 {
    if (this->currentGroup->faceCount > 0)
@@ -833 +833 @@
   */
 
-  this->addFace (4, 3, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
-  this->addFace (4, 3, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
-  this->addFace (4, 3, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
-  this->addFace (4, 3, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
-  this->addFace (4, 3, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
-  this->addFace (4, 3, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
-
-}
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
+  this->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
+
+}

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

@@ -23 +23 @@
                     VERTEX_NORMAL = NORMAL,
                     VERTEX_TEXCOORD = TEXCOORD,
-                    VERTEXT_TEXTURE_NORMAL = NORMAL | TEXCOORD};
+                    VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD};
 
 //! Class that handles 3D-Models. it can also read them in and display them.
@@ -105 +105 @@
   bool addVertex(float x, float y, float z);
   bool addFace(char* faceString);
-  bool addFace(int faceElemCount, int type, ...);
+  bool addFace(int faceElemCount, VERTEX_FORMAT type, ...);
   bool addVertexNormal(char* normalString);
   bool addVertexNormal(float x, float y, float z);

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

@@ -123 +123 @@
             {
               v1 = vertexCount+1;
-              this->addFace(3, TEXCOORD, v1, v1, v3, v3, v4, v4);
+              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v3, v3, v4, v4);
             }
           else if (j == detail)
             {
               v3 = vertexCount+2;
-              this->addFace(3, TEXCOORD, v1, v1, v2, v2, v3, v3);
+              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3);
             }
           else
-            this->addFace(4, TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
+            this->addFace(4, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
         }
     }
@@ -167 +167 @@
       p4 = 2*i+3;
       // something is wrong here
-      this->addFace(4, 0, p1, p2, p3, p4);
-      this->addFace(3, 0, p4, p1, 2*detail+1);
-      this->addFace(3, 0, p2, p3, 2*detail+2);
-    }
-  addFace(4,0, 2*detail-1, 2*detail, 2, 1);
-  this->addFace(3, VERTEX, 1, 2*detail-1, 2*detail+1);
-  this->addFace(3, VERTEX, 2*detail, 2, 2*detail+2);
+      this->addFace(4, VERTEX_ONLY, p1, p2, p3, p4);
+      this->addFace(3, VERTEX_ONLY, p4, p1, 2*detail+1);
+      this->addFace(3, VERTEX_ONLY, p2, p3, 2*detail+2);
+    }
+  addFace(4, VERTEX_ONLY, 2*detail-1, 2*detail, 2, 1);
+  this->addFace(3, VERTEX_ONLY, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, VERTEX_ONLY, 2*detail, 2, 2*detail+2);
 }
 
@@ -207 +207 @@
       else
         v2 = i+4;
-      this->addFace(3, VERTEX, 1, v1, v2);
-      this->addFace(3, VERTEX, 2, v1, v2); 
+      this->addFace(3, VERTEX_ONLY, 1, v1, v2);
+      this->addFace(3, VERTEX_ONLY, 2, v1, v2); 
     }
 }
@@ -238 +238 @@
         v3 = (i+1)*detail + (j+1);
         v4 = i*detail + (j+1);
-        this->addFace(4, TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
+        this->addFace(4, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
       }
 }