Changeset 6268 in orxonox.OLD

Timestamp:

Dec 22, 2005, 7:35:59 PM (18 years ago)

Author:

bensch

Message:

heightMap: fixed the VertexArrayModel, and reverted everything, that was a BUG

Location:

branches/height_map/src

Files:

• lib/graphics/importer/height_map.cc (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/terrain.cc (modified) (4 diffs)

branches/height_map/src/lib/graphics/importer/height_map.cc

@@ -286 +286 @@
                      */
 
-        this->planeModel(10.0, 10.0, 20, 20);
+        this->planeModel(10,10, 10,10);
 
         this->finalize();

branches/height_map/src/story_entities/world.cc

@@ -73 +73 @@
 #include "playable.h"
 
-#include "vertex_array_model.h"
-
 
 SHELL_COMMAND(speed, World, setSpeed);
@@ -386 +384 @@
   localCamera->lookAt(playable);
 //  this->localPlayer->setParentMode(PNODE_ALL);
-//   if (sky != NULL)
-//   {
-//     this->sky->setParent(this->localCamera);
-//     this->sky->setParentMode(PNODE_MOVEMENT);
-//   }
-
-  VertexArrayModel* mod = new VertexArrayModel;
-  mod->planeModel(10.0, 10.0, 20, 20);
-  mod->finalize();
-  mod->debug();
-  this->TEST = mod;
-  this->testMat = new Material;
-  this->testMat->setDiffuse( 1,1,1);
+  if (sky != NULL)
+  {
+    this->sky->setParent(this->localCamera);
+    this->sky->setParentMode(PNODE_MOVEMENT);
+  }
 
   // initialize debug coord system
@@ -836 +826 @@
   GraphicsEngine::getInstance()->draw();
   //TextEngine::getInstance()->draw();
-  this->testMat->select();
-  this->TEST->draw();
 }
 

branches/height_map/src/story_entities/world.h

@@ -25 +25 @@
 class OggPlayer;
 template<class T> class tList;
-
-#include "vertex_array_model.h"
-#include "material.h"
 
 //! The game world
@@ -119 +116 @@
     WorldEntity* sky;                   //!< The Environmental Heaven of orxonox @todo insert this to environment insted
     Terrain* terrain;                   //!< The Terrain of the World.
-    Material* testMat;
-    Model*   TEST;
+
     GLuint objectList;                  //!< temporary: @todo this will be ereased soon
     tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.

branches/height_map/src/world_entities/terrain.cc

@@ -42 +42 @@
   this->init();
 
-  this->tmp_mat = new Material();
+  this->tmp_mat = new Material(); 
   tmp_mat->setTransparency(1.0);
   tmp_mat->setIllum(0.3);
@@ -57 +57 @@
   tmp_mat->ambientTexture = NULL;
  // tmp_mat->specularTexture = NULL;
-
+  
   // this->loadParams(root);
 
  char* heightmapName = ResourceManager::getFullName("pictures/heightmapHello.bmp");
  char* colourmapName = ResourceManager::getFullName("pictures/heightmapHelloCM.bmp");
-//  hm = new HeightMap(heightmapName, colourmapName);
-//  hm->scale(Vector(23.0f,1.7f,23.0f));
-//  hm->load();
-//  this->model=hm;
+ hm = new HeightMap(heightmapName, colourmapName);
+ hm->scale(Vector(23.0f,1.7f,23.0f));
+ hm->load();
+ this->model=hm;
 
  /*     this->model =  new HeightMap();
@@ -126 +126 @@
 
       this->model->finalize(); */
-
+   
  /*if (this->model != NULL)
     this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);*/
@@ -224 +224 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
+        
    //this->tmp_mat->select();
-
-
-  //hm->draw();
+        
+
+  hm->draw();
  /* if (this->objectList)
     glCallList(this->objectList);