Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/primitive_model.cc

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/lib/graphics/importer/primitive_model.cc (modified) (6 diffs)

orxonox/branches/physics/src/lib/graphics/importer/primitive_model.cc

@@ -33 +33 @@
 PrimitiveModel::PrimitiveModel(PRIMITIVE type, float size, unsigned int detail)
 {
-  this->initialize();
-
   switch (type)
     {
@@ -54 +52 @@
       break;
     }
-  this->importToGL ();
-
-  this->cleanup();
+  this->finalize();
 }
 
@@ -123 +119 @@
             {
               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);
         }
     }
@@ -163 +159 @@
       p1 = 2*i+1;
       p2 = 2*i+2;
-      if (i <= detail);
       p3 = 2*i+4;
       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);
+    }
+  // caps
+  this->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 +203 @@
       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 +234 @@
         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);
       }
 }