Changeset 8484 in orxonox.OLD for branches/water

Timestamp:

Jun 15, 2006, 5:26:56 PM (19 years ago)

Author:

stefalie

Message:

water: some more cleanup

Location:

branches/water/src

Files:

• lib/graphics/importer/material.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (4 diffs)
• world_entities/environments/mapped_water.h (modified) (1 diff)

branches/water/src/lib/graphics/importer/material.cc

@@ -352 +352 @@
   assert(textureNumber < this->textures.size());
 
-  // HACK
-  glActiveTexture(textureNumber);
-   glEnable(GL_TEXTURE_2D);
-   glBindTexture(GL_TEXTURE_2D, this->textures[textureNumber].getTexture());
+  glEnable(GL_TEXTURE_2D);
+  glBindTexture(GL_TEXTURE_2D, this->textures[textureNumber].getTexture());
   glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 

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

@@ -109 +109 @@
 
   /// initialization of the shaders
+  this->initShaders();
+
+  /// fog, doesnt work the way i want it to work
+  /*this->fog = new FogEffect();
+  fog->setFogColor(0.1f, 0.2f, 0.4f);
+  fog->setFogRange(0.0f, 500.0f);
+  fog->setFogDensity(0.03f);*/
+}
+
+/**
+ * @brief deltes shader and the uniform used by the camera
+ */
+MappedWater::~MappedWater()
+{
+  delete shader;
+  delete cam_uni;
+  //delete fog;
+}
+
+/**
+ * @brief initialization of the shaders
+ */
+void MappedWater::initShaders()
+{
   // load shader files
   shader = new Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
@@ -131 +155 @@
 
   this->shader->deactivateShader();
-
-  /// fog, doesnt work the way i want it to work
-  /*this->fog = new FogEffect();
-  fog->setFogColor(0.1f, 0.2f, 0.4f);
-  fog->setFogRange(0.0f, 500.0f);
-  fog->setFogDensity(0.03f);*/
-}
-
-/**
- * @brief deltes shader and the uniform used by the camera
- */
-MappedWater::~MappedWater()
-{
-  delete shader;
-  delete cam_uni;
-  //delete fog;
 }
 
@@ -299 +307 @@
   glCullFace(GL_BACK);
 
-  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);
+  mat.renderToTexture(0, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
 
   glPopMatrix();
@@ -356 +362 @@
   glCullFace(GL_BACK);
 
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));
-
   // Create the texture and store it on the video card
-  glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+  mat.renderToTexture(1, GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
 
   glPopMatrix();

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

@@ -48 +48 @@
 
   private:
+    void initShaders();
+
+  private:
     Vector              waterPos;                   //!< position of the water
     float               xWidth, zWidth;             //!< size of the water quad