Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6496 in orxonox.OLD for height_map_merge/src


Ignore:
Timestamp:
Jan 11, 2006, 5:40:42 PM (19 years ago)
Author:
bensch
Message:

terrain loads hm from ResourceManager::gertFullName

File:
1 edited

Legend:

Unmodified
Added
Removed
  • height_map_merge/src/world_entities/terrain.cc

    r6495 r6496  
    130130  this->heightMap = NULL;
    131131
    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;
    134139
    135140}
     
    181186  if (this->vegetation)
    182187    this->vegetation->draw();
     188
     189  if(this->heightMap != NULL)
     190    this->heightMap->draw();
    183191  glPopMatrix();
     192
     193
    184194
    185195  /* THIS IS ONLY FOR DEBUGGING INFORMATION */
Note: See TracChangeset for help on using the changeset viewer.