Changeset 4226 in orxonox.OLD for orxonox/branches

Timestamp:

May 19, 2005, 10:34:39 PM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: got segfault, assuming problem in the verticesList interpolation

File:

• orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc (modified) (6 diffs)

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

@@ -514 +514 @@
   
   this->textureID = 0;
-  this->scaleFactor = 0.001f;
+  this->scaleFactor = 1.0f;
 
   this->setAnim(STAND);
@@ -573 +573 @@
     {
       /*
-        faster but evt. buggy
+      faster but evt. buggy
       frame = (sFrame*)(buffer + header.frameSize * i); 
       pVertex = this->pVertices + this->numVertices  * i;
@@ -589 +589 @@
           pVertex[j][2] = (frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2];
           
-          printf("pVertex %f, %f, %f\n", pVertex[j][0], pVertex[j][1], pVertex[j][2]);
+          //printf("pVertex %f, %f, %f\n", pVertex[j][0], pVertex[j][1], pVertex[j][2]);
 
           pNormals[j] = frame->pVertices[j].lightNormalIndex;
@@ -623 +623 @@
   nextVec = &this->pVertices[this->numVertices * this->animationState.nextFrame];
 
-    printf("currVec: %f, %f, %f\n", currVec[0][0], currVec[0][1], currVec[0][2]);
-    printf("nextVec: %f, %f, %f\n", nextVec[0][0], nextVec[1][1], nextVec[2][2]);
+  //printf("currVec: %f, %f, %f\n", currVec[0][0], currVec[0][1], currVec[0][2]);
+  //printf("nextVec: %f, %f, %f\n", nextVec[0][0], nextVec[1][1], nextVec[2][2]);
   
-    printf("numFrames: %i\n", this->numFrames);
-    printf("currentFrame: %i\n", this->animationState.currentFrame);
-
+  //printf("numFrames: %i\n", this->numFrames);
+  // printf("currentFrame: %i\n", this->animationState.currentFrame);
+  
     //for(int i = 0; i < this->numFrames; ++i)
     for(int i = 0; i < this->numVertices; ++i)
@@ -655 +655 @@
     type = 0;
 
-this->animationState.startFrame = animationList[type].firstFrame;
-this->animationState.endFrame = animationList[type].lastFrame;
-this->animationState.nextFrame = animationList[type].firstFrame + 1;
-this->animationState.fps = animationList[type].fps;
-this->animationState.type = type;
-
-this->animationState.interpolationState = 0.0;
-this->animationState.localTime = 0.0;
-this->animationState.lastTime = 0.0;
-this->animationState.currentFrame = animationList[type].firstFrame;
+  this->animationState.startFrame = animationList[type].firstFrame;
+  this->animationState.endFrame = animationList[type].lastFrame;
+  this->animationState.nextFrame = animationList[type].firstFrame + 1;
+  this->animationState.fps = animationList[type].fps;
+  this->animationState.type = type;
+  
+  this->animationState.interpolationState = 0.0;
+  this->animationState.localTime = 0.0;
+  this->animationState.lastTime = 0.0;
+  this->animationState.currentFrame = animationList[type].firstFrame;
 }
 
@@ -761 +761 @@
   /* draw the triangles */
   /* \todo: take int i out of while loop */
-  while( false /*int i = *(pCommands++)*/) /* strange looking while loop for maximum performance */
+  while( int i = *(pCommands++)) /* strange looking while loop for maximum performance */
     {
       int i;