Index: orxonox/trunk/src/subprojects/collision_detection/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/collision_detection/Makefile.am	(revision 4907)
+++ orxonox/trunk/src/subprojects/collision_detection/Makefile.am	(revision 4908)
@@ -11,4 +11,5 @@
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -27,4 +28,6 @@
                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
@@ -41,4 +44,6 @@
                    $(MAINSRCDIR)/util/animation/animation3d.cc \
                    $(MAINSRCDIR)/util/loading/factory.cc \
-                   $(MAINSRCDIR)/world_entities/world_entity.cc
+                   $(MAINSRCDIR)/world_entities/world_entity.cc \
+                   $(MAINSRCDIR)/world_entities/terrain.cc
 
+
Index: orxonox/trunk/src/subprojects/collision_detection/Makefile.in
===================================================================
--- orxonox/trunk/src/subprojects/collision_detection/Makefile.in	(revision 4907)
+++ orxonox/trunk/src/subprojects/collision_detection/Makefile.in	(revision 4908)
@@ -56,7 +56,8 @@
 	collision-ini_parser.$(OBJEXT) collision-camera.$(OBJEXT) \
 	collision-light.$(OBJEXT) collision-text_engine.$(OBJEXT) \
-	collision-graphics_engine.$(OBJEXT) collision-state.$(OBJEXT) \
-	collision-base_object.$(OBJEXT) collision-class_list.$(OBJEXT) \
-	collision-vector.$(OBJEXT) \
+	collision-graphics_engine.$(OBJEXT) \
+	collision-render_2d.$(OBJEXT) collision-element_2d.$(OBJEXT) \
+	collision-state.$(OBJEXT) collision-base_object.$(OBJEXT) \
+	collision-class_list.$(OBJEXT) collision-vector.$(OBJEXT) \
 	collision-resource_manager.$(OBJEXT) \
 	collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
@@ -65,5 +66,5 @@
 	collision-animation_player.$(OBJEXT) \
 	collision-animation3d.$(OBJEXT) collision-factory.$(OBJEXT) \
