Changeset 8587 in orxonox.OLD

Timestamp:

Jun 19, 2006, 5:07:22 PM (18 years ago)

Author:

stefalie

Message:

water: refl- and refr.bmp aint needes anymore, thx bensch, only one lil problem: somehow the textures have an alpha value… but i a glDisable(GL_BLEND) it works fine

File:

• branches/water/src/world_entities/environments/mapped_water.cc (modified) (2 diffs)

branches/water/src/world_entities/environments/mapped_water.cc

@@ -35 +35 @@
     this->loadParams(root);
 
-
-this->textureSize = 512;
+  /// loads the textures
+  // sets parameters for the textures
+  this->textureSize = 512;
   unsigned int channels = 32;
   GLenum type = GL_RGBA;
-  /// loads the textures
   // set up refleciton texture
-  //Texture reflTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
-  //mat.setDiffuseMap(reflTex, 0);
-  mat.setDiffuseMap("pictures/refl.bmp", GL_TEXTURE_2D, 0);
+  Texture reflTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
+  mat.setDiffuseMap(reflTex, 0);
+  //mat.setDiffuseMap("pictures/refl.bmp", GL_TEXTURE_2D, 0);
   // load refraction texture
-  //Texture refrTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
-  //mat.setDiffuseMap(refrTex, 1);
-  mat.setDiffuseMap("pictures/refr.bmp", GL_TEXTURE_2D, 1);
+  Texture refrTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
+  mat.setDiffuseMap(refrTex, 1);
+  //mat.setDiffuseMap("pictures/refr.bmp", GL_TEXTURE_2D, 1);
   // load normal map
   mat.setDiffuseMap("pictures/normalmap.bmp", GL_TEXTURE_2D, 2);
@@ -194 +194 @@
   cam_uni->set(pos.x, pos.y, pos.z, 1.0f);
 
+  glDisable(GL_BLEND);
+
   glBegin(GL_QUADS);
   // The back left vertice for the water