Changeset 8600 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 2:11:11 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 tag rotation and submodel drawing issue

File:

• branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc (modified) (5 diffs)

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

@@ -212 +212 @@
 
       if( data->animationState.interpolationFraction != 0.0 &&
-          data->animationState.currentFrame != data->animationState.nextFrame) {
+          data->animationState.currentFrame != data->animationState.nextFrame)
+      {
         //we need to interpolate
         MD3Tag* nextFrameTag = data->boneFrames[data->animationState.nextFrame]->tags[child->parentTagIndex];
-        this->tmpMatrix[i] = this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction, i);
+        this->interpolateTransformation(currFrameTag, nextFrameTag, data->animationState.interpolationFraction, i);
       }
       else
@@ -239 +240 @@
       }
 
+//       PRINTF(0)("matrix: \n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n%f, %f, %f, %f\n",
+//       this->tmpMatrix[i][0],
+//       this->tmpMatrix[i][1],
+//       this->tmpMatrix[i][2],
+//       this->tmpMatrix[i][3],
+//       this->tmpMatrix[i][4],
+//       this->tmpMatrix[i][5],
+//       this->tmpMatrix[i][6],
+//       this->tmpMatrix[i][7],
+//       this->tmpMatrix[i][8],
+//       this->tmpMatrix[i][9],
+//       this->tmpMatrix[i][10],
+//       this->tmpMatrix[i][11],
+//       this->tmpMatrix[i][12],
+//       this->tmpMatrix[i][13],
+//       this->tmpMatrix[i][14],
+//       this->tmpMatrix[i][15]
+//                );
       // switch to child coord system
 
@@ -288 +307 @@
       MD3Mesh* mesh = data->meshes[i];
 
-//       gl.glBlendFunc(mesh.GLSrcBlendFunc, mesh.GLDstBlendFunc);
-//       gl.glDepthMask(mesh.GLDepthMask);
-
       if( mesh->header->textureNum > 0 && &mesh->material[0] != NULL)
         mesh->material[0].select();
@@ -299 +315 @@
       this->drawMesh(mesh, frame);
 
-
       // draw vertex normals if needed
-      if( this->bDrawNormals) {
+      if( this->bDrawNormals)
+      {
         // get vertex normals, interpolate if necessary
         if( data->animationState.interpolationFraction != 0.0 &&
-            data->animationState.currentFrame != data->animationState.nextFrame) {
+            data->animationState.currentFrame != data->animationState.nextFrame)
+        {
           //interpolate vertex normals
           this->drawVertexNormals(frame, this->tmpNormal[i]);
-            }
-            else {
+        }
+        else {
           //stick with current vertex normals
-              this->drawVertexNormals(frame, &mesh->normals[data->animationState.currentFrame]);
-            }
+          this->drawVertexNormals(frame, &mesh->normals[data->animationState.currentFrame]);
+        }
       }
     }
@@ -326 +343 @@
       glPushMatrix();
       glMultMatrixf(this->tmpMatrix[i]);
-
       // and draw child
       this->draw(child);
-
       glPopMatrix();
+
       i++;
       it++;
     }
+
   }