-	collision-world_entity.$(OBJEXT)
+	collision-world_entity.$(OBJEXT) collision-terrain.$(OBJEXT)
 collision_OBJECTS = $(am_collision_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -73,6 +74,7 @@
 	$(MAINSRCDIR)/lib/event/libORXevent.a \
 	$(MAINSRCDIR)/lib/sound/libORXsound.a \
-	$(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+	$(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -85,4 +87,5 @@
 @AMDEP_TRUE@	./$(DEPDIR)/collision-class_list.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-collision_detection.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/collision-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-environment.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-factory.Po \
@@ -95,7 +98,9 @@
 @AMDEP_TRUE@	./$(DEPDIR)/collision-null_parent.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-p_node.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/collision-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-state.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-substring.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/collision-terrain.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-test_entity.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/collision-text_engine.Po \
@@ -227,4 +232,5 @@
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -241,4 +247,6 @@
                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
@@ -255,5 +263,6 @@
                    $(MAINSRCDIR)/util/animation/animation3d.cc \
                    $(MAINSRCDIR)/util/loading/factory.cc \
-                   $(MAINSRCDIR)/world_entities/world_entity.cc
+                   $(MAINSRCDIR)/world_entities/world_entity.cc \
+                   $(MAINSRCDIR)/world_entities/terrain.cc
 
 all: all-am
@@ -330,4 +339,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-class_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-factory.Po@am__quote@
@@ -340,7 +350,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-p_node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-state.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-substring.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-terrain.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-test_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-text_engine.Po@am__quote@
@@ -508,4 +520,36 @@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
 
+collision-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.o -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+
+collision-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.obj -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
+
+collision-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.o -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+
+collision-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.obj -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
+
 collision-state.o: $(MAINSRCDIR)/util/state.cc
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-state.o -MD -MP -MF "$(DEPDIR)/collision-state.Tpo" -c -o collision-state.o `test -f '$(MAINSRCDIR)/util/state.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/state.cc; \
@@ -747,4 +791,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-world_entity.obj `if test -f '$(MAINSRCDIR)/world_entities/world_entity.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/world_entity.cc'; fi`
+
+collision-terrain.o: $(MAINSRCDIR)/world_entities/terrain.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-terrain.o -MD -MP -MF "$(DEPDIR)/collision-terrain.Tpo" -c -o collision-terrain.o `test -f '$(MAINSRCDIR)/world_entities/terrain.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/terrain.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-terrain.Tpo" "$(DEPDIR)/collision-terrain.Po"; else rm -f "$(DEPDIR)/collision-terrain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/world_entities/terrain.cc' object='collision-terrain.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-terrain.Po' tmpdepfile='$(DEPDIR)/collision-terrain.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-terrain.o `test -f '$(MAINSRCDIR)/world_entities/terrain.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/terrain.cc
+
+collision-terrain.obj: $(MAINSRCDIR)/world_entities/terrain.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-terrain.obj -MD -MP -MF "$(DEPDIR)/collision-terrain.Tpo" -c -o collision-terrain.obj `if test -f '$(MAINSRCDIR)/world_entities/terrain.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/terrain.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/collision-terrain.Tpo" "$(DEPDIR)/collision-terrain.Po"; else rm -f "$(DEPDIR)/collision-terrain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/world_entities/terrain.cc' object='collision-terrain.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/collision-terrain.Po' tmpdepfile='$(DEPDIR)/collision-terrain.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-terrain.obj `if test -f '$(MAINSRCDIR)/world_entities/terrain.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/terrain.cc'; fi`
 uninstall-info-am:
 
Index: orxonox/trunk/src/subprojects/gui/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/gui/Makefile.am	(revision 4907)
+++ orxonox/trunk/src/subprojects/gui/Makefile.am	(revision 4908)
@@ -9,5 +9,6 @@
 
 gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
-                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
+                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                   $(MAINSRCDIR)/lib/event/libORXevent.a
 
 gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
@@ -19,4 +20,6 @@
 gui_SOURCES= gui_main.cc \
              $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
              $(MAINSRCDIR)/lib/lang/base_object.cc \
              $(MAINSRCDIR)/lib/lang/class_list.cc \
Index: orxonox/trunk/src/subprojects/gui/Makefile.in
===================================================================
--- orxonox/trunk/src/subprojects/gui/Makefile.in	(revision 4907)
+++ orxonox/trunk/src/subprojects/gui/Makefile.in	(revision 4908)
@@ -54,4 +54,5 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_gui_OBJECTS = gui-gui_main.$(OBJEXT) gui-graphics_engine.$(OBJEXT) \
+	gui-render_2d.$(OBJEXT) gui-element_2d.$(OBJEXT) \
 	gui-base_object.$(OBJEXT) gui-class_list.$(OBJEXT) \
 	gui-vector.$(OBJEXT) gui-resource_manager.$(OBJEXT) \
@@ -65,8 +66,10 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gui-base_object.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-class_list.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gui-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-graphics_engine.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-gui_main.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-ini_parser.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-load_param.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/gui-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/gui-substring.Po \
@@ -194,5 +197,6 @@
 AM_LDFLAGS = $(MWINDOWS)
 gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
-                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
+                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                   $(MAINSRCDIR)/lib/event/libORXevent.a
 
 gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
@@ -203,4 +207,6 @@
 gui_SOURCES = gui_main.cc \
              $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
              $(MAINSRCDIR)/lib/lang/base_object.cc \
              $(MAINSRCDIR)/lib/lang/class_list.cc \
@@ -280,8 +286,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-class_list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-gui_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-load_param.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-substring.Po@am__quote@
@@ -335,4 +343,36 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
+
+gui-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.o -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+
+gui-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.obj -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
+
+gui-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.o -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+
+gui-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.obj -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
 
 gui-base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc
Index: orxonox/trunk/src/subprojects/importer/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/importer/Makefile.am	(revision 4907)
+++ orxonox/trunk/src/subprojects/importer/Makefile.am	(revision 4908)
@@ -25,4 +25,6 @@
                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
Index: orxonox/trunk/src/subprojects/importer/Makefile.in
===================================================================
--- orxonox/trunk/src/subprojects/importer/Makefile.in	(revision 4907)
+++ orxonox/trunk/src/subprojects/importer/Makefile.in	(revision 4908)
@@ -58,4 +58,5 @@
 	importer-vector.$(OBJEXT) importer-resource_manager.$(OBJEXT) \
 	importer-ini_parser.$(OBJEXT) importer-text_engine.$(OBJEXT) \
+	importer-render_2d.$(OBJEXT) importer-element_2d.$(OBJEXT) \
 	importer-p_node.$(OBJEXT) importer-null_parent.$(OBJEXT) \
 	importer-load_param.$(OBJEXT) importer-substring.$(OBJEXT) \
@@ -72,4 +73,5 @@
 @AMDEP_TRUE@	./$(DEPDIR)/importer-camera.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-class_list.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/importer-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-factory.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-framework.Po \
@@ -81,4 +83,5 @@
 @AMDEP_TRUE@	./$(DEPDIR)/importer-null_parent.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-p_node.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/importer-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/importer-state.Po \
@@ -224,4 +227,6 @@
                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                   $(MAINSRCDIR)/lib/coord/p_node.cc \
                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
@@ -299,4 +304,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-class_list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-framework.Po@am__quote@
@@ -308,4 +314,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-p_node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-state.Po@am__quote@
@@ -521,4 +528,36 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
+
+importer-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.o -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+
+importer-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.obj -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
+
+importer-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.o -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+
+importer-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.obj -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
 
 importer-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
Index: orxonox/trunk/src/subprojects/particles/Makefile.am
===================================================================
--- orxonox/trunk/src/subprojects/particles/Makefile.am	(revision 4907)
+++ orxonox/trunk/src/subprojects/particles/Makefile.am	(revision 4908)
@@ -29,4 +29,6 @@
                    $(MAINSRCDIR)/util/resource_manager.cc \
                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
Index: orxonox/trunk/src/subprojects/particles/Makefile.in
===================================================================
--- orxonox/trunk/src/subprojects/particles/Makefile.in	(revision 4907)
+++ orxonox/trunk/src/subprojects/particles/Makefile.in	(revision 4908)
@@ -59,5 +59,6 @@
 	particles-vector.$(OBJEXT) \
 	particles-resource_manager.$(OBJEXT) \
-	particles-text_engine.$(OBJEXT) particles-p_node.$(OBJEXT) \
+	particles-text_engine.$(OBJEXT) particles-render_2d.$(OBJEXT) \
+	particles-element_2d.$(OBJEXT) particles-p_node.$(OBJEXT) \
 	particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
 	particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
@@ -79,4 +80,5 @@
 @AMDEP_TRUE@	./$(DEPDIR)/particles-camera.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-class_list.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-element_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-factory.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-framework.Po \
@@ -89,4 +91,5 @@
 @AMDEP_TRUE@	./$(DEPDIR)/particles-p_node.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-particle_fun.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/particles-render_2d.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-resource_manager.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/particles-state.Po \
@@ -238,4 +241,6 @@
                    $(MAINSRCDIR)/util/resource_manager.cc \
                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
+                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
@@ -315,4 +320,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-class_list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-element_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-factory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-framework.Po@am__quote@
@@ -325,4 +331,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-render_2d.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-state.Po@am__quote@
@@ -539,4 +546,36 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
+
+particles-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.o -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+
+particles-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.obj -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
+
+particles-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.o -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+
+particles-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.obj -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
 
 particles-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
