Changeset 6188 in orxonox.OLD

Timestamp:

Dec 20, 2005, 2:22:32 PM (18 years ago)

Author:

patrick

Message:

christmas: got the md2 bug. the devil is in the detail

Location:

branches/christmas_branche/src/lib/graphics/importer

Files:

• md2Model.cc (modified) (3 diffs)
• md2Model.h (modified) (1 diff)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -181 +181 @@
 {
   glPushMatrix();
-  //this->renderFrame();
-  renderFrameTriangles();
+  this->renderFrame();
+//   renderFrameTriangles();
   glPopMatrix();
 }
@@ -352 +352 @@
   this->numTexCoor = 0;
 
-  this->scaleFactor = 0.2f;
+  this->scaleFactor = 1.0f;
+//   this->scaleFactor = 0.2f;
 
   this->fileName = NULL;
@@ -455 +456 @@
         {
           /* SPEEDUP: *(pVerts + i + 0) = (*(frame->pVertices + i + 0)...  */
-          pVertex[j][0] = ((frame->pVertices[j].v[0] * frame->scale[0] ) + frame->translate[0] )* this->scaleFactor;
-          pVertex[j][1] = ((frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2]) * this->scaleFactor;
-          pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
+           pVertex[j][0] = ((frame->pVertices[j].v[0] * frame->scale[0] ) + frame->translate[0] )* this->scaleFactor;
+           pVertex[j][1] = ((frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2]) * this->scaleFactor;
+           pVertex[j][2] = (-1.0 * (frame->pVertices[j].v[1] * frame->scale[1] + frame->translate[1])) * this->scaleFactor;
+
+//            pVertex[j][0] = ((frame->pVertices[j].v[0] /** frame->scale[0]*/ )/* + frame->translate[0]*/ );
+//            pVertex[j][2] = (-1.0f * (frame->pVertices[j].v[2] /** frame->scale[2]*/) /*+ frame->translate[2]*/);
+//            pVertex[j][1] = ((frame->pVertices[j].v[1] /** frame->scale[1]*/ /*+ frame->translate[1]*/));
+
 
           printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);

branches/christmas_branche/src/lib/graphics/importer/md2Model.h

@@ -69 +69 @@
 typedef struct
 {
-  char             v[3];                 //!< the vector of the vertex
+  unsigned char             v[3];                 //!< the vector of the vertex
   unsigned char    lightNormalIndex;     //!< the index of the light normal
 } sVertex;