Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9656 in orxonox.OLD for trunk/src/world_entities/skybox.cc


Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/skybox.cc

    r9406 r9656  
    9696{
    9797  this->rebuild();
    98  
    99   textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName") );
    100   size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size" ) );
     98
     99  textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName", PERMISSION_MASTER_SERVER) );
     100  size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size", PERMISSION_MASTER_SERVER ) );
    101101}
    102102
     
    297297{
    298298  bool somethinChanged = false;
    299  
     299
    300300  if ( std::find( id.begin(), id.end(), textureName_handle ) != id.end() )
    301301  {
     
    303303    setTexture( textureName );
    304304  }
    305  
     305
    306306  if ( std::find( id.begin(), id.end(), size_handle ) != id.end() )
    307307  {
    308308    somethinChanged = true;
    309309  }
    310  
     310
    311311  rebuild();
    312  
     312
    313313  WorldEntity::varChangeHandler( id );
    314314}
Note: See TracChangeset for help on using the changeset viewer.