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

Timestamp:

Dec 22, 2005, 7:35:59 PM (19 years ago)

Author:

bensch

Message:

heightMap: fixed the VertexArrayModel, and reverted everything, that was a BUG

File:

• branches/height_map/src/world_entities/terrain.cc (modified) (4 diffs)

branches/height_map/src/world_entities/terrain.cc

@@ -42 +42 @@
   this->init();
 
-  this->tmp_mat = new Material();
+  this->tmp_mat = new Material(); 
   tmp_mat->setTransparency(1.0);
   tmp_mat->setIllum(0.3);
@@ -57 +57 @@
   tmp_mat->ambientTexture = NULL;
  // tmp_mat->specularTexture = NULL;
-
+  
   // this->loadParams(root);
 
  char* heightmapName = ResourceManager::getFullName("pictures/heightmapHello.bmp");
  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;
+ hm = new HeightMap(heightmapName, colourmapName);
+ hm->scale(Vector(23.0f,1.7f,23.0f));
+ hm->load();
+ this->model=hm;
 
  /*     this->model =  new HeightMap();
@@ -126 +126 @@
 
       this->model->finalize(); */
-
+   
  /*if (this->model != NULL)
     this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);*/
@@ -224 +224 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
+        
    //this->tmp_mat->select();
-
-
-  //hm->draw();
+        
+
+  hm->draw();
  /* if (this->objectList)
     glCallList(this->objectList);