Changeset 10317 in orxonox.OLD

Timestamp:

Jan 24, 2007, 1:30:29 AM (17 years ago)

Author:

patrick

Message:

merged branche data-fix back to trunk. this breaks compatibility with the old data/trunk data repository! be sure to update your data trunk

Location:

trunk/src

Files:

• lib/graphics/importer/bsp/bsp_file.cc (modified) (3 diffs)
• lib/graphics/importer/md3/md3_data.cc (modified) (1 diff)
• lib/graphics/render2D/image_plane.cc (modified) (1 diff)
• lib/gui/gl/glgui_container.cc (modified) (1 diff)
• lib/gui/gl/glgui_cursor.cc (modified) (1 diff)
• lib/gui/gl/glgui_handler.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)
• subprojects/importer/multitex.cc (modified) (1 diff)
• world_entities/effects/explosion.cc (modified) (1 diff)
• world_entities/effects/lightning_bolt.cc (modified) (2 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (1 diff)
• world_entities/elements/glgui_radar.cc (modified) (1 diff)
• world_entities/elements/image_entity.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (1 diff)
• world_entities/npcs/door.cc (modified) (1 diff)
• world_entities/npcs/gate.cc (modified) (1 diff)
• world_entities/npcs/repair_station.cc (modified) (1 diff)
• world_entities/particles/dot_particles.cc (modified) (1 diff)
• world_entities/particles/model_particles.cc (modified) (2 diffs)
• world_entities/particles/sprite_particles.cc (modified) (2 diffs)
• world_entities/projectiles/boomerang_projectile.cc (modified) (2 diffs)
• world_entities/projectiles/guided_missile.cc (modified) (2 diffs)
• world_entities/projectiles/rocket.cc (modified) (2 diffs)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/space_ships/collision_probe.cc (modified) (1 diff)
• world_entities/space_ships/cruizer.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (1 diff)
• world_entities/weapons/aim.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)
• world_entities/weapons/fps_sniper_rifle.cc (modified) (2 diffs)
• world_entities/weather_effects/lightning_effect.cc (modified) (1 diff)
• world_entities/weather_effects/snow_effect.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/bsp/bsp_file.cc

@@ -426 +426 @@
 {
   ::std::string absFileName;
-  char* baseName = "/worlds/bsp/";
+  char* baseName = "/textures/";
 
   char fileName [500];
@@ -448 +448 @@
     //this->Materials[i]->setShininess(100.0);
    // this->Materials[i].mat->setTransparency(1.0);
-    this->Materials[i].mat->setDiffuseMap("pictures/ground.tga");
-    this->Materials[i].mat->setAmbientMap("pictures/ground.tga");
-    this->Materials[i].mat->setSpecularMap("pictures/ground.tga");
+    this->Materials[i].mat->setDiffuseMap("textures/ground.tga");
+    this->Materials[i].mat->setAmbientMap("textures/ground.tga");
+    this->Materials[i].mat->setSpecularMap("textures/ground.tga");
     this->Materials[i].alpha = false;
     this->Materials[i].animated = false;
@@ -595 +595 @@
     //this->Materials[i]->setShininess(100.0);
     //this->Materials[i].mat->setTransparency(1.0);
-    this->Materials[i].mat->setDiffuseMap("pictures/error_texture.png");
-    this->Materials[i].mat->setAmbientMap("pictures/error_texture.png");
-    this->Materials[i].mat->setSpecularMap("pictures/error_texture.png");
+    this->Materials[i].mat->setDiffuseMap("textures/error_texture.png");
+    this->Materials[i].mat->setAmbientMap("textures/error_texture.png");
+    this->Materials[i].mat->setSpecularMap("textures/error_texture.png");
     this->Materials[i].alpha = true;
     this->Materials[i].animated = false;

trunk/src/lib/graphics/importer/md3/md3_data.cc

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

trunk/src/lib/graphics/render2D/image_plane.cc

@@ -59 +59 @@
 
   //this->setBindNode(this);
-  this->setTexture("pictures/error_texture.png");
+  this->setTexture("textures/error_texture.png");
 }
 

trunk/src/lib/gui/gl/glgui_container.cc

@@ -43 +43 @@
     this->registerObject(this, GLGuiContainer::_objectList);
 
-    this->setBackgroundTexture("gui_container_background.png");
+    this->setBackgroundTexture("textures/gui/gui_container_background.png");
 
   }

trunk/src/lib/gui/gl/glgui_cursor.cc

@@ -58 +58 @@
 
     this->setBackgroundColor(Color(1.0, 1.0, 1.0, 1.0));
-    this->setBackgroundTexture("cursor.png");
+    this->setBackgroundTexture("textures/menu/cursor.png");
     this->setSize2D(50, 50);
     this->setAbsCoor2D(100, 100);

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -77 +77 @@
     this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
 
