Changeset 10317 in orxonox.OLD for trunk/src/lib/gui

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/lib/gui/gl

Files:

• glgui_container.cc (modified) (1 diff)
• glgui_cursor.cc (modified) (1 diff)
• glgui_handler.cc (modified) (1 diff)
• glgui_widget.cc (modified) (1 diff)

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