Changeset 6939 in orxonox.OLD for branches/height_map_merge/src/world_entities/terrain.cc

Timestamp:

Feb 1, 2006, 2:54:01 PM (18 years ago)

Author:

bottac

Message:

 

File:

• branches/height_map_merge/src/world_entities/terrain.cc (modified) (6 diffs)

branches/height_map_merge/src/world_entities/terrain.cc

@@ -49 +49 @@
    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->setDiffuse(0.4,0.4,0.4);
+   heightMapMaterial->setAmbient(0.4,0.4,0.4 );
+   heightMapMaterial->setSpecular(0.4,0.4,0.4);
    heightMapMaterial->setShininess(.5);
    heightMapMaterial->setTransparency(1.0);
@@ -112 +112 @@
     ResourceManager::getInstance()->unload(this->vegetation);
   }
+  
+  if(this->heightMap)
+        delete heightMap;
 }
 
@@ -156 +159 @@
 
   this->heightMap = new HeightMap(hmName, hmColorName);
-  heightMap->scale(Vector(23.0f,1.1f,23.0f));
+  heightMap->scale(Vector(43.0f,4.7f,43.0f));
   heightMap->setAbsCoor(this->getAbsCoor());
   heightMap->load();
@@ -171 +174 @@
 
 delete this->heightMapMaterial;
-/*   
+
    this->heightMapMaterial = new Material(); 
    heightMapMaterial->setTransparency(1.0);
@@ -191 +194 @@
    heightMapMaterial->setSpecularMap(textureName);      
  
-*/
+
 
 }
@@ -258 +261 @@
 glLoadIdentity();
  Vector camera =   State::getCamera()->getAbsCoor(); // Go on here ..........!!!
+    
+    /*
     float height =    heightMap->getHeight(camera.x, camera.z);
     
+  
   glEnable (GL_COLOR_MATERIAL) ;
     glBegin(GL_QUADS);            // Draw The Cube Using quads
     glColor3f(0.0f,1.0f,0.0f);  // Color Blue
-    glVertex3f(camera.x + 63.0f,heightMap->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
-    glVertex3f(camera.x-63.0f, heightMap->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
-    glVertex3f(camera.x-63.0f, heightMap->getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
-    glVertex3f(camera.x+ 63.0f, heightMap->getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
+    glVertex3f(camera.x + 63.0f,Terrain->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
+    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
+    glVertex3f(camera.x+ 63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
    glEnd();                      // End Drawing The Plan
-   
+   */
     
 glPopMatrix();