Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8590 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 19, 2006, 10:48:45 PM (18 years ago)
Author:
patrick
Message:

bsp: md3 integrated to the resource manager

Location:
branches/bsp_model/src
Files:
6 edited

Legend:

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

    r8579 r8590  
    374374    std::string path1(tex[i].fileName);
    375375    std::string fullPath( path + path1);
    376     this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/yuri.tga");
     376    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/creatures/gork/gorkup.tga");
    377377    this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
    378378  }
  • branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

    r8581 r8590  
    2727#include "quaternion.h"
    2828
     29#include "loading/resource_manager.h"
     30
    2931#include "debug.h"
    3032
     
    3739  MD3Model::MD3Model(std::string filename, float scaling)
    3840  {
    39 
    4041    this->autoAssemblePlayerModel(filename, scaling);
    4142
     
    7475  /**
    7576   * auto assemples a player model
     77   * @param filename is the name to the directory of the modelzzzzzz
    7678   */
    7779  void MD3Model::autoAssemblePlayerModel(std::string filename, float scaling)
    7880  {
    79     this->md3Data = new MD3Data(filename, filename, scaling);
     81//     this->md3Data = new MD3Data(filename, filename, scaling);
    8082//     MD3AnimationCfg cfg("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/models/players/alien3/animation.cfg");
     83
     84
     85    //first load the torso
     86    std::string name(filename + "/upper.md3");
     87    PRINTF(0)("data dir: %s\n", ResourceManager::getInstance()->getFullName(name).c_str());
     88
     89//     this->md3Data = new MD3Data(name, name, scaling);
     90    this->md3Data = (MD3Data*)ResourceManager::getInstance()->load(name, MD3, RP_GAME, name, scaling);
     91
    8192
    8293
  • branches/bsp_model/src/lib/util/loading/resource_manager.cc

    r8490 r8590  
    2828#include "primitive_model.h"
    2929#include "md2/md2Model.h"
     30#include "md3/md3_data.h"
    3031#endif /* NO_MODEL */
    3132#ifndef NO_TEXTURES
     
    201202  else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".md2", 4))
    202203    tmpType = MD2;
     204  else if (!strncmp(fileName.c_str()+(fileName.size()-4), ".md3", 4))
     205    tmpType = MD3;
    203206  else if (!strcasecmp(fileName.c_str(), "cube") ||
    204207            !strcasecmp(fileName.c_str(), "sphere") ||
     
    400403      }
    401404      break;
     405    case MD3:
     406      if(File(fullName).isFile())
     407      {
     408        PRINTF(0)("md3 load\n");
     409        tmpResource->param[0] = param0;
     410        tmpResource->param[1] = param1;
     411        tmpResource->pointer = new md3::MD3Data(fullName, tmpResource->param[0].getCString(), tmpResource->param[1].getFloat());
     412      }
     413      break;
    402414#endif /* NO_MODEL */
    403415#ifndef NO_TEXT
     
    624636            match = true;
    625637          break;
     638        case MD3:
     639          if (param0 == MT_NULL && ((*resource)->param[0] == "") && param1 == MT_NULL && ((*resource)->param[0] == 1.0f))
     640            match = true;
     641          else if ((*resource)->param[0] == ((MultiType)param0).getString() && (*resource)->param[1] == ((MultiType)param1).getFloat())
     642            match = true;
     643          break;
     644
    626645#endif /* NO_MODEL */
    627646#ifndef NO_TEXT
     
    863882    "PrimitiveModel",
    864883    "MD2-Data",
     884    "MD3-Data",
    865885#endif
    866886#ifndef NO_TEXT
  • branches/bsp_model/src/lib/util/loading/resource_manager.h

    r8330 r8590  
    3333  PRIM,                 //!< loading primitive model
    3434  MD2,                  //!< loading md2-file
     35  MD3,                  //!< loading md3-file
    3536#endif /* NO_MODEL */
    3637#ifndef NO_TEXT
  • branches/bsp_model/src/world_entities/npcs/generic_npc.cc

    r8516 r8590  
    127127 * @param coordinate: coordinate to go to
    128128 */
    129 bool GenericNPC::walkTo(const Vector& coordinate)
     129bool GenericNPC::walkTo(const Vector& coordinate, float time)
     130{
     131
     132  return true;
     133}
     134
     135
     136/**
     137 * walt to
     138 * @param coordinate: coordinate to go to
     139 */
     140bool GenericNPC::walkTo(float x, float y, float z, float time)
    130141{
    131142
  • branches/bsp_model/src/world_entities/world_entity.cc

    r8511 r8590  
    204204        this->buildObbTree(obbTreeDepth);
    205205    }
    206     else if(fileName.find(".md3") != std::string::npos)
     206    else /*if(fileName.find(".md3") != std::string::npos)*/
    207207    {
    208208      PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
Note: See TracChangeset for help on using the changeset viewer.