-    _cursor->loadTextureSequence(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
+    _cursor->loadTextureSequence(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/" + "textures/reap_mouse/reap_mouse_##.png", 1, 49);
 
   }

trunk/src/lib/gui/gl/glgui_widget.cc

@@ -127 +127 @@
 
     this->setBorderLeft(15);
-    this->setBackgroundTexture("gui_element_background.png");
+    this->setBackgroundTexture("textures/gui/gui_element_background.png");
 
     this->switchState(_state);

trunk/src/orxonox.cc

@@ -257 +257 @@
   GraphicsEngine::getInstance()->initFromPreferences();
 
-  std::string iconName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath("pictures/fighter-top-32x32.bmp");
+  std::string iconName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath("textures/fighter-top-32x32.bmp");
   if (!iconName.empty())
   {
@@ -365 +365 @@
 
   //! @todo this is a hack and should be loadable
-  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
-  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
-
-  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sound");
+  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "textures");
+  //Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
+
+  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sounds");
   Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "music");
 
@@ -410 +410 @@
 
   if( this->port != -1)
-    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
+    this->gameLoader->loadNetworkCampaign("levels/DefaultNetworkCampaign.oxc");
   else
-    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");                       /* start orxonox in single player mode */
+    this->gameLoader->loadCampaign("levels/DefaultCampaign.oxc");                       /* start orxonox in single player mode */
 
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);

trunk/src/story_entities/game_world_data.cc

@@ -160 +160 @@
     PRINTF(2)("no LoadScreen specified, loading default\n");
 
-    glmis->setBackgroundImage("pictures/load_screen.jpg");
+    glmis->setBackgroundImage("textures/load_screens/default.jpg");
     this->glmis->setMaximum(8);
     //     this->glmis->draw();

trunk/src/subprojects/importer/multitex.cc

@@ -47 +47 @@
 
   testMat = new Material;
-  testMat->setDiffuseMap("maps/radialTransparency.png");
+  testMat->setDiffuseMap("textures/radialTransparency.png");
   obj = new PrimitiveModel(PRIM_PLANE, 10.0);
 

trunk/src/world_entities/effects/explosion.cc

@@ -79 +79 @@
     Explosion::explosionParticles = new SpriteParticles(5000);
     Explosion::explosionParticles->setName("ExplosionExplosionParticles");
-    Explosion::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Explosion::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     Explosion::explosionParticles->setLifeSpan(1.5, .3);
     Explosion::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/effects/lightning_bolt.cc

@@ -44 +44 @@
 
   this->material = new Material();
-  this->material->setDiffuseMap("maps/lightning_bolt.png");
+  this->material->setDiffuseMap("textures/lightning_bolt.png");
   //this->offset = Vector(-1440.00, 100.00, 280.00);
 
@@ -58 +58 @@
   this->soundSource.setSourceNode(this);
 
-  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/thunder.wav");
+  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/thunder.wav");
 }
 

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -37 +37 @@
     this->_valueText.setChangedTextColor(Color::white);
 
-    //this->setBackgroundTexture("maps/gui_element_background_2.png");
+    //this->setBackgroundTexture("textures/gui/gui_element_background_2.png");
     this->setBackgroundColor(Color(.5,.5,.5,1));
 
     //this->_name.setBackgroundTexture(Texture());
-    //this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
+    //this->_valueText.setBackgroundTexture("textures/gui/gui_element_background_2.png");
     this->_bar.setBackgroundTexture(Texture());
     this->_bar.setBackgroundColor(Color(0,0,0,0));
-    this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
+    this->_bar.setForegroundTexture("textures/gui/gui_element_background_faded.png");
     this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
     this->_bar.setChangedValueColor(Color::black);

trunk/src/world_entities/elements/glgui_radar.cc

@@ -40 +40 @@
   void GLGuiRadar::init()
   {
-    this->setBackgroundTexture("gui_radar.png");
+    this->setBackgroundTexture("textures/gui/gui_radar.png");
 
     this->_updateInterval = .01f;

trunk/src/world_entities/elements/image_entity.cc

@@ -70 +70 @@
   this->setBindNode(this);
   this->material = new Material;
-  this->setTexture("pictures/error_texture.png");
+  this->setTexture("textures/error_texture.png");
   this->bBillboarding = false;
 }

trunk/src/world_entities/environments/mapped_water.cc

@@ -162 +162 @@
   mat.setDiffuseMap(refrTex, 1);
   // load normal map
-  mat.setDiffuseMap("pictures/water_normalmap.bmp", GL_TEXTURE_2D, 2);
+  mat.setDiffuseMap("textures/water_normalmap.bmp", GL_TEXTURE_2D, 2);
   // load dudv map
