Changeset 3895 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/primitive_model.cc

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

File:

• orxonox/trunk/src/lib/graphics/importer/primitive_model.cc (modified) (4 diffs)

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);
       }
 }