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

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

Files:

• graphics/importer/bsp/bsp_file.cc (modified) (3 diffs)
• graphics/importer/md3/md3_data.cc (modified) (1 diff)
• graphics/render2D/image_plane.cc (modified) (1 diff)
• gui/gl/glgui_container.cc (modified) (1 diff)
• gui/gl/glgui_cursor.cc (modified) (1 diff)
• gui/gl/glgui_handler.cc (modified) (1 diff)
• gui/gl/glgui_widget.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);