Changeset 7816 in orxonox.OLD

Timestamp:

May 24, 2006, 4:56:48 PM (18 years ago)

Author:

stefalie

Message:

…

Location:

branches/water/src/world_entities/environments

Files:

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

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

@@ -26 +26 @@
 
 MappedWater::MappedWater(const TiXmlElement* root)
-    : texture(GL_TEXTURE_2D)
 {
   this->setClassID(CL_MAPPED_WATER, "MappedWater");
@@ -61 +60 @@
   mat.select();
   glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
-  printf("========= CREATE %d\n", this->texture.getTexture());
 
   // Create the texture and store it on the video card
@@ -120 +118 @@
 
 
-/*  // Shader init
+  // Shader init
   //this->shader->activateShader();
-  GLint uniform;
+  //GLint uniform;
 
   // 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
+  //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
@@ -138 +136 @@
 
   // Set the variable "dudvMap" to correspond to the fourth texture unit
-  uniform = glGetUniformLocationARB(shader->getProgram(), "dudvMap");
-  glUniform1iARB(uniform, 3);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "dudvMap");
+  //glUniform1iARB(uniform, 3);
 
   // Set the variable "depthMap" to correspond to the fifth texture unit
@@ -147 +145 @@
 
   // Give the variable "waterColor" a blue color
-  uniform = glGetUniformLocationARB(shader->getProgram(), "waterColor");
-  glUniform4fARB(uniform, 0.1f, 0.2f, 0.4f, 1.0f);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "waterColor");
+  //glUniform4fARB(uniform, 0.1f, 0.2f, 0.4f, 1.0f);
 
   // FIXME set camera and light information
@@ -155 +153 @@
   // Store the camera position in a variable
   //CVector3 vPosition = g_Camera.Position();
-  Vector vPosition(50.0f, 50.0f, 50.0f);
+  //Vector vPosition(50.0f, 50.0f, 50.0f);
 
   // Give the variable "lightPos" our hard coded light position
-  uniform = glGetUniformLocationARB(shader->getProgram(), "lightPos");
-  glUniform4fARB(uniform, lightPos.x, lightPos.y, lightPos.z, 1.0f);
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "lightPos");
+  //glUniform4fARB(uniform, lightPos.x, lightPos.y, lightPos.z, 1.0f);
 
   // Give the variable "cameraPos" our camera position
-  uniform = glGetUniformLocationARB(shader->getProgram(), "cameraPos");
-  glUniform4fARB(uniform, vPosition.x, vPosition.y, vPosition.z, 1.0f);
-*/
+  //uniform = glGetUniformLocationARB(shader->getProgram(), "cameraPos");
+  //glUniform4fARB(uniform, vPosition.x, vPosition.y, vPosition.z, 1.0f);
+
   glBegin(GL_QUADS);
   glNormal3f(0, 1, 0);
@@ -172 +170 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);
   glMultiTexCoord2f(GL_TEXTURE4, 0, 0);
-  glVertex3f(-500, 0, 500);
+  glVertex3f(0, 0, 0);
 
   glMultiTexCoord2f(GL_TEXTURE0, 1, 0);
@@ -179 +177 @@
   glMultiTexCoord2f(GL_TEXTURE3, 1, 0);
   glMultiTexCoord2f(GL_TEXTURE4, 1, 0);
-  glVertex3f(500, 0, 500);
+  glVertex3f(0, 0, 1000);
 
   glMultiTexCoord2f(GL_TEXTURE0, 1, 1);
@@ -186 +184 @@
   glMultiTexCoord2f(GL_TEXTURE3, 1, 1);
   glMultiTexCoord2f(GL_TEXTURE4, 1, 1);
-  glVertex3f(500, 0, -500);
+  glVertex3f(1000, 0, 1000);
 
   glMultiTexCoord2f(GL_TEXTURE0, 0, 1);
@@ -193 +191 @@
   glMultiTexCoord2f(GL_TEXTURE3, 0, 1);
   glMultiTexCoord2f(GL_TEXTURE4, 0, 1);
-  glVertex3f(-500, 0, -500);
+  glVertex3f(1000, 0, 0);
   glEnd();
-  //this->shader->deactivateShader();
+
+  this->shader->deactivateShader();
 
   glPopMatrix();
@@ -277 +276 @@
 
   glPopAttrib();
-  
 }
 

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

@@ -37 +37 @@
     Material        mat;
 
-    Texture         texture;
     int             textureSize;       //!< size of the texture
     Shader*         shader;