-  mat.setDiffuseMap("pictures/water_dudvmap.bmp", GL_TEXTURE_2D, 3);
+  mat.setDiffuseMap("textures/water_dudvmap.bmp", GL_TEXTURE_2D, 3);
 
   // sets texture parameters for reflection texture

trunk/src/world_entities/npcs/door.cc

@@ -55 +55 @@
   this->bOpen = false;
 
-  this->loadMD2Texture("maps/doors.jpg");
+  this->loadMD2Texture("textures/doors.jpg");
   this->loadModel("models/creatures/doors.md2", this->scale);
 

trunk/src/world_entities/npcs/gate.cc

@@ -74 +74 @@
   this->bOpen = false;
 
-  this->loadMD2Texture("maps/wheel.jpg");
+  this->loadMD2Texture("textures/wheel.jpg");
   this->loadModel("models/creatures/hypergate.md2", this->scale);
 

trunk/src/world_entities/npcs/repair_station.cc

@@ -76 +76 @@
   this->animationCurrent = REPAIR_CYCLE01;
 
-  this->loadMD2Texture("maps/repairstation.jpg");
+  this->loadMD2Texture("textures/repairstation.jpg");
   this->loadModel("models/creatures/repairstation.md2", this->scale);
 

trunk/src/world_entities/particles/dot_particles.cc

@@ -64 +64 @@
   this->registerObject(this, DotParticles::_objectList);
 
-  this->material.setDiffuseMap("maps/radial-trans-noise.png");
+  this->material.setDiffuseMap("textures/radial-trans-noise.png");
 }
 

trunk/src/world_entities/particles/model_particles.cc

@@ -31 +31 @@
 
 SHELL_COMMAND(texture, ModelParticles, setMaterialTexture)
-->defaultValues("maps/evil-flower.png");
+->defaultValues("textures/evil-flower.png");
 
 
@@ -70 +70 @@
   this->registerObject(this, ModelParticles::_objectList);
 
-  this->material.setDiffuseMap("maps/radial-trans-noise.png");
+  this->material.setDiffuseMap("textures/radial-trans-noise.png");
 }
 

trunk/src/world_entities/particles/sprite_particles.cc

@@ -30 +30 @@
 
 SHELL_COMMAND(texture, SpriteParticles, setMaterialTexture)
-    ->defaultValues("maps/evil-flower.png");
+    ->defaultValues("textures/evil-flower.png");
 
 
@@ -69 +69 @@
   this->registerObject(this, SpriteParticles::_objectList);
 
-  this->material.setDiffuseMap("maps/radial-trans-noise.png");
+  this->material.setDiffuseMap("textures/radial-trans-noise.png");
 }
 

trunk/src/world_entities/projectiles/boomerang_projectile.cc

@@ -87 +87 @@
     BoomerangProjectile::trailParticles = new SpriteParticles(2000);
     BoomerangProjectile::trailParticles->setName("BoomerangProjectileTrailParticles");
-    BoomerangProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     BoomerangProjectile::trailParticles->setLifeSpan(1.0, .3);
     BoomerangProjectile::trailParticles->setRadius(0.0, .5);
@@ -102 +102 @@
     BoomerangProjectile::explosionParticles = new SpriteParticles(200);
     BoomerangProjectile::explosionParticles->setName("BoomerangProjectileExplosionParticles");
-    BoomerangProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    BoomerangProjectile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     BoomerangProjectile::explosionParticles->setLifeSpan(.5, .3);
     BoomerangProjectile::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -86 +86 @@
     GuidedMissile::trailParticles = new SpriteParticles(2000);
     GuidedMissile::trailParticles->setName("GuidedMissileTrailParticles");
-    GuidedMissile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    GuidedMissile::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     GuidedMissile::trailParticles->setLifeSpan(1.0, .3);
     GuidedMissile::trailParticles->setRadius(0.0, .5);
@@ -101 +101 @@
     GuidedMissile::explosionParticles = new SpriteParticles(200);
     GuidedMissile::explosionParticles->setName("GuidedMissileExplosionParticles");
-    GuidedMissile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    GuidedMissile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     GuidedMissile::explosionParticles->setLifeSpan(.5, .3);
     GuidedMissile::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/projectiles/rocket.cc

@@ -80 +80 @@
     Rocket::trailParticles = new SpriteParticles(2000);
     Rocket::trailParticles->setName("RocketTrailParticles");
-    Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Rocket::trailParticles->setMaterialTexture("textures/radial-trans-noise.png");
     Rocket::trailParticles->setLifeSpan(1.0, .3);
     Rocket::trailParticles->setRadius(0.0, .5);
