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

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

File:

• trunk/src/world_entities/environments/mapped_water.cc (modified) (1 diff)

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