Changeset 7814 in orxonox.OLD

Timestamp:

May 24, 2006, 4:39:32 PM (18 years ago)

Author:

stefalie

Message:

branches/water: textures works now, but its at the wrong place

Location:

branches/water/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• util/object_manager.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (10 diffs)
• world_entities/skybox.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

branches/water/src/story_entities/game_world.cc

@@ -497 +497 @@
       LightManager::getInstance()->draw();
       // draw everything to be included in the reflection
-      for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-        this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      this->drawEntityList(State::getObjectManager()->getReflectionList());
+//       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+//         this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
 
       // clean up from reflection rendering

branches/water/src/util/object_manager.cc

@@ -65 +65 @@
       delete this->objectLists[i].front();
 
-  // delete reflectin list
-  while( !this->reflectionList.empty())
-    delete this->reflectionList.front();
+  // delete reflection list
+  this->reflectionList.clear();
 }
 

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

@@ -34 +34 @@
     this->loadParams(root);
 
-  //! HACK FIXME HACK FIXME HACK FIXME HACK FIXME
   //! todo: rename texture to reflection texture
   // set up refleciton texture
-  //mat.setDiffuseMap(&this->texture, 0);
+  // FIXME mat.setDiffuseMap(this->texture, 0); doesnt work,
   mat.setDiffuseMap("pictures/dudvmap.bmp", GL_TEXTURE_2D, 0);
-/*  mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 1);
-  mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 2);
-  mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 3);
-  mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 4);*/
   // load refraction texture
   //mat.setDiffuseMap(&this->refractionTexture, 1);
@@ -71 +66 @@
   glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTexture);
 
+  //gluBuild2DMipmaps(GL_TEXTURE_2D, channels, this->textureSize, this->textureSize, type,  GL_UNSIGNED_INT, pTexture);
+
   // Set the texture quality
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
@@ -80 +77 @@
   delete [] pTexture;
 
-  //  shader = new Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
+
+  //shader = new Shader( "/home/stefalie/svn/orxonox/data/trunk/shaders/water.vert", "/home/stefalie/svn/orxonox/data/trunk/shaders/mapped_water.frag");
+  shader = new Shader( ResourceManager::getInstance()->getDataDir() + "/shaders/mapped_water.vert", ResourceManager::getInstance()->getDataDir() +"/shaders/mapped_water.frag");
 }
 
@@ -101 +100 @@
   glTranslatef(0,this->waterHeight,0);
 
+  //HACK
+  glTranslatef(550,0,100);
   //glEnable(GL_LIGHTING);
 
@@ -111 +112 @@
   // HACK
 
-  //glDisable(GL_BLEND);
+  glDisable(GL_BLEND);
   //glActiveTexture(GL_TEXTURE0);
   //glBindTexture(GL_TEXTURE_2D, this->texture);
@@ -118 +119 @@
   glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
 
-  // Shader init
+
+/*  // Shader init
   //this->shader->activateShader();
   GLint uniform;
@@ -162 +164 @@
   uniform = glGetUniformLocationARB(shader->getProgram(), "cameraPos");
   glUniform4fARB(uniform, vPosition.x, vPosition.y, vPosition.z, 1.0f);
-
+*/
   glBegin(GL_QUADS);
