Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10191 in orxonox.OLD for branches


Ignore:
Timestamp:
Jan 8, 2007, 2:45:23 PM (18 years ago)
Author:
bknecht
Message:

converted all /maps/ to /textures/

Location:
branches/data_fix/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/data_fix/src/subprojects/importer/multitex.cc

    r6532 r10191  
    4747
    4848  testMat = new Material;
    49   testMat->setDiffuseMap("maps/radialTransparency.png");
     49  testMat->setDiffuseMap("textures/radialTransparency.png");
    5050  obj = new PrimitiveModel(PRIM_PLANE, 10.0);
    5151

  • branches/data_fix/src/world_entities/npcs/door.cc

    r10114 r10191  
    5555  this->bOpen = false;
    5656
    57   this->loadMD2Texture("maps/doors.jpg");
     57  this->loadMD2Texture("textures/doors.jpg");
    5858  this->loadModel("models/creatures/doors.md2", this->scale);
    5959

  • branches/data_fix/src/world_entities/npcs/gate.cc

    r10114 r10191  
    7474  this->bOpen = false;
    7575
    76   this->loadMD2Texture("maps/wheel.jpg");
     76  this->loadMD2Texture("textures/wheel.jpg");
    7777  this->loadModel("models/creatures/hypergate.md2", this->scale);
    7878

  • branches/data_fix/src/world_entities/npcs/repair_station.cc

    r10114 r10191  
    7676  this->animationCurrent = REPAIR_CYCLE01;
    7777
    78   this->loadMD2Texture("maps/repairstation.jpg");
     78  this->loadMD2Texture("textures/repairstation.jpg");
    7979  this->loadModel("models/creatures/repairstation.md2", this->scale);
    8080

  • branches/data_fix/src/world_entities/particles/model_particles.cc

    r10186 r10191  
    7070  this->registerObject(this, ModelParticles::_objectList);
    7171
    72   this->material.setDiffuseMap("maps/radial-trans-noise.png");
     72  this->material.setDiffuseMap("textures/radial-trans-noise.png");
    7373}
    7474

  • branches/data_fix/src/world_entities/projectiles/boomerang_projectile.cc

    r10114 r10191  
    8787    BoomerangProjectile::trailParticles = new SpriteParticles(2000);
    8888    BoomerangProjectile::trailParticles->setName("BoomerangProjectileTrailParticles");
    89     BoomerangProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
     89    BoomerangProjectile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
    9090    BoomerangProjectile::trailParticles->setLifeSpan(1.0, .3);
    9191    BoomerangProjectile::trailParticles->setRadius(0.0, .5);
    … …  
    102102    BoomerangProjectile::explosionParticles = new SpriteParticles(200);
    103103    BoomerangProjectile::explosionParticles->setName("BoomerangProjectileExplosionParticles");
    104     BoomerangProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
     104    BoomerangProjectile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
    105105    BoomerangProjectile::explosionParticles->setLifeSpan(.5, .3);
    106106    BoomerangProjectile::explosionParticles->setRadius(0.0, 10);

  • branches/data_fix/src/world_entities/projectiles/guided_missile.cc

    r10114 r10191  
    8686    GuidedMissile::trailParticles = new SpriteParticles(2000);
    8787    GuidedMissile::trailParticles->setName("GuidedMissileTrailParticles");
    88     GuidedMissile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
     88    GuidedMissile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
    8989    GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
    9090    GuidedMissile::trailParticles->setRadius(0.0, .5);
    … …  
    101101    GuidedMissile::explosionParticles = new SpriteParticles(200);
    102102    GuidedMissile::explosionParticles->setName("GuidedMissileExplosionParticles");
    103     GuidedMissile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
     103    GuidedMissile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
    104104    GuidedMissile::explosionParticles->setLifeSpan(.5, .3);
    105105    GuidedMissile::explosionParticles->setRadius(0.0, 10);

  • branches/data_fix/src/world_entities/projectiles/rocket.cc

    r10114 r10191  
    8080    Rocket::trailParticles = new SpriteParticles(2000);
    8181    Rocket::trailParticles->setName("RocketTrailParticles");
    82     Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
     82    Rocket::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
    8383    Rocket::trailParticles->setLifeSpan(1.0, .3);
    8484    Rocket::trailParticles->setRadius(0.0, .5);
    … …  
    9595    Rocket::explosionParticles = new SpriteParticles(200);
    9696    Rocket::explosionParticles->setName("RocketExplosionParticles");
    97     Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
     97    Rocket::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
    9898    Rocket::explosionParticles->setLifeSpan(.5, .3);
    9999    Rocket::explosionParticles->setRadius(0.0, 10);

  • branches/data_fix/src/world_entities/space_ships/collision_probe.cc

    r10114 r10191  
    6565
    6666  this->toList(OM_GROUP_00);
    67   this->loadMD2Texture("maps/dr_freak.pcx");
     67  this->loadMD2Texture("textures/dr_freak.pcx");
    6868  this->loadModel("models/dr_freak.md2");
    6969

  • branches/data_fix/src/world_entities/space_ships/cruizer.cc

    r10114 r10191  
    127127  this->burstSystem->addEmitter(this->burstEmitter);
    128128  this->burstSystem->setName("SpaceShip_Burst_System");
    129   ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
     129  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
    130130  this->burstSystem->setLifeSpan(1.0, .3);
    131131  this->burstSystem->setRadius(0.0, 1.5);

  • branches/data_fix/src/world_entities/space_ships/space_ship.cc

    r10114 r10191  
    225225  this->burstSystem->addEmitter(this->burstEmitter);
    226226  this->burstSystem->setName("SpaceShip_Burst_System");
    227   ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
     227  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
    228228  this->burstSystem->setLifeSpan(1.0, .3);
    229229  this->burstSystem->setRadius(0.0, 1.0);

  • branches/data_fix/src/world_entities/space_ships/spacecraft_2d.cc

    r10114 r10191  
    169169  this->burstSystem->addEmitter(this->burstEmitter);
    170170  this->burstSystem->setName("SpaceShip_Burst_System");
    171   ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
     171  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
    172172  this->burstSystem->setLifeSpan(1.0, .3);
    173173  this->burstSystem->setRadius(0.0, 1.5);

  • branches/data_fix/src/world_entities/space_ships/turbine_hover.cc

    r10114 r10191  
    167167  this->burstSystem->addEmitter(this->burstEmitter[1]);
    168168  this->burstSystem->setName("SpaceShip_Burst_System");
    169   ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
     169  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
    170170  this->burstSystem->setLifeSpan(1.0, .3);
    171171  this->burstSystem->setRadius(0.0, 1.5);
Note: See TracChangeset for help on using the changeset viewer.