Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10420 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Jan 27, 2007, 11:38:50 PM (18 years ago)
Author:
patrick
Message:

maps ⇒ textures

Location:
trunk/src/world_entities
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/elements/glgui_energywidgetvertical.cc

    r10368 r10420  
    4646    this->_bar->setBackgroundTexture(Texture());
    4747    this->_bar->setBackgroundColor(Color(0,0,0,0));
    48     this->_bar->setForegroundTexture("maps/gui_element_background_faded.png");
     48    this->_bar->setForegroundTexture("textures/gui_element_background_faded.png");
    4949    this->_bar->setForegroundColor(Color::green);
    5050    this->_bar->setChangedValueColor(Color(1,0,0,0.2));
     
    6666    this->_image->setBackgroundColor(Color(1,1,1,0));
    6767    this->_image->setBackgroundTexture(Texture());
    68     this->_image->loadImageFromFile("maps/evil-flower.png");
     68    this->_image->loadImageFromFile("textures/evil-flower.png");
    6969    //this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
    7070    this->_image->setRelCoor2D(0,0);
  • trunk/src/world_entities/projectiles/acid_splash.cc

    r10368 r10420  
    6060  switch (rnd){
    6161    case 0:
    62       this->grid->setTexture( "maps/acid2.png");
     62      this->grid->setTexture( "textures/acid2.png");
    6363      break;
    6464    case 1:
    65       this->grid->setTexture( "maps/acid3.png");
     65      this->grid->setTexture( "textures/acid3.png");
    6666      break;
    6767    case 2:
    68       this->grid->setTexture( "maps/blub.png");
     68      this->grid->setTexture( "textures/blub.png");
    6969      break;
    7070    default:
    71       this->grid->setTexture( "maps/acid2.png");
     71      this->grid->setTexture( "textures/acid2.png");
    7272  }
    7373//   if (rand()/2 == 0) //!<Randomized Textrures
    74 //     this->grid->setTexture( "maps/acid3.png");
     74//     this->grid->setTexture( "textures/acid3.png");
    7575//   else
    76 //     this->grid->setTexture( "maps/blub.png");
     76//     this->grid->setTexture( "textures/blub.png");
    7777
    7878  this->grid->toList(OM_ENVIRON);
  • trunk/src/world_entities/projectiles/mbolt.cc

    r10368 r10420  
    7979  this->trail = new Trail(6, 4, .1, this);
    8080  //this->trail->setParent( this);
    81   this->trail->setTexture( "maps/laser.png");
     81  this->trail->setTexture( "textures/laser.png");
    8282  this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
    8383
  • trunk/src/world_entities/projectiles/swarm_projectile.cc

    r10415 r10420  
    6161  this->trail = new Trail(2.5,4,.2, this);
    6262  //this->trail->setParent( this);
    63   this->trail->setTexture( "maps/laser.png");
     63  this->trail->setTexture( "textures/laser.png");
    6464
    6565
     
    9696    SwarmProjectile::explosionParticles = new SpriteParticles(200);
    9797    SwarmProjectile::explosionParticles->setName("SwarmProjectileExplosionParticles");
    98     SwarmProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
     98    SwarmProjectile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
    9999    SwarmProjectile::explosionParticles->setLifeSpan(.5, .3);
    100100    SwarmProjectile::explosionParticles->setRadius(0.0, 10);
  • trunk/src/world_entities/space_ships/space_ship.cc

    r10412 r10420  
    384384  /// FIXME
    385385  this->trail = new Trail( 5, 10, .2, this);
    386   this->trail->setTexture( "maps/engine.png");
     386  this->trail->setTexture( "textures/engine.png");
    387387
    388388  this->trailL = new Trail( 5, 10, .2, this);
    389   this->trailL->setTexture( "maps/engine.png");
     389  this->trailL->setTexture( "textures/engine.png");
    390390
    391391  this->trailR = new Trail( 5, 10, .2, this);
    392   this->trailR->setTexture( "maps/engine.png");
     392  this->trailR->setTexture( "textures/engine.png");
    393393
    394394
     
    398398/*
    399399  this->test  = new Wobblegrid(5);
    400   test->setTexture("maps/blub.png");
     400  test->setTexture("textures/blub.png");
    401401
    402402  test->setAbsCoor( this->getAbsCoor() + Vector(0, 2, 0));
  • trunk/src/world_entities/test_entity2.cc

    r10368 r10420  
    8787  this->rotationSpeed = 3;
    8888
    89   this->material->setDiffuseMap("maps/TE2.tga");
     89  this->material->setDiffuseMap("textures/TE2.tga");
    9090
    9191}
Note: See TracChangeset for help on using the changeset viewer.