Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10186 in orxonox.OLD


Ignore:
Timestamp:
Jan 7, 2007, 2:52:30 AM (17 years ago)
Author:
wenners
Message:

some paths changed

Location:
branches/data_fix/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/data_fix/src/lib/graphics/importer/md3/md3_data.cc

    r8724 r10186  
    425425    std::string path1(tex[i].fileName);
    426426    std::string fullPath( path + path1);
    427     this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "maps/creatures/gork/gorkup.tga");
     427    this->meshes[mesh]->material[i].setDiffuseMap(/*tex[i].fileName*/ /*fullPath.c_str()*/ "textures/creatures/gork/gorkup.tga");
    428428    this->meshes[mesh]->material[i].setAmbient(1, 1, 1);
    429429  }

  • branches/data_fix/src/world_entities/effects/explosion.cc

    r10114 r10186  
    7979    Explosion::explosionParticles = new SpriteParticles(5000);
    8080    Explosion::explosionParticles->setName("ExplosionExplosionParticles");
    81     Explosion::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
     81    Explosion::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
    8282    Explosion::explosionParticles->setLifeSpan(1.5, .3);
    8383    Explosion::explosionParticles->setRadius(0.0, 10);

  • branches/data_fix/src/world_entities/effects/lightning_bolt.cc

    r10114 r10186  
    4444
    4545  this->material = new Material();
    46   this->material->setDiffuseMap("maps/lightning_bolt.png");
     46  this->material->setDiffuseMap("textures/lightning_bolt.png");
    4747  //this->offset = Vector(-1440.00, 100.00, 280.00);
    4848
    … …  
    5858  this->soundSource.setSourceNode(this);
    5959
    60   this->thunderBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/thunder.wav");
     60  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/thunder.wav");
    6161}
    6262

  • branches/data_fix/src/world_entities/elements/glgui_energywidget.cc

    r9406 r10186  
    3737    this->_valueText.setChangedTextColor(Color::white);
    3838
    39     //this->setBackgroundTexture("maps/gui_element_background_2.png");
     39    //this->setBackgroundTexture("textures/gui/gui_element_background_2.png");
    4040    this->setBackgroundColor(Color(.5,.5,.5,1));
    4141
    4242    //this->_name.setBackgroundTexture(Texture());
    43     //this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
     43    //this->_valueText.setBackgroundTexture("textures/gui/gui_element_background_2.png");
    4444    this->_bar.setBackgroundTexture(Texture());
    4545    this->_bar.setBackgroundColor(Color(0,0,0,0));
    46     this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
     46    this->_bar.setForegroundTexture("textures/gui/gui_element_background_faded.png");
    4747    this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
    4848    this->_bar.setChangedValueColor(Color::black);

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

    r10114 r10186  
    6464  this->registerObject(this, DotParticles::_objectList);
    6565
    66   this->material.setDiffuseMap("maps/radial-trans-noise.png");
     66  this->material.setDiffuseMap("textures/radial-trans-noise.png");
    6767}
    6868

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

    r10114 r10186  
    3131
    3232SHELL_COMMAND(texture, ModelParticles, setMaterialTexture)
    33 ->defaultValues("maps/evil-flower.png");
     33->defaultValues("textures/evil-flower.png");
    3434
    3535

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

    r10114 r10186  
    3030
    3131SHELL_COMMAND(texture, SpriteParticles, setMaterialTexture)
    32     ->defaultValues("maps/evil-flower.png");
     32    ->defaultValues("textures/evil-flower.png");
    3333
    3434
    … …  
    6969  this->registerObject(this, SpriteParticles::_objectList);
    7070
    71   this->material.setDiffuseMap("maps/radial-trans-noise.png");
     71  this->material.setDiffuseMap("textures/radial-trans-noise.png");
    7272}
    7373

  • branches/data_fix/src/world_entities/weapons/aim.cc

    r9869 r10186  
    4343    this->loadParams(root);
    4444  else
    45     this->setTexture("maps/aim.png");
     45    this->setTexture("textures/aim.png");
    4646}
    4747

  • branches/data_fix/src/world_entities/weapons/crosshair.cc

    r9869 r10186  
    3737    this->loadParams(root);
    3838  else
    39     this->setTexture("maps/aim.png");
     39    this->setTexture("textures/aim.png");
    4040}
    4141

  • branches/data_fix/src/world_entities/weapons/fps_sniper_rifle.cc

    r10114 r10186  
    8484  this->material->setIllum(3);
    8585  this->material->setAmbient(1.0, 1.0, 1.0);
    86   this->material->setDiffuseMap("maps/rifle01tex.jpg");
     86  this->material->setDiffuseMap("textures/rifle01tex.jpg");
    8787
    8888  this->setStateDuration(WS_SHOOTING, .1);
    … …  
    9595  //this->minCharge = 2;
    9696
    97   this->setActionSound(WA_SHOOT, "sound/laser.wav");
    98   this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
     97  this->setActionSound(WA_SHOOT, "sounds/laser.wav");
     98  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
    9999
    100100

  • branches/data_fix/src/world_entities/weather_effects/lightning_effect.cc

    r10114 r10186  
    263263
    264264  if (this->thunderTextureA) {
    265     this->thunderBolt[0]->setTexture("maps/thunderbA1.png");
    266     this->thunderBolt[1]->setTexture("maps/thunderbA2.png");
    267     this->thunderBolt[2]->setTexture("maps/thunderbA3.png");
    268     this->thunderBolt[3]->setTexture("maps/thunderbA4.png");
     265    this->thunderBolt[0]->setTexture("textures/thunderbA1.png");
     266    this->thunderBolt[1]->setTexture("textures/thunderbA2.png");
     267    this->thunderBolt[2]->setTexture("textures/thunderbA3.png");
     268    this->thunderBolt[3]->setTexture("textures/thunderbA4.png");
    269269  }
    270270  else {
    271     this->thunderBolt[0]->setTexture("maps/thunderbB1.png");
    272     this->thunderBolt[1]->setTexture("maps/thunderbB2.png");
    273     this->thunderBolt[2]->setTexture("maps/thunderbB3.png");
    274     this->thunderBolt[3]->setTexture("maps/thunderbB4.png");
     271    this->thunderBolt[0]->setTexture("textures/thunderbB1.png");
     272    this->thunderBolt[1]->setTexture("textures/thunderbB2.png");
     273    this->thunderBolt[2]->setTexture("textures/thunderbB3.png");
     274    this->thunderBolt[3]->setTexture("textures/thunderbB4.png");
    275275  }
    276276

  • branches/data_fix/src/world_entities/weather_effects/snow_effect.cc

    r10114 r10186  
    107107  this->snowMove = false;
    108108  this->particles = 12000;
    109   this->texture = "maps/snow_flake_01_32x32.png";
     109  this->texture = "textures/snow_flake_01_32x32.png";
    110110  this->snowLife = 8;
    111111  this->randomLife = 2;
Note: See TracChangeset for help on using the changeset viewer.