Changeset 4090 in orxonox.OLD for orxonox/branches/heightMap/src/world_entities

Timestamp:

May 6, 2005, 6:01:06 PM (20 years ago)

Author:

nico

Message:

branches/heightMap: some makefile and include stuff fixed

Location:

orxonox/branches/heightMap/src/world_entities

Files:

• terrain.cc (modified) (2 diffs)
• terrain.h (modified) (1 diff)

orxonox/branches/heightMap/src/world_entities/terrain.cc

@@ -21 +21 @@
 #include "glincl.h"
 
+#include "heightmap.h"
+
+
 using namespace std;
 
@@ -51 +54 @@
     {
       // the heightmap case
-      this->model = (Heightmap*)ResourceManager::getInstance()->load(fileName, BMP, RP_LEVEL);
+      //this->model = (Heightmap*)ResourceManager::getInstance()->load(fileName, BMP, RP_LEVEL);
     }
   else
     {
       // nor .obj nor .bmp
+    }
+}
+
+/**
+\brief Constructor for loading a heightmap out of a file
+ \param fileName The file to load data from.
+ \param displaylistResolution The count of vertices in a Displaylistdimension
+ \param vertexResolution How exact the mesh should be created. 1 means every pixel defines a vertex
+ 
+ */
+Terrain::Terrain(char* fileName, int displaylistResolution, int vertexResolution)
+{
+        this->init();
+        
+        // here are only bmps supported!
+        if (strstr(fileName, ".bmp") || strstr(fileName, ".BMP"))
+    {
+                // the heightmap case
+                this->model = new Heightmap(fileName, 1.0, displaylistResolution, vertexResolution);
+    }
+        else
+    {
+                // nor .obj nor .bmp
     }
 }

orxonox/branches/heightMap/src/world_entities/terrain.h

@@ -26 +26 @@
   Terrain();
   Terrain(char* fileName);
+  Terrain(char* fileName, int displaylistResolution, int vertexResolution);
   Terrain(DebugTerrain debugTerrain);
   virtual ~Terrain();