Changeset 6313 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 27, 2005, 12:53:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: any-3D-model to VertexArrayModel works perfectly

File:

• trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) (2 diffs)

trunk/src/lib/graphics/importer/vertex_array_model.cc

@@ -52 +52 @@
   this->setClassID(CL_MODEL, "VertexArrayModel");
   this->bFinalized = false;
+
+    // importing the data to the new Model.
+  this->newStripe();
+
+  for (unsigned int i = 0; i < model.getVertexCount()*3; i+=3)
+  {
+    this->addVertex(model.getVertexArray()[i], model.getVertexArray()[i+1], model.getVertexArray()[i+2]);
+  }
+  for (unsigned int i = 0; i < model.getVertexCount()*3; i+=3)
+    this->addColor(model.getVertexArray()[i], model.getVertexArray()[i+1], model.getVertexArray()[i+2]);
+  for (unsigned int i = 0; i < model.getNormalsCount()*3; i+=3)
+    this->addNormal(model.getNormalsArray()[i], model.getNormalsArray()[i+1], model.getNormalsArray()[i+2]);
+//   for (unsigned int i = 0; i < model.getTexCoordCount(); i+=2)
+//     this->addTexCoor(model.getTexCoordArray()[i], model.getTexCoordArray()[i+1]);
+  for (unsigned int i = 0; i < model.getVertexCount()*2; i+=2)
+    this->addTexCoor(1,2);
+
 
   // The acTC object generating this Model. //
@@ -64 +81 @@
   actcBeginInput(tc);
   for(unsigned int i = 0; i < model.getTriangleCount(); i++)
+  {
       actcAddTriangle(tc,
                       model.getTriangles()[i].indexToVertices[0],
                       model.getTriangles()[i].indexToVertices[1],
                       model.getTriangles()[i].indexToVertices[2]);
+  }
   actcEndInput(tc);
 
-  // importing the data to the new Model.
-  this->newStripe();
-
-  for (unsigned int i = 0; i < model.getVertexCount(); i+=3)
-    this->addVertex(model.getVertexArray()[i], model.getVertexArray()[i+1], model.getVertexArray()[i+2]);
-  for (unsigned int i = 0; i < model.getVertexCount(); i+=3)
-    this->addColor(model.getVertexArray()[i], model.getVertexArray()[i+1], model.getVertexArray()[i+2]);
-  for (unsigned int i = 0; i < model.getNormalsCount(); i+=3)
-    this->addNormal(model.getNormalsArray()[i], model.getNormalsArray()[i+1], model.getNormalsArray()[i+2]);
-//   for (unsigned int i = 0; i < model.getTexCoordCount(); i+=2)
-//     this->addTexCoor(model.getTexCoordArray()[i], model.getTexCoordArray()[i+1]);
-  for (unsigned int i = 0; i < model.getVertexCount(); i+=3)
-    this->addTexCoor(1,2);