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

Timestamp:

Jul 6, 2005, 1:01:20 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now will take array indexes directly from the ModelFaceElement, Array::getIndex(…) not used but I will keep it, since its a good thing to have

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (4 diffs)
• model.cc (modified) (2 diffs)
• model.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/abstract_model.h

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -11 +11 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: 
+   co-programmer:
 */
 
-/*! 
+/*!
     \file abstract_model.h
     \brief Definition of an abstract model. containing all needed for other model
@@ -73 +73 @@
 
 
+//! holds the information about a triangle
+typedef struct
+{
+  unsigned int   indexToVertices[3];   //!< index to the verteces of the triangle
+  unsigned int   indexToTexCoor[3];    //!< index to the texture coordinates
+} sTriangleExt;
+
+
 //! the command list of the md2 model, very md2 specific
 typedef struct
@@ -101 +109 @@
   float            lastTime;             //!< last time stamp
   float            interpolationState;   //!< the state of the animation [0..1]
-  
+
   int              type;                 //!< animation type
 

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

@@ -826 +826 @@
   this->normals->finalizeArray();
 
-  if( unlikely((this->triangles = new sTriangle[this->vertices->getCount()]) == 0));
+  if( unlikely((this->triangles = new sTriangleExt[this->vertices->getCount()]) == 0));
   {
     PRINTF(2)("Could not allocate memory for triangle list\n");
@@ -850 +850 @@
         for(int j = 0; j < 3; ++j)
         {
-          //this->triangles[i].indexToVertices[j] = this->vertices->getIndex(tmpElem);
+          this->triangles[i].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber;
+          this->triangles[i].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber;
           tmpElem = tmpElem->next;
         }

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

@@ -178 +178 @@
   Array<GLfloat>*  normals;         //!< The Array that handles the Normals.
   Array<GLfloat>*  vTexture;        //!< The Array that handles the VertexTextureCoordinates.
-  sTriangle*       triangles;       //!< The Array of triangles in the abstract_model.h style
+  sTriangleExt*    triangles;       //!< The Array of triangles in the abstract_model.h style
 
   ModelGroup*      firstGroup;      //!< The first of all groups.