Changeset 7982 in orxonox.OLD for branches/water/src/world_entities

Timestamp:

May 30, 2006, 3:30:47 PM (18 years ago)

Author:

stefalie

Message:

branches/water: light!

Location:

branches/water/src/world_entities/environments

Files:

• mapped_water.cc (modified) (6 diffs)
• mapped_water.h (modified) (1 diff)

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

@@ -39 +39 @@
   mat.setDiffuseMap("pictures/dudvmap.bmp", GL_TEXTURE_2D, 0);
   // load refraction texture
-  mat.setDiffuseMap("pictures/sky-replace.jpg", 1);
+ // mat.setDiffuseMap("pictures/sky-replace.jpg", 1);
   // load normal map
   mat.setDiffuseMap("pictures/normalmap.bmp", GL_TEXTURE_2D, 2);
@@ -123 +123 @@
   // HACK
 
-  glDisable(GL_BLEND);
   //glActiveTexture(GL_TEXTURE0);
   //glBindTexture(GL_TEXTURE_2D, this->texture);
-
+  mat.unselect();
   mat.select();
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
+  //glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
 
 
@@ -134 +133 @@
   this->shader->activateShader();
   GLint uniform;
+  Shader::Uniform* uni;
 
   // Set the variable "reflection" to correspond to the first texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "reflection");
-  glUniform1iARB(uniform, 0); //second paramter is the texture unit
+  uni = new Shader::Uniform (shader, "reflection");
+  uni->set(0);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "reflection");
+  //glUniform1iARB(uniform, 0); //second paramter is the texture unit
 
   // Set the variable "refraction" to correspond to the second texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "refraction");
-  glUniform1iARB(uniform, 1);
+ // uni = new Shader::Uniform (shader, "refraction");
+ // uni->set(1);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "refraction");
+  //glUniform1iARB(uniform, 1);
 
   // Set the variable "normalMap" to correspond to the third texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "normalMap");
-  glUniform1iARB(uniform, 2);
+  uni = new Shader::Uniform (shader, "normalMap");
+  uni->set(2);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "normalMap");
+  //glUniform1iARB(uniform, 2);
 
   // Set the variable "dudvMap" to correspond to the fourth texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "dudvMap");
-  glUniform1iARB(uniform, 3);
+  uni = new Shader::Uniform (shader, "dudvMap");
+  uni->set(3);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "dudvMap");
+  //glUniform1iARB(uniform, 3);
 
   // Set the variable "depthMap" to correspond to the fifth texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "depthMap");
-  glUniform1iARB(uniform, 4);
+ // uni = new Shader::Uniform (shader, "depthMap");
+ // uni->set(4);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "depthMap");
+  //glUniform1iARB(uniform, 4);
   // FIXME we dont have a depthMap yet :-(
 
@@ -177 +187 @@
 
 
-  float move2 = this->move * this->kNormalMapScale;
-  float refrUV = this->g_WaterUV;
-  float normalUV = this->g_WaterUV * this->kNormalMapScale;
+
 
 
@@ -219 +227 @@
 
 
+  Material::unselect();
+
   glPopMatrix();
 }
@@ -225 +235 @@
 {
   this->move += this->g_WaterFlow = 0.004;
+  this->move2 = this->move * this->kNormalMapScale;
+  this->refrUV = this->g_WaterUV;
+  this->normalUV = this->g_WaterUV * this->kNormalMapScale;
 }
 

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

@@ -40 +40 @@
     float           kNormalMapScale;
     float           g_WaterFlow;
+    float           move2;
+    float           refrUV;
+    float           normalUV;
 
     int             textureSize;                //!< size of the texture