Changeset 5819 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• spatial_separation/quadtree_node.cc (modified) (1 diff)
• spatial_separation/quadtree_node.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -30 +30 @@
 #include "text.h"
 
+#include "globals.h"
 
 #ifdef __WIN32__

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -22 +22 @@
 #include "material.h"
 #include "abstract_model.h"
-#include "list.h"
-#include "vector.h"
 #include "debug.h"
+
+#include "util/list.h"
 
 using namespace std;

trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -16 +16 @@
 
 #include "base_object.h"
-#include "vector.h"
+
 #include "abstract_model.h"