Changeset 7468 in orxonox.OLD for trunk/src/lib/graphics/importer/height_map.cc

Timestamp:

May 1, 2006, 11:06:09 PM (18 years ago)

Author:

patrick

Message:

orxonox: reading through the code and adjusting here and there, whatever dropps in to my eye

File:

• trunk/src/lib/graphics/importer/height_map.cc (modified) (4 diffs)

trunk/src/lib/graphics/importer/height_map.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: bottac@ee.ethz.ch
+
+   review: patrick boenzli, patrick@orxonox.ethz.ch
 */
 
@@ -31 +33 @@
 
 
+/**
+ * default constructor
+ *  @param i1
+ */
 Tile::Tile(int i1, int j1, int i2, int j2, HeightMap* hm )
 {
@@ -37 +43 @@
   lowResModel  = new VertexArrayModel();
 
-  this->load(i1,j1,i2,j2,hm,highResModel,4);
-  this->load(i1,j1,i2,j2,hm,lowResModel, 8);
-}
+  this->load(i1, j1, i2, j2, hm, highResModel,4);
+  this->load(i1, j1, i2, j2, hm, lowResModel, 8);
+}
+
 
 Tile::~Tile()
 {
-  delete highResModel;
-  delete lowResModel;
-}
+  if( highResModel)
+    delete highResModel;
+  if( lowResModel)
+    delete lowResModel;
+}
+
 
 void Tile::draw()
 {
-  // This Draws the LOD's
-  //FIXME
-  float cameraDistance = (State::getCameraNode()->getAbsCoor() - Vector(this->x, hmref->offsetY , this->z) ).len();
-  if(cameraDistance < 0)
-    cameraDistance = -cameraDistance;
-  if(cameraDistance > 5000 )
-  {
-    return;
-  }
-  else if (cameraDistance >= 1000 )
+  // draw the tile depending on the distance from the camera with different LOD (level of details)
+  float cameraDistance = fabs((State::getCameraNode()->getAbsCoor() - Vector(this->x, heightMapReference->offsetY , this->z) ).len());
+
+  if (cameraDistance < HM_LOD_HIGH_RES )
+  {
+    this->drawHighRes();
+  }
+  else if( cameraDistance < HM_LOD_LOW_RES)
   {
     this->drawLowRes();
   }
-  else
-  {
-    this->drawHighRes();
-  }
-}
-
-void Tile::drawHighRes()
-{
-  highResModel->draw();
-}
-
-void Tile::drawLowRes()
-{
-  lowResModel->draw();
-}
+}
+
 
 /*
@@ -93 +88 @@
         #define normalVectorField hm->normalVectorField
 
-  hmref = hm; // FIXME
+  heightMapReference = hm; // FIXME
 
   this->x = hm->offsetX + (heightMap->h - ((i1+i2)/2))*scaleX;