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

Timestamp:

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

Author:

bensch

Message:

heightmap: changes to revert afterwards

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
@@ -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.