@@ -95 +95 @@
     Rocket::explosionParticles = new SpriteParticles(200);
     Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Rocket::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     Rocket::explosionParticles->setLifeSpan(.5, .3);
     Rocket::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/skysphere.cc

@@ -43 +43 @@
   this->toList(OM_BACKGROUND);
   if (fileName == NULL)
-    this->initialize("pictures/sky-replace.jpg");
+    this->initialize("textures/sky-replace.jpg");
   else
     this->initialize(fileName);

trunk/src/world_entities/space_ships/collision_probe.cc

@@ -65 +65 @@
 
   this->toList(OM_GROUP_00);
-  this->loadMD2Texture("maps/dr_freak.pcx");
+  this->loadMD2Texture("textures/dr_freak.pcx");
   this->loadModel("models/dr_freak.md2");
 

trunk/src/world_entities/space_ships/cruizer.cc

@@ -127 +127 @@
   this->burstSystem->addEmitter(this->burstEmitter);
   this->burstSystem->setName("SpaceShip_Burst_System");
-  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
+  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
   this->burstSystem->setLifeSpan(1.0, .3);
   this->burstSystem->setRadius(0.0, 1.5);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -225 +225 @@
   this->burstSystem->addEmitter(this->burstEmitter);
   this->burstSystem->setName("SpaceShip_Burst_System");
-  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
+  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
   this->burstSystem->setLifeSpan(1.0, .3);
   this->burstSystem->setRadius(0.0, 1.0);

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -169 +169 @@
   this->burstSystem->addEmitter(this->burstEmitter);
   this->burstSystem->setName("SpaceShip_Burst_System");
-  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
+  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
   this->burstSystem->setLifeSpan(1.0, .3);
   this->burstSystem->setRadius(0.0, 1.5);

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -167 +167 @@
   this->burstSystem->addEmitter(this->burstEmitter[1]);
   this->burstSystem->setName("SpaceShip_Burst_System");
-  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
+  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("textures/radial-trans-noise.png");
   this->burstSystem->setLifeSpan(1.0, .3);
   this->burstSystem->setRadius(0.0, 1.5);

trunk/src/world_entities/weapons/aim.cc

@@ -43 +43 @@
     this->loadParams(root);
   else
-    this->setTexture("maps/aim.png");
+    this->setTexture("textures/aim.png");
 }
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -37 +37 @@
     this->loadParams(root);
   else
-    this->setTexture("maps/aim.png");
+    this->setTexture("textures/aim.png");
 }
 

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -84 +84 @@
   this->material->setIllum(3);
   this->material->setAmbient(1.0, 1.0, 1.0);
-  this->material->setDiffuseMap("maps/rifle01tex.jpg");
+  this->material->setDiffuseMap("textures/rifle01tex.jpg");
 
   this->setStateDuration(WS_SHOOTING, .1);
@@ -95 +95 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_SHOOT, "sounds/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
 
 

trunk/src/world_entities/weather_effects/lightning_effect.cc

@@ -263 +263 @@
 
   if (this->thunderTextureA) {
-    this->thunderBolt[0]->setTexture("maps/thunderbA1.png");
-    this->thunderBolt[1]->setTexture("maps/thunderbA2.png");
-    this->thunderBolt[2]->setTexture("maps/thunderbA3.png");
-    this->thunderBolt[3]->setTexture("maps/thunderbA4.png");
+    this->thunderBolt[0]->setTexture("textures/thunderbA1.png");
+    this->thunderBolt[1]->setTexture("textures/thunderbA2.png");
+    this->thunderBolt[2]->setTexture("textures/thunderbA3.png");
+    this->thunderBolt[3]->setTexture("textures/thunderbA4.png");
   }
   else {
-    this->thunderBolt[0]->setTexture("maps/thunderbB1.png");
-    this->thunderBolt[1]->setTexture("maps/thunderbB2.png");
-    this->thunderBolt[2]->setTexture("maps/thunderbB3.png");
-    this->thunderBolt[3]->setTexture("maps/thunderbB4.png");
+    this->thunderBolt[0]->setTexture("textures/thunderbB1.png");
+    this->thunderBolt[1]->setTexture("textures/thunderbB2.png");
+    this->thunderBolt[2]->setTexture("textures/thunderbB3.png");
+    this->thunderBolt[3]->setTexture("textures/thunderbB4.png");
   }
 

trunk/src/world_entities/weather_effects/snow_effect.cc

@@ -107 +107 @@
   this->snowMove = false;
   this->particles = 12000;
-  this->texture = "maps/snow_flake_01_32x32.png";
+  this->texture = "textures/snow_flake_01_32x32.png";
   this->snowLife = 8;
   this->randomLife = 2;