Changeset 6308 in orxonox.OLD for trunk/src

Timestamp:

Dec 27, 2005, 1:51:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added tc a library to convert Vertice-Melanges into VertexArrayStrips. Also implemented it partly in the VertexArrayModel-class…. testing

Location:

trunk/src/lib

Files:

• graphics/importer/Makefile.am (modified) (3 diffs)
• graphics/importer/model.h (modified) (2 diffs)
• graphics/importer/tc.COPYRIGHT (added)
• graphics/importer/tc.c (added)
• graphics/importer/tc.h (added)
• graphics/importer/vertex_array_model.cc (modified) (3 diffs)
• graphics/importer/vertex_array_model.h (modified) (2 diffs)
• particles/particle_system.cc (modified) (1 diff)

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

@@ -5 +5 @@
 
 libORXimporter_a_SOURCES = model.cc \
+                           tc.c \
                            vertex_array_model.cc \
                            static_model.cc \
@@ -18 +19 @@
 
 noinst_HEADERS = model.h \
+                 tc.h \
                  vertex_array_model.h \
                  static_model.h \
@@ -28 +30 @@
                  height_map.h \
                  anorms.h \
-                 anormtab.h
+                 anormtab.h 

trunk/src/lib/graphics/importer/model.h

@@ -32 +32 @@
 typedef struct
 {
-  unsigned int   indexToVertices[3];   //!< index to the verteces of the triangle
+  unsigned int   indexToVertices[3];   //!< index to the vertices of the triangle
   unsigned int   indexToNormals[3];    //!< index to the normals of the triangle
   unsigned int   indexToTexCoor[3];    //!< index to the texture coordinates
@@ -83 +83 @@
     inline sTriangleExt* getTriangles() const { return this->pModelInfo.pTriangles; };
     /** @returns the Count of Faces of this Model */
-    inline unsigned int getFaceCount() const { return this->pModelInfo.numTriangles; };
+    inline unsigned int getTriangleCount() const { return this->pModelInfo.numTriangles; };
 
 

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

@@ -21 +21 @@
 #include <stdarg.h>
 
+#include "tc.h"
+
 using namespace std;
 
@@ -39 +41 @@
 }
 
-
-/**
- * @brief deletes an VertexArrayModel.
+/**
+ * @brief special copy constructor for converting Models to VertexArray-Stripes
+ * @param model the Model to produce a VertexArray model from.
+ *
+ * Code that uses Brad Granthams
+ * excelent TC-code for generating stripes out of a mix of ModelCoordinates.
+ */
+VertexArrayModel::VertexArrayModel(const Model& model)
+{
+  this->setClassID(CL_MODEL, "VertexArrayModel");
+  this->bFinalized = false;
+  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.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]);
+
+  // 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;
+
+  actcBeginOutput(tc);
+  while((prim = actcStartNextPrim(tc, &v1, &v2) != ACTC_DATABASE_EMPTY))
+  {
+    this->addIndice(v1);
+    this->addIndice(v2);
+    /* start a primitive of type "prim" with v1 and v2 */
+    while(actcGetNextVert(tc, &v3) != ACTC_PRIM_COMPLETE)
+    {
+      /* continue primitive using v3 */
+      this->addIndice(v3);
+    }
+    this->newStripe();
+  }
+  actcEndOutput(tc);
+
+  this->finalize();
+}
+
+/**
+ * @brief deletes a VertexArrayModel.
  *
  * Looks if any from model allocated space is still in use, and if so deleted it.
@@ -75 +132 @@
   glVertexPointer(3, GL_FLOAT, 0, this->vertices.getArray());
   glNormalPointer(GL_FLOAT, 0, this->normals.getArray());
-  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());  
+  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());
 
   for (GLuint i = 1; i < this->stripes.size(); ++i)

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

@@ -29 +29 @@
  public:
   VertexArrayModel();
+  VertexArrayModel(const Model& model);
   virtual ~VertexArrayModel();
 
@@ -43 +44 @@
   void finalize();
 
-  // 
+  //
   void planeModel();
 

trunk/src/lib/particles/particle_system.cc

@@ -386 +386 @@
     case PARTICLE_MODEL:
       if (this->getModel(0))
-        return this->count * this->getModel()->getFaceCount();
+        return this->count * this->getModel()->getTriangleCount();
       break;
   }