Changeset 4235 in orxonox.OLD

Timestamp:

May 20, 2005, 1:58:07 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_model: solved the orientation problems, translating coordinates into the right space now.

Location:

orxonox/branches/md2_loader/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (6 diffs)
• story_entities/world.cc (modified) (1 diff)

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

@@ -562 +562 @@
   this->pVertices = new sVec3D[this->numVertices * this->numFrames];
   this->pGLCommands = new int[this->numGLCommands];
-  //this->pGLCommands2 = new int[this->numGLCommands];
   this->pLightNormals = new int[this->numVertices * this->numFrames];
   buffer = new char[this->numFrames * this->header->frameSize];
@@ -572 +571 @@
   fseek(pFile, this->header->offsetGlCommands, SEEK_SET);
   fread(this->pGLCommands, sizeof(int), this->numGLCommands, pFile);
-  //fread(this->pGLCommands2, sizeof(glCommandVertex), this->numGLCommands, pFile);
 
   for(int i = 0; i < this->numFrames; ++i)
@@ -590 +588 @@
           /* SPEEDUP: *(pVerts + i + 0) = (*(frame->pVertices + i + 0)...  */
           pVertex[j][0] = (frame->pVertices[j].v[0] * frame->scale[0]) + frame->translate[0];
-          pVertex[j][1] = (frame->pVertices[j].v[1] * frame->scale[1]) + frame->translate[1];
-          pVertex[j][2] = (frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2];
+          pVertex[j][1] = (frame->pVertices[j].v[2] * frame->scale[2]) + frame->translate[2];
+          pVertex[j][2] = -(frame->pVertices[j].v[1] * frame->scale[1]) + frame->translate[1];
           
           //printf("pVertex %f, %f, %f\n", pVertex[j][0], pVertex[j][1], pVertex[j][2]);
@@ -627 +625 @@
   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("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)
+    for(int i = 0; i < this->numFrames; ++i)
+      //for(int i = 0; i < this->numVertices; ++i)
       { 
         /*
@@ -646 +638 @@
         verticesList[i][1] = (currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1])) * this->scaleFactor;
         verticesList[i][2] = (currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2])) * this->scaleFactor;
-
-
-        //printf("  pVertices %f, %f, %f\n", pVertices[i][0], pVertices[i][1], pVertices[i][2]);
-        //printf("  list:     %f, %f, %f \n", verticesList[i][0], verticesList[i][1], verticesList[i][2]);      
       }
 }
@@ -715 +703 @@
   /* rotate because id software uses another orientation then the openGL default */
   /* \todo: rotate the axis already when loading... easy :) */
-  glRotatef(-90.0, 1.0, 0.0, 0.0);
-  glRotatef(-90.0, 0.0, 0.0, 1.0);
+  //glRotatef(-90.0, 1.0, 0.0, 0.0);
+  //glRotatef(-90.0, 0.0, 0.0, 1.0);
 
   this->renderFrame();

orxonox/branches/md2_loader/src/story_entities/world.cc

@@ -488 +488 @@
 
   WorldEntity* testEntity = new TestEntity();
-  testEntity->setRelCoor(Vector(570, 10, -15));
+  //testEntity->setRelCoor(Vector(570, 10, -15));
+  testEntity->setRelCoor(Vector(25, -10, -20));
   testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
   this->spawn(testEntity);
-  //this->localPlayer->addChild(testEntity);
+  this->localPlayer->addChild(testEntity);
 
 }