Changeset 6496 in orxonox.OLD for height_map_merge/src/world_entities
- Timestamp:
- Jan 11, 2006, 5:40:42 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
height_map_merge/src/world_entities/terrain.cc
r6495 r6496 130 130 this->heightMap = NULL; 131 131 132 133 this->heightMap = new HeightMap(heightMapFile, colorMap); 132 char* hmName = ResourceManager::getFullName(heightMapFile); 133 char* hmColorName = ResourceManager::getFullName(colorMap); 134 135 136 this->heightMap = new HeightMap(hmName, hmColorName); 137 delete[] hmName; 138 delete[] hmColorName; 134 139 135 140 } … … 181 186 if (this->vegetation) 182 187 this->vegetation->draw(); 188 189 if(this->heightMap != NULL) 190 this->heightMap->draw(); 183 191 glPopMatrix(); 192 193 184 194 185 195 /* THIS IS ONLY FOR DEBUGGING INFORMATION */
Note: See TracChangeset
for help on using the changeset viewer.