Changeset 3657 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer/model.cc

Timestamp:

Mar 27, 2005, 12:22:09 AM (19 years ago)

Author:

bensch

Message:

orxonox.trunk: importer now with subclass PrimitiveModel, taht supports working CONE/CUBE/PLANE/SPHERE/CYLINDER

File:

• orxonox/trunk/src/lib/graphics/importer/model.cc (modified) (3 diffs)

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

@@ -34 +34 @@
 {
   this->initialize();
-}
-
-/**
-   \brief Creates a 3D-Model of Primitive-Type type
-
-   if you want to just display a Cube/Sphere/Cylinder/... without any material.
-   
-   \todo implement Cube/Sphere/Cylinder/...
-*/
-Model::Model(PRIMITIVE type)
-{
-  this->initialize();
-
-  switch (type)
-    {
-    default:
-    case CUBE:
-      this->cubeModel();
-      break;
-    case SPHERE:
-      this->sphereModel();
-      break;
-    case CYLINDER:
-      this->cylinderModel();
-      break;
-
-    }
-  this->importToGL ();
-
-  this->cleanup();
 }
 
@@ -492 +462 @@
 
       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
-      if (type >= 2)
+      if (type & TEXCOORD)
         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
-      if (type == 1 || type ==3)
+      if (type & NORMAL)
         tmpElem->normalNumber = va_arg(itemlist, int) -1;
       this->currentGroup->currentFace->vertexCount++;
@@ -863 +833 @@
 
 }
-
-/**
-   \brief Builds a Sphere into the Model.
-   \param size The radius of the Sphere.
-   \param detail The detail of the Sphere.
-*/
-void Model::sphereModel(float size, unsigned int detail)
-{
-  int vertexCount = 0;
-  if (detail <= 0) 
-    detail = 1;
-  //  detail = 2; // make it even
-  float df = (float)detail;
-  
-  // defining the Vertices
-  for (float i = 0; i < df *2.0; i+=1.0)
-    {
-      float vi = i/df *PI;
-      for (float j = -df / 2.0 +1.0; j < df / 2.0; j+=1.0 *df/(df+1.0))
-        {
-          float vj = j/df *PI;
-          this->addVertex(size * cos(vi) * cos(vj),
-                          size * sin(vj),
-                          size * sin(vi) * cos(vj));
-          this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
-          vertexCount++;
-        }
-    }
-  this->addVertex(0, -size, 0);
-  this->addVertex(0, size, 0);
-
-  // defining the binding Faces.
-  unsigned int v1, v2, v3, v4;
-  for (int i = 0; i <= detail * 2 -1; i++)
-    {
-      for (int j = 0; j <= detail; j++)
-        {
-          
-          v1 = i*detail + j;
-          v4 = i*detail + (j+1);
-          
-          if (i == detail*2 -1)
-            {
-              v2 = j;
-              v3 = j+1;
-            }
-          else
-            {
-              v2 = (i+1)*detail + j;
-              v3 = (i+1)*detail + (j+1);
-            }
-          
-          if (j == 0)
-            {
-              v1 = vertexCount+1;
-              this->addFace(3, 2, v1, v1, v3, v3, v4, v4);
-            }
-          else if (j == detail)
-            {
-              v3 = vertexCount+2;
-              this->addFace(3, 2, v1, v1, v2, v2, v3, v3);
-            }
-          else
-            this->addFace(4, 2, v1, v1, v2, v2, v3, v3, v4, v4);
-        }
-    }
-}
-/**
-   \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)
-    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
-  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;
-      // 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, 0, 1, 2*detail-1, 2*detail+1);
-  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
-
-}
-
-
-void Model::coneModel(float size, unsigned int detail)
-{
-
-  
-}