Changeset 7526 in orxonox.OLD for trunk/src/lib

Timestamp:

May 3, 2006, 5:49:36 PM (19 years ago)

Author:

patrick

Message:

orxonox: work flush on hm

Location:

trunk/src/lib/graphics/importer

Files:

• height_map.cc (modified) (4 diffs)
• height_map.h (modified) (2 diffs)

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

@@ -382 +382 @@
 HeightMap::~HeightMap()
 {
-  delete heightMap;
-  delete colorMap;
-
-  for(int i=0;i <    heightMap->h/HM_TILE_SIZE ; i++)
-  {
-    for(int j = 0; j < heightMap->w/ HM_TILE_SIZE; j++)
-    {
-      delete tiles [i][j];
-    }
-  }
-  for(int i=0;i <    heightMap->h/HM_TILE_SIZE ; i++)
-    delete[] tiles[i];
-  delete[] tiles;
-
-  for(int i=0;i<heightMap->h;i++)
-    delete[] normalVectorField [i];
-  delete[] normalVectorField;
-}
-
-
-
+  if( heightMap)
+    delete heightMap;
+  if( colorMap)
+    delete colorMap;
+
+  if( this->tiles)
+  {
+    for( int i = 0; i < heightMap->h / HM_TILE_SIZE; i++) {
+      for( int j = 0; j < heightMap->w / HM_TILE_SIZE; j++) {
+        delete tiles [i][j];
+      }
+    }
+
+    for( int i = 0; i < heightMap->h / HM_TILE_SIZE; i++)
+      delete[] tiles[i];
+    delete[] tiles;
+  }
+
+  if( this->normalVectorField)
+  {
+    for(int i = 0; i < heightMap->h; i++)
+      delete[] normalVectorField[i];
+    delete[] normalVectorField;
+  }
+}
+
+
+/**
+ * this is the init function with stuff shared between all constructors
+ */
 void HeightMap::init(const std::string& heightMapName)
 {
@@ -432 +441 @@
     PRINTF(1)("oops! couldn't load %s for some reason.\n", heightMapName.c_str());
 
-  generateNormalVectorField();
+  this->generateNormalVectorField();
 
   this->heights = (unsigned char*)heightMap->pixels;
@@ -463 +472 @@
 void HeightMap::draw() const
 {
-  const PNode* camera = State::getCameraNode();
-  Vector v = camera->getAbsCoor();
+  Vector v = State::getCameraNode()->getAbsCoor();
 
   int i_min = 0;
@@ -473 +481 @@
 
 
-  for(int i = 0; i <  i_max        ; i ++)
-  {
-    for(int j = 0; j < j_max ; j++)
-    {
+  /* process the draw command to the tiles, FIXME: think of something more efficient*/
+  for( int i = 0; i < i_max; i++)  {
+    for( int j = 0; j < j_max; j++)  {
       tiles[i][j]->draw();
     }

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

@@ -80 +80 @@
     virtual ~HeightMap();
 
-    void init(const std::string& heightMapName);
-
     void setAbsCoor(Vector V);
     float getHeight(float x, float y);
@@ -95 +93 @@
 
   private:
+    void init(const std::string& heightMapName);
+
     void generateNormalVectorField();
     void drawRect(int xBottomLeft, int yBottomLeft, int xTopRight, int yTopRight );