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

Timestamp:

Dec 27, 2005, 2:28:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some new tc-stuff

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• vertex_array_model.cc (modified) (5 diffs)

trunk/src/lib/graphics/importer/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXimporter.a
+noinst_LIBRARIES = libORXimporter.a libtc.a
 
 libORXimporter_a_SOURCES = model.cc \
-                           tc.c \
                            vertex_array_model.cc \
                            static_model.cc \
@@ -16 +15 @@
                            height_map.cc
 
+libtc_a_SOURCES  = tc.c
 
 

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

@@ -52 +52 @@
   this->setClassID(CL_MODEL, "VertexArrayModel");
   this->bFinalized = false;
+
+  // The acTC object generating this Model. //
+  ACTCData *tc;
+  tc = actcNew();
+  if(tc == NULL) {
+    /* memory allocation failed */
+    /* print error here and exit or whatever */
+  }
+
+  // inputing the data of model to the tc
+  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();
 
@@ -61 +77 @@
     this->addTexCoor(model.getTexCoordArray()[i], model.getTexCoordArray()[i+1]);
 
-  // The acTC object generating this Model. //
-  ACTCData *tc;
-  tc = actcNew();
-  if(tc == NULL) {
-    /* memory allocation failed */
-    /* print error here and exit or whatever */
-  }
-
-  // inputing the data of model to the tc
-  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.
+
   int prim;
   unsigned int v1, v2, v3;
@@ -84 +86 @@
     this->addIndice(v1);
     this->addIndice(v2);
+    printf("%d\n", v1);
+    printf("%d\n", v2);
     /* start a primitive of type "prim" with v1 and v2 */
     while(actcGetNextVert(tc, &v3) != ACTC_PRIM_COMPLETE)
@@ -89 +93 @@
       /* continue primitive using v3 */
       this->addIndice(v3);
+      printf("%d\n", v3);
     }
     this->newStripe();
@@ -96 +101 @@
   this->finalize();
 }
+
 
 /**