Changeset 6495 in orxonox.OLD

Timestamp:

Jan 11, 2006, 5:34:45 PM (18 years ago)

Author:

bensch

Message:

terrain updated, so it can load a new HeightMap from an XML file

Location:

height_map_merge/src/world_entities

Files:

• terrain.cc (modified) (4 diffs)
• terrain.h (modified) (3 diffs)

height_map_merge/src/world_entities/terrain.cc

@@ -26 +26 @@
 #include "network_game_manager.h"
 
+#include "height_map.h"
+#include "material.h"
 
 #include "glincl.h"
@@ -100 +102 @@
   this->ssp = NULL;
   this->vegetation = NULL;
+
+  this->heightMap = NULL;
+  this->heightMapMaterial = NULL;
 }
 
@@ -105 +110 @@
 void Terrain::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "vegetation", this, Terrain, loadVegetation)
       .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
-}
+
+
+  LoadParam(root, "height-map", this, Terrain, loadHeightMap)
+      .describe("The HeightMap, splitted into two strings seperated by ','. 1: HeighMap, 2: ColorMap");
+
+
+  LoadParam(root, "heigt-texture", this, Terrain, loadTexture)
+      .describe("The name of the Texture for this heightMap");
+}
+
+void Terrain::loadHeightMap(const char* heightMapFile, const char* colorMap)
+{
+  if (this->heightMap != NULL)
+    delete this->heightMap;
+  this->heightMap = NULL;
+
+
+  this->heightMap = new HeightMap(heightMapFile, colorMap);
+
+}
+
+
+void Terrain::loadTexture(const char* textureName)
+{
+  if (this->heightMapMaterial != NULL)
+    delete this->heightMapMaterial;
+}
+
+
 
 void Terrain::loadVegetation(const char* vegetationFile)
@@ -124 +157 @@
     this->vegetation = NULL;
 }
+
+
 
 

height_map_merge/src/world_entities/terrain.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class SpatialSeparation;
+class HeightMap;
+class Material;
 
 //! A simple method to call a desired debug world.
@@ -40 +42 @@
   void loadVegetation(const char* vegetationFile);
 
+  void loadHeightMap(const char* heightMapFile, const char* colorMap = NULL);
+  void loadTexture(const char* textureName);
+
   void buildDebugTerrain(DebugTerrain debugTerrain);
   virtual void draw() const;
@@ -50 +55 @@
    int                 objectList;
 
+   HeightMap*          heightMap;
+   Material*           heightMapMaterial;
 };