Changeset 3426 in orxonox.OLD

Timestamp:

Feb 28, 2005, 9:09:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: added cylinderModel to importer

Location:

orxonox/trunk/src/importer

Files:

• framework.cc (modified) (2 diffs)
• model.cc (modified) (4 diffs)

orxonox/trunk/src/importer/framework.cc

@@ -52 +52 @@
 int main(int argc, char *argv[])
 {
-  verbose = 1;
+  verbose = 3;
 
   Uint8* keys; // This variable will be used in the keyboard routine
@@ -112 +112 @@
       obj->finalize();
       */
-      obj = (OBJModel*) new Model(SPHERE);
+      obj = (OBJModel*) new Model(CYLINDER);
     }
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 

orxonox/trunk/src/importer/model.cc

@@ -51 +51 @@
       break;
     case CYLINDER:
+      this->cylinderModel();
       break;
 
@@ -589 +590 @@
   this->vertices->finalizeArray();
   this->vTexture->finalizeArray();
-  if (normals->getCount() == 0) // vertices-Array must be uilt for this
+  if (normals->getCount() == 0) // vertices-Array must be built for this
     this->buildVertexNormals();
   this->normals->finalizeArray();
@@ -770 +771 @@
       normArray[i].normalize();
       PRINTF(3)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
-
+      
       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
 
@@ -896 +897 @@
 }
 
-void Model::cylinderModel()
-{
-  int detailLevel = 10;
-  float size;
-  for (int i = 0; i < detailLevel; i++)
-    {
-      this->addVertex(sin((float)i/detailLevel), -size/2, cos((float)i/detailLevel));
-    }
-}
+/**
+   \brief Creates a Cylinder.
+*/
+void Model::cylinderModel(void)
+{
+  unsigned int detail = 20;
+  float size = 1.0;
+
+  // check if devision by zero
+  if (detail <= 3)
+    detail = 3;
+  int count = 0;
+  // defining Points of the Cylinder.
+  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
+    {
+      this->addVertex(size*cos(phi), size*sin(phi), -size);
+      this->addVertex(size*cos(phi), size*sin(phi), size);
+      count ++;
+    }
+  this->addVertex(0, 0, -size);
+  this->addVertex(0, 0, size);
+
+  
+  if (count != detail)
+    cout << "calculation error, count should be " << detail << " but is " << count << endl;
+  vertices->debug();
+
+  // adding Faces
+  for (int i = 0; i < detail-1; i++)
+    {
+      int p1, p2, p3, p4;
+      p1 = 2*i+1;
+      p2 = 2*i+2;
+      if (i <= detail);
+      p3 = 2*i+4;
+      p4 = 2*i+3;
+      cout <<i+1 <<": "<< p1 <<" "<< p2 <<" "<< p3 <<" "<< p4 <<endl;
+      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, 0, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
+
+}