Changeset 10190 in orxonox.OLD

Timestamp:

Jan 8, 2007, 11:34:37 AM (17 years ago)

Author:

bknecht

Message:

changed all /pictures/ to /textures/

Location:

branches/data_fix/src

Files:

• lib/graphics/importer/bsp/bsp_file.cc (modified) (2 diffs)
• lib/graphics/render2D/image_plane.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)

branches/data_fix/src/lib/graphics/importer/bsp/bsp_file.cc

@@ -449 +449 @@
     //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;
@@ -596 +596 @@
     //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;

branches/data_fix/src/lib/graphics/render2D/image_plane.cc

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

branches/data_fix/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())
   {

branches/data_fix/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();

branches/data_fix/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

branches/data_fix/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);