-  glNormal3f(0,1,0);
-  glMultiTexCoord2f(GL_TEXTURE0, 0,0);
-  glMultiTexCoord2f(GL_TEXTURE1, 0,0);
-  glMultiTexCoord2f(GL_TEXTURE2, 0,0);
-  glMultiTexCoord2f(GL_TEXTURE3, 0,0);
-  glMultiTexCoord2f(GL_TEXTURE4, 0,0);
-  glVertex3f(0,0,0);
-
-  glMultiTexCoord2f(GL_TEXTURE0, 1,0);
-  glMultiTexCoord2f(GL_TEXTURE1, 1,0);
-  glMultiTexCoord2f(GL_TEXTURE2, 1,0);
-  glMultiTexCoord2f(GL_TEXTURE3, 1,0);
-  glMultiTexCoord2f(GL_TEXTURE4, 1,0);
-  glVertex3f(100,0,0);
-
-  glMultiTexCoord2f(GL_TEXTURE0, 1,1);
-  glMultiTexCoord2f(GL_TEXTURE1, 1,1);
-  glMultiTexCoord2f(GL_TEXTURE2, 1,1);
-  glMultiTexCoord2f(GL_TEXTURE3, 1,1);
-  glMultiTexCoord2f(GL_TEXTURE4, 1,1);
-  glVertex3f(100,0,-100);
-
-  glMultiTexCoord2f(GL_TEXTURE0, 0,1);
-  glMultiTexCoord2f(GL_TEXTURE1, 0,1);
-  glMultiTexCoord2f(GL_TEXTURE2, 0,1);
-  glMultiTexCoord2f(GL_TEXTURE3, 0,1);
-  glMultiTexCoord2f(GL_TEXTURE4, 0,1);
-  glVertex3f(0,0,-100);
+  glNormal3f(0, 1, 0);
+  glMultiTexCoord2f(GL_TEXTURE0, 0, 0);
+  glMultiTexCoord2f(GL_TEXTURE1, 0, 0);
+  glMultiTexCoord2f(GL_TEXTURE2, 0, 0);
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);
+  glMultiTexCoord2f(GL_TEXTURE4, 0, 0);
+  glVertex3f(-500, 0, 500);
+
+  glMultiTexCoord2f(GL_TEXTURE0, 1, 0);
+  glMultiTexCoord2f(GL_TEXTURE1, 1, 0);
+  glMultiTexCoord2f(GL_TEXTURE2, 1, 0);
+  glMultiTexCoord2f(GL_TEXTURE3, 1, 0);
+  glMultiTexCoord2f(GL_TEXTURE4, 1, 0);
+  glVertex3f(500, 0, 500);
+
+  glMultiTexCoord2f(GL_TEXTURE0, 1, 1);
+  glMultiTexCoord2f(GL_TEXTURE1, 1, 1);
+  glMultiTexCoord2f(GL_TEXTURE2, 1, 1);
+  glMultiTexCoord2f(GL_TEXTURE3, 1, 1);
+  glMultiTexCoord2f(GL_TEXTURE4, 1, 1);
+  glVertex3f(500, 0, -500);
+
+  glMultiTexCoord2f(GL_TEXTURE0, 0, 1);
+  glMultiTexCoord2f(GL_TEXTURE1, 0, 1);
+  glMultiTexCoord2f(GL_TEXTURE2, 0, 1);
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 1);
+  glMultiTexCoord2f(GL_TEXTURE4, 0, 1);
+  glVertex3f(-500, 0, -500);
   glEnd();
   //this->shader->deactivateShader();
@@ -210 +212 @@
 {
   glPushAttrib(GL_VIEWPORT_BIT);
-  //   glPushMatrix();
+  
 
   //glLoadIdentity();
   glViewport(0,0, textureSize, textureSize);
 
-
+  glPushMatrix();
   // Clear the color and depth bits, reset the matrix and position our camera.
 
@@ -227 +229 @@
   //{
   // Translate the world, then flip it upside down
-  //   glTranslatef(0.0f, waterHeight*2.0f, 0.0f);
-  //  glScalef(1.0, -1.0, 1.0);
+  glTranslatef(0.0f, this->waterHeight*2.0f, 0.0f);
+  glScalef(1.0, -1.0, 1.0);
 
   // Since the world is updside down we need to change the culling to FRONT
-  //glCullFace(GL_FRONT);
+  glCullFace(GL_FRONT);
 
   // Set our plane equation and turn clipping on
-  // double plane[4] = {0.0, 1.0, 0.0, -waterHeight};
-  //   glEnable(GL_CLIP_PLANE0);
-  // glClipPlane(GL_CLIP_PLANE0, plane);
+  double plane[4] = {0.0, 1.0, 0.0, -waterHeight};
+  //glEnable(GL_CLIP_PLANE0);
+  //glClipPlane(GL_CLIP_PLANE0, plane);
 
   // Render the world upside down and clipped (only render the top flipped).
@@ -265 +267 @@
 {
 //  glBindTexture(GL_TEXTURE_2D, texture.getTexture()); //is done by mat.select();
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
+  //glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
 
   //mat.setDiffuseMap(&texture, 0);
-  // mat.select();
+  mat.select();
   glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
-
+  //glDisable(GL_CLIP_PLANE0);
+
+  glPopMatrix();
 
   glPopAttrib();
-  //   glPopMatrix();
+  
 }
 

branches/water/src/world_entities/skybox.cc

@@ -74 +74 @@
   this->setClassID(CL_SKYBOX, "SkyBox");
   this->toList(OM_ENVIRON_NOTICK);
+  this->toReflectionList();
   //this->size = 100.0;
   this->textureSize = 1024.0f;

branches/water/src/world_entities/terrain.cc

@@ -106 +106 @@
   this->setClassID(CL_TERRAIN, "Terrain");
   this->toList(OM_ENVIRON_NOTICK);
+  this->toReflectionList();
 
   this->objectList = 0;

branches/water/src/world_entities/world_entity.cc

@@ -242 +242 @@
 }
 
-
+void WorldEntity::toReflectionList()
+{
+  State::getObjectManager()->toReflectionList( this );
+}
+
+void removeFromReflectionList()
+{
+/// TODO
+///  State::getObject
+}
 
 /**

branches/water/src/world_entities/world_entity.h

@@ -73 +73 @@
 
   void toList(OM_LIST list);
-
+  void toReflectionList();
+  void removeFromReflectionList();
 
   /** @returns a Reference to the objectListNumber to set. */