Changeset 6227 in orxonox.OLD for branches/height_map/src/world_entities

Timestamp:

Dec 21, 2005, 2:22:59 PM (19 years ago)

Author:

bottac

Message:

getHeight implemented
support for 'colour maps'

Location:

branches/height_map/src/world_entities

Files:

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

branches/height_map/src/world_entities/terrain.cc

@@ -30 +30 @@
 
 using namespace std;
+HeightMap * hm;
 
 CREATE_FACTORY(Terrain, CL_TERRAIN);
@@ -41 +42 @@
   this->init();
 
-  this->tmp_mat = new Material();  
+  this->tmp_mat = new Material(); 
+  tmp_mat->setTransparency(1.0);
+  tmp_mat->setIllum(0.3);
+/*  tmp_mat->setDiffuse(0.55,0.4,0.2);
+  tmp_mat->setAmbient(0.6,0.4,0.2);
+  tmp_mat->setSpecular(0.02,0.02,0.02);*/
+    tmp_mat->setDiffuse(1.0,1.0,1.0);
+  tmp_mat->setAmbient(1.0,1.0,1.0 );
+  tmp_mat->setSpecular(1.0,1.0,1.0);
+  tmp_mat->setShininess(.1);
+  tmp_mat->setTransparency(1.0);
+
+  tmp_mat->diffuseTexture = NULL;
+  tmp_mat->ambientTexture = NULL;
+ // tmp_mat->specularTexture = NULL;
+  
   // this->loadParams(root);
 
  char* heightmapName = ResourceManager::getFullName("pictures/heightmapHello.bmp");
- HeightMap * hm = new HeightMap(heightmapName);
-
+ char* colourmapName = ResourceManager::getFullName("pictures/heightmapHelloCM.bmp");
+ hm = new HeightMap(heightmapName, colourmapName);
+ hm->scale(Vector(23.0f,1.7f,23.0f));
  hm->load();
  this->model=hm;
@@ -201 +218 @@
 
   /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
+  glTranslatef (this->getAbsCoor ().x - 1000,
+                this->getAbsCoor ().y - 400,
+                this->getAbsCoor ().z - 1000)   ;
   /* rotate */
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-   this->tmp_mat->select();
-
-  this->model->draw();
-  if (this->objectList)
+        
+   //this->tmp_mat->select();
+        
+
+  hm->draw();
+ /* if (this->objectList)
     glCallList(this->objectList);
   else if (this->model)
@@ -217 +235 @@
   if (this->vegetation)
     this->vegetation->draw();
+*/
   glPopMatrix();
 

branches/height_map/src/world_entities/terrain.h

@@ -44 +44 @@
  private:
    Model*              vegetation;
+   Model*              model;
    Material*           tmp_mat;
    int                 objectList;