Changeset 10317 in orxonox.OLD for trunk/src/lib/graphics/importer/bsp/bsp_file.cc

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

File:

• trunk/src/lib/graphics/importer/bsp/bsp_file.cc (modified) (3 diffs)

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;