Changeset 10317 in orxonox.OLD for trunk/src/world_entities/elements

Timestamp:

Jan 24, 2007, 1:30:29 AM (18 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/world_entities/elements

Files:

• glgui_energywidget.cc (modified) (1 diff)
• glgui_radar.cc (modified) (1 diff)
• image_entity.cc (modified) (1 diff)

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;
 }