Changeset 6727 in orxonox.OLD for branches/height_map_merge/src/world_entities

Timestamp:

Jan 25, 2006, 5:46:16 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map_merge/src/world_entities

Files:

• terrain.cc (modified) (7 diffs)
• terrain.h (modified) (1 diff)

branches/height_map_merge/src/world_entities/terrain.cc

@@ -30 +30 @@
 
 #include "glincl.h"
+
+#include "state.h"
 
 using namespace std;
@@ -154 +156 @@
 
   this->heightMap = new HeightMap(hmName, hmColorName);
-  heightMap->scale(Vector(23.0f,3.5f,23.0f));
-  heightMap->shift(Vector(-1000.0,-90.0,-4000.0));
+  heightMap->scale(Vector(23.0f,1.1f,23.0f));
+  heightMap->setAbsCoor(this->getAbsCoor());
   heightMap->load();
   delete[] hmName;
@@ -166 +168 @@
 {
   if (this->heightMapMaterial != NULL)
-    delete this->heightMapMaterial;
+      delete this->heightMapMaterial;
 
 
@@ -214 +216 @@
 void Terrain::draw () const
 {
+  
+   
+ 
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
   /* translate */
-  glTranslatef (this->getAbsCoor ().x,
+ /* glTranslatef (this->getAbsCoor ().x,
                 this->getAbsCoor ().y,
                 this->getAbsCoor ().z);
+        */      
   /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+ // Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  //glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   if (this->objectList)
@@ -237 +243 @@
         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) ;
@@ -245 +250 @@
   glPopMatrix();
 
-
-
+ glMatrixMode(GL_MODELVIEW);
+glPushMatrix(); 
+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 + 13.0f,height+13.0f,camera.z-13.0f);      // Top Right Of The Quad (Top)
+    glVertex3f(camera.x-13.0f, height+13.0f,camera.z-13.0f);      // Top Left Of The Quad (Top)
+    glVertex3f(camera.x-13.0f, height+13.0f, camera.z+13.0f);      // Bottom Left Of The Quad (Top)
+    glVertex3f(camera.x+ 13.0f, height+13.0f, camera.z+13.0f);      // Bottom Right Of The Quad (Top)
+   glEnd();                      // End Drawing The Plan
+   
+    
+glPopMatrix();
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
   if (this->ssp != NULL)
@@ -457 +477 @@
 {
 }
+
+float Terrain::getHeight(float x, float y)
+{
+        if(this->heightMap != NULL)
+                return (this->heightMap->getHeight(x, y));
+        return 0;
+}

branches/height_map_merge/src/world_entities/terrain.h

@@ -46 +46 @@
 
   void buildDebugTerrain(DebugTerrain debugTerrain);
+  
+  float getHeight(float x, float y);
   virtual void draw() const;