Changeset 3566 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 15, 2005, 11:22:51 PM (20 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

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (1 diff)
• story_entities/world.cc (modified) (5 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/primitive.cc (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/terrain.cc (modified) (4 diffs)
• world_entities/terrain.h (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

orxonox/trunk/src/camera.cc

@@ -201 +201 @@
   // TO DO: implement options for frustum generation
   //glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
-  gluPerspective(60, 1.2f, 0.1, 250);
+  gluPerspective(60, 1.2f, 0.1, 2000);
   
   //Vector up(0,0,1);

orxonox/trunk/src/story_entities/world.cc

@@ -69 +69 @@
   cn->reset();
 
-  //delete this->localCamera;
   delete this->nullParent;
   delete this->entities;
-  //delete this->skySphere;
-
-  //delete this->trackManager;
+
+  delete this->trackManager;
+
 
   /*
@@ -173 +172 @@
       this->glmis->step();
 
-      /*
-        tmpCurve->addNode(Vector(10,  -1,  -1));
-        tmpCurve->addNode(Vector(10,  -2,   2));
-        tmpCurve->addNode(Vector(10,   3,   3));
-        tmpCurve->addNode(Vector(10,   4,  -4), 0);
-        tmpCurve->addNode(Vector(10,  -1,  -1));
-        tmpCurve->addNode(Vector(10,  -2,   2));
-        tmpCurve->addNode(Vector(10,   3,   3));
-        tmpCurve->addNode(Vector(10,   4,  -4), 0);
-        tmpCurve->debug();
-      */
       switch(this->debugWorldNr)
         {
@@ -306 +294 @@
   glEndList();
 
-  terrain = new Terrain(TERRAIN_DAVE);
+  terrain = new Terrain("nGround.obj");
+  terrain->setRelCoor(&Vector(0,-10,0));
   this->spawn(terrain);
   // LIGHT initialisation
@@ -334 +323 @@
   cn->enable(true);
 
-  //glMap1f (GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, &ctrlpoints[0][0]);
-  //glEnable (GL_MAP1_VERTEX_3);
-  
-  //theNurb = gluNewNurbsRenderer ();
-  //gluNurbsProperty (theNurb, GLU_NURBS_MODE, GLU_NURBS_TESSELLATOR);
-  //gluNurbsProperty (theNurb, GLU_NURBS_VERTEX, vertexCallback );
-
 }
 
@@ -387 +369 @@
 ErrorMessage World::destroy()
 {
-  delete trackManager;
+
 }
 

orxonox/trunk/src/world_entities/environment.cc

@@ -36 +36 @@
 Environment::~Environment () 
 {
-  delete this->model;
+
 }
 

orxonox/trunk/src/world_entities/player.cc

@@ -37 +37 @@
 Player::~Player ()
 {
-  delete this->model;
+
 }
 

orxonox/trunk/src/world_entities/primitive.cc

@@ -36 +36 @@
 Primitive::~Primitive () 
 {
-  delete this->model;
+
 }
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -71 +71 @@
   this->sphereObj = gluNewQuadric();
   gluQuadricTexture(this->sphereObj, GL_TRUE);
-  this->setRadius(220.0);
+  this->setRadius(1900.0);
 
   this->skyMaterial = new Material("Sky");

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();

orxonox/trunk/src/world_entities/terrain.h

@@ -25 +25 @@
  public:
   Terrain();
+  Terrain(char* fileName);
   Terrain(DebugTerrain debugTerrain);
   virtual ~Terrain();
@@ -33 +34 @@
 
  private:
-
   int objectList;
 };

orxonox/trunk/src/world_entities/world_entity.cc

@@ -48 +48 @@
 {
   // if( collisioncluster != NULL) delete collisioncluster;
-
+  delete this->model;
 }
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -9 +9 @@
 #include "stdincl.h"
 #include "p_node.h"
-#include "model.h"
+#include "objModel.h"
 
 //class CollisionCluster;
-class OBJModel;
 
 //! Basic class from which all interactive stuff in the world is derived from