Changeset 6956 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 1, 2006, 4:37:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the HeightMapBranche back to the trunk

Location:

trunk/src/world_entities

Files:

• terrain.cc (modified) (9 diffs)
• terrain.h (modified) (3 diffs)

trunk/src/world_entities/terrain.cc

@@ -26 +26 @@
 #include "network_game_manager.h"
 
+#include "height_map.h"
+#include "material.h"
 
 #include "glincl.h"
+
+#include "state.h"
 
 using namespace std;
@@ -41 +45 @@
   if( root != NULL)
     this->loadParams(root);
+
+   this->heightMapMaterial = new Material();
+   heightMapMaterial->setTransparency(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);
 
 //  if (this->model != NULL)
@@ -90 +103 @@
     ResourceManager::getInstance()->unload(this->vegetation);
   }
+
+  if(this->heightMap)
+        delete heightMap;
 }
 
@@ -101 +117 @@
   this->ssp = NULL;
   this->vegetation = NULL;
+
+  this->heightMap = NULL;
+  this->heightMapMaterial = NULL;
 }
 
@@ -110 +129 @@
   LoadParam(root, "vegetation", this, Terrain, loadVegetation)
       .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
-}
+
+
+  LoadParam(root, "height-map", this, Terrain, loadHeightMap)
+      .describe("The HeightMap, splitted into two strings seperated by ','. 1: HeighMap, 2: ColorMap");
+
+
+  LoadParam(root, "heigt-texture", this, Terrain, loadTexture)
+      .describe("The name of the Texture for this heightMap");
+}
+
+void Terrain::loadHeightMap(const char* heightMapFile, const char* colorMap)
+{
+  if (this->heightMap != NULL)
+    delete this->heightMap;
+  this->heightMap = NULL;
+
+  char* hmName = ResourceManager::getFullName(heightMapFile);
+  char* hmColorName = ResourceManager::getFullName(colorMap);
+
+
+  this->heightMap = new HeightMap(hmName, hmColorName);
+  heightMap->scale(Vector(43.0f,4.7f,43.0f));
+  heightMap->setAbsCoor(this->getAbsCoor());
+  heightMap->load();
+  delete[] hmName;
+  delete[] hmColorName;
+
+}
+
+
+void Terrain::loadTexture(const char* textureName)
+{
+  if (this->heightMapMaterial != NULL)
+      delete this->heightMapMaterial;
+
+delete this->heightMapMaterial;
+
+   this->heightMapMaterial = new Material();
+   heightMapMaterial->setTransparency(1.0);
+
+   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->setDiffuseMap(textureName);
+   heightMapMaterial->setAmbientMap(textureName);
+   heightMapMaterial->setSpecularMap(textureName);
+
+
+
+}
+
+
 
 void Terrain::loadVegetation(const char* vegetationFile)
@@ -128 +201 @@
 
 
+
+
 void Terrain::draw () const
 {
@@ -137 +212 @@
                 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)
@@ -146 +221 @@
   if (this->vegetation)
     this->vegetation->draw();
+
+  if(this->heightMap)
+        {
+        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);
+        glColorMaterial ( GL_FRONT_AND_BACK, GL_EMISSION ) ;
+        glEnable (GL_COLOR_MATERIAL) ;
+        this->heightMap->draw();
+        }
   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 + 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();
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
   if (this->ssp != NULL)
@@ -360 +470 @@
 {
 }
+
+float Terrain::getHeight(float x, float y)
+{
+        if(this->heightMap != NULL)
+                return (this->heightMap->getHeight(x, y));
+        return 0;
+}

trunk/src/world_entities/terrain.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class SpatialSeparation;
+class HeightMap;
+class Material;
 
 //! A simple method to call a desired debug world.
@@ -40 +42 @@
   void loadVegetation(const char* vegetationFile);
 
+  void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
+  void loadTexture(const char* textureName);
+
   void buildDebugTerrain(DebugTerrain debugTerrain);
+  
+  float getHeight(float x, float y);
   virtual void draw() const;
 
@@ -50 +57 @@
    int                 objectList;
 
+   HeightMap*          heightMap;
+   Material*           heightMapMaterial;
 };