Changeset 8488 in orxonox.OLD

Timestamp:

Jun 15, 2006, 6:19:27 PM (18 years ago)

Author:

stefalie

Message:

water: some cleanup and some cleandown

Location:

branches/water/src/world_entities

Files:

• environments/mapped_water.cc (modified) (6 diffs)
• space_ships/hover.cc (modified) (1 diff)

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

@@ -35 +35 @@
     this->loadParams(root);
 
+
+this->textureSize = 512;
+  unsigned int channels = 32;
+  GLenum type = GL_RGBA;
   /// loads the textures
   // set up refleciton texture
-  //mat.setDiffuseMap(this->texture, 0);
+  //Texture texture(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
+  //mat.setDiffuseMap(texture, 0);
   mat.setDiffuseMap("pictures/refl.bmp", GL_TEXTURE_2D, 0);
   // load refraction texture
@@ -49 +54 @@
 
 
-
-  /// MAKE THE MAPPING TEXTURE.
-  // THIS IS A HACK AND SHOULD BE IN TEXTURE SOMEWHERE
   // set the size of the refraction and reflection textures
-  this->textureSize = 512;
+  
+
+  // initialization of the texture coords, speeds etc...
+  this->move = 0.0f;
+  this->kNormalMapScale = 0.25f;
+
   //unsigned int channels = 32;
   //GLenum type = GL_RGBA;
@@ -72 +79 @@
   //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();
+  //mat.select();*/
   glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
@@ -83 +90 @@
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureReflection);
-
-
-  unsigned int* pTextureRefraction = new unsigned int [this->textureSize * this->textureSize * channels];
-  memset(pTextureRefraction, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
+  //glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureReflection);
+
+
+  //unsigned int* pTextureRefraction = new unsigned int [this->textureSize * this->textureSize * channels];
+  //memset(pTextureRefraction, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
   glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
@@ -93 +100 @@
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureRefraction);
+  //glTexImage2D(GL_TEXTURE_2D, 0, channels, this->textureSize, this->textureSize, 0, type, GL_UNSIGNED_INT, pTextureRefraction);
 
   // Set the texture quality
@@ -101 +108 @@
   //delete [] pTextureReflection;
   //delete [] pTextureRefraction;
-
-
-  /// initialization of the texture coords, speeds etc...
-  this->move = 0.0f;
-  this->kNormalMapScale = 0.25f;
 
 

branches/water/src/world_entities/space_ships/hover.cc

@@ -99 +99 @@
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_HOVER, "Hover");
+  this->toReflectionList();
 
   this->loadModel("models/ships/hoverglider_wing.obj", 1.0f, 3);