Changeset 10420 in orxonox.OLD for trunk

Timestamp:

Jan 27, 2007, 11:38:50 PM (18 years ago)

Author:

patrick

Message:

maps ⇒ textures

Location:

trunk/src

Files:

• lib/network/monitor/network_stats_widget.cc (modified) (1 diff)
• util/hud.cc (modified) (1 diff)
• world_entities/elements/glgui_energywidgetvertical.cc (modified) (2 diffs)
• world_entities/projectiles/acid_splash.cc (modified) (1 diff)
• world_entities/projectiles/mbolt.cc (modified) (1 diff)
• world_entities/projectiles/swarm_projectile.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/test_entity2.cc (modified) (1 diff)

trunk/src/lib/network/monitor/network_stats_widget.cc

@@ -228 +228 @@
   this->_valueText.setChangedTextColor(Color::white);
 
-  //this->setBackgroundTexture("maps/gui_element_background_2.png");
+  //this->setBackgroundTexture("textures/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_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_element_background_faded.png");
   this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
   this->_bar.setChangedValueColor(Color::black);

trunk/src/util/hud.cc

@@ -541 +541 @@
   this->shipValuesBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
   //this->shipValuesBox->setWidgetSize(1000,500);
-  //this->shipValuesBox->setBackgroundTexture("maps/gui_container_background.png");
+  //this->shipValuesBox->setBackgroundTexture("textures/gui_container_background.png");
   this->shipValuesBox->setBackgroundTexture(Texture());
   this->shipValuesBox->setBackgroundColor(Color(0,0,1,0.5));

trunk/src/world_entities/elements/glgui_energywidgetvertical.cc

@@ -46 +46 @@
     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_element_background_faded.png");
     this->_bar->setForegroundColor(Color::green);
     this->_bar->setChangedValueColor(Color(1,0,0,0.2));
@@ -66 +66 @@
     this->_image->setBackgroundColor(Color(1,1,1,0));
     this->_image->setBackgroundTexture(Texture());
-    this->_image->loadImageFromFile("maps/evil-flower.png");
+    this->_image->loadImageFromFile("textures/evil-flower.png");
     //this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
     this->_image->setRelCoor2D(0,0);

trunk/src/world_entities/projectiles/acid_splash.cc

@@ -60 +60 @@
   switch (rnd){
     case 0:
-      this->grid->setTexture( "maps/acid2.png");
+      this->grid->setTexture( "textures/acid2.png");
       break;
     case 1:
-      this->grid->setTexture( "maps/acid3.png");
+      this->grid->setTexture( "textures/acid3.png");
       break;
     case 2:
-      this->grid->setTexture( "maps/blub.png");
+      this->grid->setTexture( "textures/blub.png");
       break;
     default:
-      this->grid->setTexture( "maps/acid2.png");
+      this->grid->setTexture( "textures/acid2.png");
   }
 //   if (rand()/2 == 0) //!<Randomized Textrures
-//     this->grid->setTexture( "maps/acid3.png");
+//     this->grid->setTexture( "textures/acid3.png");
 //   else
-//     this->grid->setTexture( "maps/blub.png");
+//     this->grid->setTexture( "textures/blub.png");
 
   this->grid->toList(OM_ENVIRON); 

trunk/src/world_entities/projectiles/mbolt.cc

@@ -79 +79 @@
   this->trail = new Trail(6, 4, .1, this);
   //this->trail->setParent( this);
-  this->trail->setTexture( "maps/laser.png");
+  this->trail->setTexture( "textures/laser.png");
   this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
 

trunk/src/world_entities/projectiles/swarm_projectile.cc

@@ -61 +61 @@
   this->trail = new Trail(2.5,4,.2, this);
   //this->trail->setParent( this);
-  this->trail->setTexture( "maps/laser.png");
+  this->trail->setTexture( "textures/laser.png");
 
 
@@ -96 +96 @@
     SwarmProjectile::explosionParticles = new SpriteParticles(200);
     SwarmProjectile::explosionParticles->setName("SwarmProjectileExplosionParticles");
-    SwarmProjectile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    SwarmProjectile::explosionParticles->setMaterialTexture("textures/radial-trans-noise.png");
     SwarmProjectile::explosionParticles->setLifeSpan(.5, .3);
     SwarmProjectile::explosionParticles->setRadius(0.0, 10);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -384 +384 @@
   /// FIXME
   this->trail = new Trail( 5, 10, .2, this);
-  this->trail->setTexture( "maps/engine.png");
+  this->trail->setTexture( "textures/engine.png");
 
   this->trailL = new Trail( 5, 10, .2, this);
-  this->trailL->setTexture( "maps/engine.png");
+  this->trailL->setTexture( "textures/engine.png");
 
   this->trailR = new Trail( 5, 10, .2, this);
-  this->trailR->setTexture( "maps/engine.png");
+  this->trailR->setTexture( "textures/engine.png");
 
 
@@ -398 +398 @@
 /*
   this->test  = new Wobblegrid(5);
-  test->setTexture("maps/blub.png");
+  test->setTexture("textures/blub.png");
 
   test->setAbsCoor( this->getAbsCoor() + Vector(0, 2, 0));

trunk/src/world_entities/test_entity2.cc

@@ -87 +87 @@
   this->rotationSpeed = 3;
 
-  this->material->setDiffuseMap("maps/TE2.tga");
+  this->material->setDiffuseMap("textures/TE2.tga");
 
 }