Changeset 5940 in orxonox.OLD for branches

Timestamp:

Dec 6, 2005, 8:04:48 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map1

Files:

• . (copied) (copied from trunk)
• src/lib/graphics/importer/Makefile.am (modified) (2 diffs)
• src/story_entities/world.cc (modified) (1 diff)
• src/world_entities/player.cc (modified) (2 diffs)
• src/world_entities/terrain.cc (modified) (5 diffs)

branches/height_map1/src/lib/graphics/importer/Makefile.am

@@ -10 +10 @@
                            material.cc \
                            texture.cc \
-                           texture_sequence.cc
+                           texture_sequence.cc \
+                           height_map.cc
 
 
@@ -23 +24 @@
                  texture_sequence.h \
                  anorms.h \
-                 anormtab.h
+                 anormtab.h \
+                 height_map.h

branches/height_map1/src/story_entities/world.cc

@@ -380 +380 @@
 
   //        TrackManager::getInstance()->setBindSlave(env);
-  PNode* tn = TrackManager::getInstance()->getTrackNode();
-  tn->addChild(this->localPlayer);
-
+  //PNode* tn = TrackManager::getInstance()->getTrackNode();
+  //tn->addChild(this->localPlayer);
+
+  PNode* tn = this->localPlayer;
   //localCamera->setParent(TrackNode::getInstance());
   tn->addChild(this->localCamera);

branches/height_map1/src/world_entities/player.cc

@@ -282 +282 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( this->bUp && this->getRelCoor().x < 20)
+  if( this->bUp )
     accel += direction;
-  if( this->bDown && this->getRelCoor().x > -5)
+  if( this->bDown )
     accel -= direction;
 
-  if( this->bLeft && TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+  if( this->bLeft )
   {
     accel -=(orthDirection);
@@ -293 +293 @@
     rotVal -= .4;
   }
-  if( this->bRight && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+  if( this->bRight )
   {
     accel += orthDirection;

branches/height_map1/src/world_entities/terrain.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "model.h"
-
+#include "height_map.h"
 #include "glincl.h"
+
 
 using namespace std;
@@ -36 +37 @@
 Terrain::Terrain (const TiXmlElement* root)
 {
+
   this->init();
-  this->loadParams(root);
-
-//  if (this->model != NULL)
-    //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+  
+  // this->loadParams(root);
+
+ HeightMap * hm = new HeightMap();
+ hm->load();
+ this->model=hm;
+
+ /*     this->model =  new HeightMap();
+   this->model->setName("HardCore");
+  this->model->addVertex (-0.5, -0.5, 0.5);
+  this->model->addVertex (0.5, -0.5, 0.5);
+  this->model->addVertex (-0.5, 0.5, 0.5);
+  this->model->addVertex (0.5, 0.5, 0.5);
+  this->model->addVertex (-0.5, 0.5, -0.5);
+  this->model->addVertex (0.5, 0.5, -0.5);
+  this->model->addVertex (-0.5, -0.5, -0.5);
+  this->model->addVertex (0.5, -0.5, -0.5);
+
+  this->model->addVertexTexture (0.0, 0.0);
+  this->model->addVertexTexture (1.0, 0.0);
+  this->model->addVertexTexture (0.0, 1.0);
+  this->model->addVertexTexture (1.0, 1.0);
+  this->model->addVertexTexture (0.0, 2.0);
+  this->model->addVertexTexture (1.0, 2.0);
+  this->model->addVertexTexture (0.0, 3.0);
+  this->model->addVertexTexture (1.0, 3.0);
+  this->model->addVertexTexture (0.0, 4.0);
+  this->model->addVertexTexture (1.0, 4.0);
+  this->model->addVertexTexture (2.0, 0.0);
+  this->model->addVertexTexture (2.0, 1.0);
+  this->model->addVertexTexture (-1.0, 0.0);
+  this->model->addVertexTexture (-1.0, 1.0);
+
+  this->model->addVertexNormal (0.0, 0.0, 1.0);
+  this->model->addVertexNormal (0.0, 0.0, 1.0);
+  this->model->addVertexNormal (0.0, 0.0, 1.0);
+  this->model->addVertexNormal (0.0, 0.0, 1.0);
+  this->model->addVertexNormal (0.0, 1.0, 0.0);
+  this->model->addVertexNormal (0.0, 1.0, 0.0);
+  this->model->addVertexNormal (0.0, 1.0, 0.0);
+  this->model->addVertexNormal (0.0, 1.0, 0.0);
+  this->model->addVertexNormal (0.0, 0.0, -1.0);
+  this->model->addVertexNormal (0.0, 0.0, -1.0);
+  this->model->addVertexNormal (0.0, 0.0, -1.0);
+  this->model->addVertexNormal (0.0, 0.0, -1.0);
+  this->model->addVertexNormal (0.0, -1.0, 0.0);
+  this->model->addVertexNormal (0.0, -1.0, 0.0);
+  this->model->addVertexNormal (0.0, -1.0, 0.0);
+  this->model->addVertexNormal (0.0, -1.0, 0.0);
+  this->model->addVertexNormal (1.0, 0.0, 0.0);
+  this->model->addVertexNormal (1.0, 0.0, 0.0);
+  this->model->addVertexNormal (1.0, 0.0, 0.0);
+  this->model->addVertexNormal (1.0, 0.0, 0.0);
+  this->model->addVertexNormal (-1.0, 0.0, 0.0);
+  this->model->addVertexNormal (-1.0, 0.0, 0.0);
+  this->model->addVertexNormal (-1.0, 0.0, 0.0);
+  this->model->addVertexNormal (-1.0, 0.0, 0.0);
+
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,1, 3,3,2, 2,2,3);
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,2,4, 3,3,5, 5,5,6, 4,4,7);
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,4,8, 5,5,9, 7,7,10, 6,6,11);
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,6,12, 7,7,13, 1,9,14, 0,8,15);
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,16, 7,10,17, 5,11,18, 3,3,19);
+  this->model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,12,20, 0,0,21, 2,2,22, 4,13,23);
+
+      this->model->finalize(); */
+   
+ /*if (this->model != NULL)
+    this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);*/
 }
 
@@ -56 +123 @@
   if (!strstr(fileName, ".obj") || !strstr(fileName, ".OBJ") )
     {
-      this->loadModel(fileName);
+      this->model = NULL;
+        //this->loadModel(fileName);
     }
   else
@@ -135 +203 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
+  this->model->draw();
   if (this->objectList)
     glCallList(this->objectList);
@@ -145 +213 @@
 
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
-  if (this->ssp != NULL)
-    this->ssp->drawQuadtree();
+ // if (this->ssp != NULL)
+ //   this->ssp->drawQuadtree();
 }