Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7221 in orxonox.OLD for trunk/src/world_entities/terrain.h


Ignore:
Timestamp:
Mar 15, 2006, 3:10:45 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/terrain.h

    r7046 r7221  
    2929 public:
    3030  Terrain(const TiXmlElement* root = NULL);
    31   Terrain(const char* fileName);
     31  Terrain(const std::string& fileName);
    3232  Terrain(DebugTerrain debugTerrain);
    3333  virtual ~Terrain();
     
    4141  virtual void loadParams(const TiXmlElement* root);
    4242
    43   void loadVegetation(const char* vegetationFile);
     43  void loadVegetation(const std::string& vegetationFile);
    4444
    45   void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
    46   void loadTexture(const char* textureName);
     45  void loadHeightMap(const std::string& heightMapFile, const std::string& colorMap);
     46  void loadTexture(const std::string& textureName);
    4747  void setScale(float x, float y, float z);
    4848
Note: See TracChangeset for help on using the changeset viewer.