Changeset 6191 in orxonox.OLD for branches/christmas_branche/src/lib/graphics/importer

Timestamp:

Dec 20, 2005, 3:24:14 PM (19 years ago)

Author:

patrick

Message:

christmas: the texture gets loaded now and is loadable

Location:

branches/christmas_branche/src/lib/graphics/importer

Files:

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

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

@@ -121 +121 @@
   currVec = &this->data->pVertices[this->data->numVertices * this->animationState.currentFrame];
   nextVec = &this->data->pVertices[this->data->numVertices * this->animationState.nextFrame];
-  PRINTF(0)("current frame nr %i, next frame nr %i\n", this->animationState.currentFrame, this->animationState.nextFrame);
-
 
   for( int i = 0; i < this->data->numVertices; ++i)
@@ -215 +213 @@
         }
 
-
       for(; i > 0; i--, pCommands += 3) /* down counting for loop, next 3 gl commands */
         {
@@ -242 +239 @@
 //   glEnable(GL_CULL_FACE);
 //   glCullFace(GL_BACK);
-
+//
 //   this->processLighting();
 //   this->interpolate(/*verticesList*/);
@@ -352 +349 @@
   this->numTexCoor = 0;
 
-  this->scaleFactor = 1.0f;
-//   this->scaleFactor = 0.2f;
+//   this->scaleFactor = 1.0f;
+  this->scaleFactor = 0.2f;
 
   this->fileName = NULL;
@@ -448 +445 @@
   for(int i = 0; i < this->numFrames; ++i)
     {
-      printf("==============vertex loading for frame %i/%i========\n", i, this->numFrames);
       frame = (sFrame*)(buffer + this->header->frameSize * i);
       pVertex = this->pVertices + this->numVertices  * i;
@@ -460 +456 @@
            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]);
+          //printf("vertex %i/%i: (%f, %f, %f)\n", j, this->numVertices, pVertex[j][0], pVertex[j][1], pVertex[j][2]);
 
           pNormals[j] = frame->pVertices[j].lightNormalIndex;

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

@@ -69 +69 @@
 typedef struct
 {
-  unsigned 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;