Changeset 8235 in orxonox.OLD

Timestamp:

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

Author:

stefalie

Message:

water: hack… but now i got 3 of the 4 needed textures

Location:

branches/water/src

Files:

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

branches/water/src/story_entities/game_world.cc

@@ -132 +132 @@
 
     imageSelector->pack(slider);
-    slider->setValue(getImage("/home/stefalie/svn/orxonox/data/trunk/pictures/dudvmap.bmp"));
+    slider->setValue(getImage("/home/stefalie/svn/orxonox/data/trunk/pictures/refl.bmp"));
   }
   imageSelector->showAll();

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

@@ -40 +40 @@
   // set up refleciton texture
   //mat.setDiffuseMap(this->texture, 0);
-  mat.setDiffuseMap("pictures/refl.jpg", GL_TEXTURE_2D, 0);
+  mat.setDiffuseMap("pictures/refl.bmp", GL_TEXTURE_2D, 0);
   // load refraction texture
-  mat.setDiffuseMap("pictures/refr.jpg", GL_TEXTURE_2D, 1);
+  mat.setDiffuseMap("pictures/refr.bmp", GL_TEXTURE_2D, 1);
   // load normal map
   mat.setDiffuseMap("pictures/normalmap.bmp", GL_TEXTURE_2D, 2);
@@ -74 +74 @@
   //glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));
   //glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureRefraction);
+
+  unsigned int channels = 32;
+  GLenum type = GL_RGBA;
+  unsigned int* pTextureReflection = new unsigned int [this->textureSize * this->textureSize * channels];
+  memset(pTextureReflection, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
+  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);
+
+
+
 
   // Set the texture quality
@@ -252 +263 @@
 
   mat.select();
-  //glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
-  mat.renderToTexture(0, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
-
+  /////glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+  ///mat.renderToTexture(0, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+  ///
+
+  mat.select();
+  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
+
+  // Create the texture and store it on the video card
+  glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+  
+  
+  ///
   glPopMatrix();
   glPopAttrib();
@@ -301 +321 @@
 
   mat.select();
-  mat.renderToTexture(1, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+  //mat.renderToTexture(1, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
   //glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 0, 0, textureSize, textureSize, 0);
   //mat.renderToTexture(0, GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 0, textureSize, textureSize, 0);