Changeset 6496 in orxonox.OLD

Timestamp:

Jan 11, 2006, 5:40:42 PM (18 years ago)

Author:

bensch

Message:

terrain loads hm from ResourceManager::gertFullName

File:

• height_map_merge/src/world_entities/terrain.cc (modified) (2 diffs)

height_map_merge/src/world_entities/terrain.cc

@@ -130 +130 @@
   this->heightMap = NULL;
 
-
-  this->heightMap = new HeightMap(heightMapFile, colorMap);
+  char* hmName = ResourceManager::getFullName(heightMapFile);
+  char* hmColorName = ResourceManager::getFullName(colorMap);
+
+
+  this->heightMap = new HeightMap(hmName, hmColorName);
+  delete[] hmName;
+  delete[] hmColorName;
 
 }
@@ -181 +186 @@
   if (this->vegetation)
     this->vegetation->draw();
+
+  if(this->heightMap != NULL)
+    this->heightMap->draw();
   glPopMatrix();
+
+
 
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */