Changeset 6263 in orxonox.OLD for branches/height_map/src/story_entities

Timestamp:

Dec 22, 2005, 6:43:49 PM (19 years ago)

Author:

bensch

Message:

heightmap: changes to revert afterwards

Location:

branches/height_map/src/story_entities

Files:

• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)

branches/height_map/src/story_entities/world.cc

@@ -73 +73 @@
 #include "playable.h"
 
+#include "vertex_array_model.h"
+
 
 SHELL_COMMAND(speed, World, setSpeed);
@@ -384 +386 @@
   localCamera->lookAt(playable);
 //  this->localPlayer->setParentMode(PNODE_ALL);
-  if (sky != NULL)
-  {
-    this->sky->setParent(this->localCamera);
-    this->sky->setParentMode(PNODE_MOVEMENT);
-  }
+//   if (sky != NULL)
+//   {
+//     this->sky->setParent(this->localCamera);
+//     this->sky->setParentMode(PNODE_MOVEMENT);
+//   }
+
+  VertexArrayModel* mod = new VertexArrayModel;
+  mod->planeModel();
+  mod->finalize();
+  mod->debug();
+  this->TEST = mod;
+  this->testMat = new Material;
+  this->testMat->setDiffuse( 1,1,1);
 
   // initialize debug coord system
@@ -826 +836 @@
   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
@@ -116 +119 @@
     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.