Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9119 in orxonox.OLD for branches/presentation


Ignore:
Timestamp:
Jul 4, 2006, 1:35:11 PM (18 years ago)
Author:
rennerc
Message:

added scling for playables

Location:
branches/presentation/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/lib/network/network_game_manager.cc

    r9117 r9119  
    112112  playable.loadMD2Texture( playableTexture );
    113113 
    114   playable.loadModel( playableModel, playableScale );
     114  playable.loadModel( playableModel, 100.0f );
    115115  playable.setOwner( userId );
    116116  playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
  • branches/presentation/src/util/multiplayer_team_deathmatch.cc

    r9117 r9119  
    456456  std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
    457457  std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
     458  float       playableScale = getPlayableScale( userId, stats.getPreferedTeamId(), playableClassId );
    458459
    459460  BaseObject * bo = Factory::fabricate( playableClassId );
     
    464465  Playable & playable = *(dynamic_cast<Playable*>(bo));
    465466
    466   if ( playableTexture != "" )
    467     playable.loadMD2Texture( playableTexture );
    468   if ( playableModel != "" )
    469     playable.loadModel( playableModel );
     467  playable.loadMD2Texture( playableTexture );
     468  playable.loadModel( playableModel, playableScale );
    470469  playable.setOwner( userId );
    471470  playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
  • branches/presentation/src/world_entities/world_entity.cc

    r9110 r9119  
    156156  this->modelLODName = fileName;
    157157  this->scaling = scaling;
     158 
     159  if ( isA( CL_FPS_PLAYER ) )
     160    PRINTF(0)("\n\n\n\n\n\n\n\n\n\n%f\n\n\n\n\n\n\n\n\n\n", scaling);
    158161
    159162  std::string name = fileName;
Note: See TracChangeset for help on using the changeset viewer.