Changeset 6603 in orxonox.OLD for branches/height_map_merge/src

Timestamp:

Jan 18, 2006, 5:45:24 PM (19 years ago)

Author:

bottac

Message:

Improved texturemapping

Location:

branches/height_map_merge/src

Files:

• lib/graphics/importer/height_map.cc (modified) (2 diffs)
• lib/graphics/importer/height_map.h (modified) (1 diff)
• lib/graphics/importer/texture.cc (modified) (1 diff)
• lib/graphics/importer/vertex_array_model.cc (modified) (3 diffs)
• world_entities/terrain.cc (modified) (2 diffs)

branches/height_map_merge/src/lib/graphics/importer/height_map.cc

@@ -54 +54 @@
 void Tile::draw()
 {
- lowResModel->draw(); 
+         // This Draws the LOD's
+                                                                //FIXME
+    float cameraDistance = (State::getCamera()->getAbsCoor() - Vector(0.0,100.0,0.0)).len();
+    if (cameraDistance > 5000 )
+    {
+    
+    }
+    else if (cameraDistance > 1000 )
+    {
+      this->drawLowRes();
+    }
+    else 
+    {
+      this->drawHighRes();
+    }
 }
 
@@ -432 +446 @@
 int j_max= (heightMap->w - tileSize) / tileSize;
 
-// calc i_min , i_max j_min and j_maxt 
-
-int centerX =  (int)((heightMap->h - ((v.x - shiftX)/ (float)scaleX ))/ tileSize);
-int  centerY = (int)((v.z - shiftZ)/ (float)scaleZ )/ tileSize;
-//PRINTF(0)("i_max %i \n" , i_max);
-//PRINTF(0)("CENTERY %i \n ",centerY );
-i_min = max(centerX  -1, i_min);
-i_max = min(centerX +2 , i_max );
-
-j_min = max(centerY -1,1);
-j_max = min(centerY +2, j_max);
-
-
-for(int i = 1; i <  i_min        ; i ++)
+
+
+for(int i = 1; i <  i_max        ; i ++)
 {
         for(int j = 1; j < j_max ; j++)
         {
                 
-         tiles[i][j]->drawLowRes();
+         tiles[i][j]->draw();
         }       
 } 
-for(int i = i_min; i <  i_max    ; i ++)
-{
-        for(int j = j_min; j < j_max ; j++)
-        {
-                
-         tiles[i][j]->drawHighRes();
-        }       
-}
-
-for(int i = i_max; i <  (heightMap->h -tileSize)/tileSize        ; i ++)
-{
-        for(int j = 1; j < j_max ; j++)
-        {
-                
-         tiles[i][j]->drawLowRes();
-        }       
-}
-
-
-for(int i = 1; i < (heightMap->h -tileSize)/tileSize; i++ )
-{
-        for(int j = 1; j < j_min; j++)
-        {
-         tiles[i][j]->drawLowRes();
-        }
-}
-for(int i = 1; i < (heightMap->h -tileSize)/tileSize; i++) 
-{
-        for(int j = j_max; j < (heightMap->w -tileSize)/tileSize; j++ )
-        {
-        tiles[i][j]->drawLowRes();
-        }
-}
 
 }

branches/height_map_merge/src/lib/graphics/importer/height_map.h

@@ -17 +17 @@
 
 
-#define texRate      22
+#define texRate      64
 #define texRatef     4.0f
-#define tileSize     32
+#define tileSize     64
 
 class SDL_Surface;

branches/height_map_merge/src/lib/graphics/importer/texture.cc

@@ -264 +264 @@
 
 
-  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  // glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  // glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
   /* control the mipmap levels */

branches/height_map_merge/src/lib/graphics/importer/vertex_array_model.cc

@@ -135 +135 @@
 void VertexArrayModel::draw() const
 {
+
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  glColorMaterial ( GL_FRONT_AND_BACK, GL_EMISSION ) ;
+  glEnable (GL_COLOR_MATERIAL) ;
+
+
   PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
+ 
   glEnableClientState(GL_VERTEX_ARRAY );
-  //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   glEnableClientState(GL_NORMAL_ARRAY );
   glEnableClientState(GL_COLOR_ARRAY );
@@ -144 +151 @@
   glVertexPointer(3, GL_FLOAT, 0, &this->vertices[0]);
   glNormalPointer(GL_FLOAT, 0, &this->normals[0]);
-  //glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
+  glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
   glColorPointer(3, GL_FLOAT, 0, &this->colors[0]);
+
+ 
+
 
   for (GLuint i = 1; i < this->stripes.size(); ++i)
@@ -154 +164 @@
                       &this->indices[this->stripes[i-1]] );
     }
+
+        glPopAttrib();
 }
 

branches/height_map_merge/src/world_entities/terrain.cc

@@ -167 +167 @@
   if (this->heightMapMaterial != NULL)
     delete this->heightMapMaterial;
+
+
+   this->heightMapMaterial = new Material(); 
+   heightMapMaterial->setTransparency(1.0);
+   heightMapMaterial->setIllum(0.2);
+
+   heightMapMaterial->setDiffuse(1.0,1.0,1.0);
+   heightMapMaterial->setAmbient(1.0,1.0,1.0 );
+   heightMapMaterial->setSpecular(1.0,1.0,1.0);
+   heightMapMaterial->setShininess(.5);
+   heightMapMaterial->setTransparency(1.0);
+
+   heightMapMaterial->diffuseTexture = NULL;
+   heightMapMaterial->ambientTexture = NULL;
+   heightMapMaterial->specularTexture = NULL;
+  
+   
+   heightMapMaterial->setDiffuseMap(textureName);
+   heightMapMaterial->setAmbientMap(textureName);
+   heightMapMaterial->setSpecularMap(textureName);      
+ 
+
+
 }
 
@@ -212 +235 @@
         {
         this->heightMapMaterial->select();
-        
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
    
-        // glEnable(GL_LIGHTING);
+         glEnable(GL_LIGHTING);
         glColorMaterial ( GL_FRONT_AND_BACK, GL_EMISSION ) ;
         glEnable (GL_COLOR_MATERIAL) ;