Changeset 3566 in orxonox.OLD for orxonox/trunk/src/world_entities/terrain.cc

Timestamp:

Mar 15, 2005, 11:22:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: updated the terrain class to more functionality
view goes farther 2000 instead of 250
model gets deleted by world_entity instead of childs

File:

• orxonox/trunk/src/world_entities/terrain.cc (modified) (4 diffs)

orxonox/trunk/src/world_entities/terrain.cc

@@ -32 +32 @@
 
 /**
+   \brief Constructor for loading a Terrain out of a file
+   \param fileName The file to load data from.
+ 
+   this either loads out of an OBJ-file, or loads a heightmap if no .obj-extension is found.
+*/
+Terrain::Terrain(char* fileName)
+{
+  this->init();
+
+  if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
+    {
+      this->model = (OBJModel*)new OBJModel(fileName);
+    }
+  else
+    {
+      // load the hightMap here.
+    }
+}
+
+/**
    \brief a Constructor for the Debug-Worlds
 
@@ -42 +62 @@
 }
 
-
 /**
    \brief standard deconstructor
@@ -57 +76 @@
 {
    this->setClassName ("Terrain");
+
    this->objectList = 0;
 }
+
 
 
@@ -75 +96 @@
   glMultMatrixf((float*)matrix);
 
-  glCallList(objectList);
+  if (objectList)
+    glCallList(objectList);
+  else if (model)
+    model->draw();
   //  this->model->draw();
   glPopMatrix();