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

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:

• trunk/src/world_entities/terrain.h (modified) (2 diffs)

trunk/src/world_entities/terrain.h

@@ -29 +29 @@
  public:
   Terrain(const TiXmlElement* root = NULL);
-  Terrain(const char* fileName);
+  Terrain(const std::string& fileName);
   Terrain(DebugTerrain debugTerrain);
   virtual ~Terrain();
@@ -41 +41 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadVegetation(const char* vegetationFile);
+  void loadVegetation(const std::string& vegetationFile);
 
-  void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
-  void loadTexture(const char* textureName);
+  void loadHeightMap(const std::string& heightMapFile, const std::string& colorMap);
+  void loadTexture(const std::string& textureName);
   void setScale(float x, float y, float z);