Changeset 8578 in orxonox.OLD

Timestamp:

Jun 18, 2006, 11:45:58 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 model: turned the axis because q3 uses other axis

Location:

branches/bsp_model/src

Files:

• lib/graphics/importer/md3/md3_data.cc (modified) (1 diff)
• lib/graphics/importer/md3/md3_model.cc (modified) (3 diffs)
• world_entities/playable.cc (modified) (1 diff)

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

@@ -360 +360 @@
   for( int i = 0; i < this->meshes[mesh]->header->textureNum; i++) {
     PRINTF(0)(" texture file: %s\n", tex[i].fileName);
-    this->meshes[mesh]->material[i].setDiffuseMap(tex[i].fileName);
+    std::string path("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/");
+    std::string path1(tex[i].fileName);
+    std::string fullPath( path + path1);
+    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/blue_torso.tga");
     this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
   }

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

@@ -312 +312 @@
   void MD3Model::drawMesh(MD3Mesh* mesh, sVec3D* frame) const
   {
-    PRINTF(0)("\n\nMD3Model::drawMesh()\n");
     glColor3f(1.0f, 1.0f, 1.0f);
     glBegin( GL_TRIANGLES );
@@ -322 +321 @@
     for( int t = 0; t < mesh->header->triangleNum; t++) {
       // calc normal vector
-      PRINTF(0)("offset %i, %i\n", mesh->triangles[t].vertexOffset[1], mesh->triangles[t].vertexOffset[0]);
-      PRINTF(0)("vertex: %f\n", frame[ mesh->triangles[t].vertexOffset[1] ][0]);
-
       tmpVec1.x = frame[mesh->triangles[t].vertexOffset[1]][0] - frame[mesh->triangles[t].vertexOffset[0]][0];
       tmpVec2.x = frame[mesh->triangles[t].vertexOffset[2]][0] - frame[mesh->triangles[t].vertexOffset[0]][0];
@@ -359 +355 @@
       glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[0]].textureCoord);
       glVertex3f( frame[mesh->triangles[t].vertexOffset[0]][0],
-                  frame[mesh->triangles[t].vertexOffset[0]][1],
-                  frame[mesh->triangles[t].vertexOffset[0]][2]);
+                  frame[mesh->triangles[t].vertexOffset[0]][2],
+                  frame[mesh->triangles[t].vertexOffset[0]][1]);
       glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[1]].textureCoord);
       glVertex3f( frame[mesh->triangles[t].vertexOffset[1]][0],
-                  frame[mesh->triangles[t].vertexOffset[1]][1],
-                  frame[mesh->triangles[t].vertexOffset[1]][2]);
+                  frame[mesh->triangles[t].vertexOffset[1]][2],
+                  frame[mesh->triangles[t].vertexOffset[1]][1]);
       glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[2]].textureCoord);
       glVertex3f( frame[mesh->triangles[t].vertexOffset[2]][0],
-                  frame[mesh->triangles[t].vertexOffset[2]][1],
-                  frame[mesh->triangles[t].vertexOffset[2]][2]);
+                  frame[mesh->triangles[t].vertexOffset[2]][2],
+                  frame[mesh->triangles[t].vertexOffset[2]][1]);
     }
 

branches/bsp_model/src/world_entities/playable.cc

@@ -66 +66 @@
   this->bDead = false;
 
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
+//   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );