Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8578 in orxonox.OLD for branches/bsp_model/src


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_data.cc

    r8573 r8578  
    360360  for( int i = 0; i < this->meshes[mesh]->header->textureNum; i++) {
    361361    PRINTF(0)(" texture file: %s\n", tex[i].fileName);
    362     this->meshes[mesh]->material[i].setDiffuseMap(tex[i].fileName);
     362    std::string path("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/");
     363    std::string path1(tex[i].fileName);
     364    std::string fullPath( path + path1);
     365    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/blue_torso.tga");
    363366    this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
    364367  }
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

    r8577 r8578  
    312312  void MD3Model::drawMesh(MD3Mesh* mesh, sVec3D* frame) const
    313313  {
    314     PRINTF(0)("\n\nMD3Model::drawMesh()\n");
    315314    glColor3f(1.0f, 1.0f, 1.0f);
    316315    glBegin( GL_TRIANGLES );
     
    322321    for( int t = 0; t < mesh->header->triangleNum; t++) {
    323322      // calc normal vector
    324       PRINTF(0)("offset %i, %i\n", mesh->triangles[t].vertexOffset[1], mesh->triangles[t].vertexOffset[0]);
    325       PRINTF(0)("vertex: %f\n", frame[ mesh->triangles[t].vertexOffset[1] ][0]);
    326 
    327323      tmpVec1.x = frame[mesh->triangles[t].vertexOffset[1]][0] - frame[mesh->triangles[t].vertexOffset[0]][0];
    328324      tmpVec2.x = frame[mesh->triangles[t].vertexOffset[2]][0] - frame[mesh->triangles[t].vertexOffset[0]][0];
     
    359355      glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[0]].textureCoord);
    360356      glVertex3f( frame[mesh->triangles[t].vertexOffset[0]][0],
    361                   frame[mesh->triangles[t].vertexOffset[0]][1],
    362                   frame[mesh->triangles[t].vertexOffset[0]][2]);
     357                  frame[mesh->triangles[t].vertexOffset[0]][2],
     358                  frame[mesh->triangles[t].vertexOffset[0]][1]);
    363359      glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[1]].textureCoord);
    364360      glVertex3f( frame[mesh->triangles[t].vertexOffset[1]][0],
    365                   frame[mesh->triangles[t].vertexOffset[1]][1],
    366                   frame[mesh->triangles[t].vertexOffset[1]][2]);
     361                  frame[mesh->triangles[t].vertexOffset[1]][2],
     362                  frame[mesh->triangles[t].vertexOffset[1]][1]);
    367363      glTexCoord2fv( mesh->texVecs[mesh->triangles[t].vertexOffset[2]].textureCoord);
    368364      glVertex3f( frame[mesh->triangles[t].vertexOffset[2]][0],
    369                   frame[mesh->triangles[t].vertexOffset[2]][1],
    370                   frame[mesh->triangles[t].vertexOffset[2]][2]);
     365                  frame[mesh->triangles[t].vertexOffset[2]][2],
     366                  frame[mesh->triangles[t].vertexOffset[2]][1]);
    371367    }
    372368
  • branches/bsp_model/src/world_entities/playable.cc

    r8511 r8578  
    6666  this->bDead = false;
    6767
    68   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
     68//   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
    6969
    7070  registerVar( new SynchronizeableInt( &score, &score, "score" ) );
Note: See TracChangeset for help on using the changeset viewer.