Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/lib/graphics/importer/primitive_model.cc

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

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

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

@@ -71 +71 @@
 void PrimitiveModel::sphereModel(float size, unsigned int detail)
 {
-  int vertexCount = 0;
   if (detail <= 0) 
     detail = 1;
@@ -89 +88 @@
                           size * sin(vi) * cos(vj));
           this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
-          vertexCount++;
         }
     }
   this->addVertex(0, -size, 0);
+  this->addVertexTexture(0,0);
   this->addVertex(0, size, 0);
+  this->addVertexTexture(0 ,1);
 
   // defining the binding Faces.
@@ -102 +102 @@
         {
           
-          v1 = i*detail + j;
-          v4 = i*detail + (j+1);
+          v1 = i*detail + j-1;
+          v4 = i*detail + j;
           
           if (i == detail*2 -1)
             {
-              v2 = j;
-              v3 = j+1;
+              v2 = j-1;
+              v3 = j;
             }
           else
             {
-              v2 = (i+1)*detail + j;
-              v3 = (i+1)*detail + (j+1);
-            }
-          
+              v2 = (i+1)*detail + j-1;
+              v3 = (i+1)*detail + j;
+            }
+
           if (j == 0)
             {
-              v1 = vertexCount+1;
+              v1 = this->getVertexCount()-2;
               this->addFace(3, VERTEX_TEXCOORD, v1, v1, v3, v3, v4, v4);
             }
           else if (j == detail)
             {
-              v3 = vertexCount+2;
+              v3 = this->getVertexCount()-1;
               this->addFace(3, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3);
             }
@@ -157 +157 @@
     {
       int p1, p2, p3, p4;
-      p1 = 2*i+1;
-      p2 = 2*i+2;
-      p3 = 2*i+4;
-      p4 = 2*i+3;
+      p1 = 2*i;
+      p2 = 2*i+1;
+      p3 = 2*i+3;
+      p4 = 2*i+2;
       // something is wrong here
       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);
+      this->addFace(3, VERTEX_ONLY, p4, p1, 2*detail);
+      this->addFace(3, VERTEX_ONLY, p2, p3, 2*detail+1);
     }
   // 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);
+  this->addFace(4, VERTEX_ONLY, 2*detail-2, 2*detail-1, 1, 0);
+  this->addFace(3, VERTEX_ONLY, 0, 2*detail-2, 2*detail);
+  this->addFace(3, VERTEX_ONLY, 2*detail-1, 1, 2*detail+1);
 }
 
@@ -198 +198 @@
     {
       unsigned int v1, v2;
-      v1 = i+3;
+      v1 = i+2;
       if (i == detail -1)
-        v2 = 3;
+        v2 = 2;
       else
-        v2 = i+4;
-      this->addFace(3, VERTEX_ONLY, 1, v1, v2);
-      this->addFace(3, VERTEX_ONLY, 2, v1, v2); 
+        v2 = i+3;
+      this->addFace(3, VERTEX_ONLY, 0, v1, v2);
+      this->addFace(3, VERTEX_ONLY, 1, v1, v2); 
     }
 }
@@ -228 +228 @@
   unsigned int v1, v2, v3, v4;
   for (int i = 0; i < detail-1; i++)
-    for (int j = 1; j < detail; j++)
+    for (int j = 0; j < detail-1; j++)
       {
         v1 = i*detail + j;