Changeset 6268 in orxonox.OLD for branches/height_map/src/story_entities/world.h

Timestamp:

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

Author:

bensch

Message:

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

File:

• branches/height_map/src/story_entities/world.h (modified) (2 diffs)

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.