Changeset 8241 in orxonox.OLD

Timestamp:

Jun 8, 2006, 1:58:58 PM (18 years ago)

Author:

stefalie

Message:

water: 3 of 4

Location:

branches/water/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (1 diff)

branches/water/src/story_entities/game_world.cc

@@ -135 +135 @@
   }
   imageSelector->showAll();
-  imageSelector->setAbsCoor2D(400, 30);
+  imageSelector->setAbsCoor2D(200, 30);
     OrxGui::GLGuiHandler::getInstance()->activateCursor();
 

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

@@ -79 +79 @@
   unsigned int* pTextureReflection = new unsigned int [this->textureSize * this->textureSize * channels];
   memset(pTextureReflection, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
-  mat.select();
+  //mat.select();
   glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
   glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureReflection);
-
-
+  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  
+  unsigned int* pTextureRefraction = new unsigned int [this->textureSize * this->textureSize * channels];
+  memset(pTextureRefraction, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
+  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));