Index: trunk/src/lib/graphics/Makefile.am
===================================================================
--- trunk/src/lib/graphics/Makefile.am	(revision 5346)
+++ trunk/src/lib/graphics/Makefile.am	(revision 5347)
@@ -1,4 +1,28 @@
+MAINSRCDIR=../..
+include $(MAINSRCDIR)/defs/include_paths.am
+
+noinst_LIBRARIES = libORXgraphics.a
+
+libORXgraphics_a_SOURCES = graphics_engine.cc \
+			   light.cc \
+			   shader.cc \
+			   render2D/render_2d.cc \
+			   render2D/element_2d.cc \
+			   text_engine/text_engine.cc \
+			   text_engine/text.cc \
+			   text_engine/font.cc
+
+noinst_HEADERS = graphics_engine.h \
+		 light.h \
+		 shader.h \
+		 render2D/render_2d.h \
+		 render2D/element_2d.h \
+		 text_engine/text_engine.h \
+		 text_engine/text.h \
+		 text_engine/font.h
+
+
 SUBDIRS = importer \
           spatial_separation
 
-EXTRA_DIST = text_engine/font.xpm
+EXTRA_DIST = text_engine/default_font.xpm
Index: trunk/src/lib/graphics/Makefile.in
===================================================================
--- trunk/src/lib/graphics/Makefile.in	(revision 5346)
+++ trunk/src/lib/graphics/Makefile.in	(revision 5347)
@@ -14,4 +14,8 @@
 
 @SET_MAKE@
+
+
+SOURCES = $(libORXgraphics_a_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -36,5 +40,6 @@
 host_triplet = @host@
 subdir = src/lib/graphics
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -44,6 +49,29 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libORXgraphics_a_AR = $(AR) $(ARFLAGS)
+libORXgraphics_a_LIBADD =
+am_libORXgraphics_a_OBJECTS = graphics_engine.$(OBJEXT) \
+	light.$(OBJEXT) shader.$(OBJEXT) render_2d.$(OBJEXT) \
+	element_2d.$(OBJEXT) text_engine.$(OBJEXT) text.$(OBJEXT) \
+	font.$(OBJEXT)
+libORXgraphics_a_OBJECTS = $(am_libORXgraphics_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Po ./$(DEPDIR)/font.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/graphics_engine.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/light.Po ./$(DEPDIR)/render_2d.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/shader.Po ./$(DEPDIR)/text.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/text_engine.Po
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+SOURCES = $(libORXgraphics_a_SOURCES)
+DIST_SOURCES = $(libORXgraphics_a_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
@@ -52,4 +80,5 @@
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -164,11 +193,32 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
+MAINSRCDIR = ../..
+noinst_LIBRARIES = libORXgraphics.a
+libORXgraphics_a_SOURCES = graphics_engine.cc \
+			   light.cc \
+			   shader.cc \
+			   render2D/render_2d.cc \
+			   render2D/element_2d.cc \
+			   text_engine/text_engine.cc \
+			   text_engine/text.cc \
+			   text_engine/font.cc
+
+noinst_HEADERS = graphics_engine.h \
+		 light.h \
+		 shader.h \
+		 render2D/render_2d.h \
+		 render2D/element_2d.h \
+		 text_engine/text_engine.h \
+		 text_engine/text.h \
+		 text_engine/font.h
+
 SUBDIRS = importer \
           spatial_separation
 
-EXTRA_DIST = text_engine/font.xpm
+EXTRA_DIST = text_engine/default_font.xpm
 all: all-recursive
 
 .SUFFIXES:
+.SUFFIXES: .cc .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -200,4 +250,122 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libORXgraphics.a: $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_DEPENDENCIES) 
+	-rm -f libORXgraphics.a
+	$(libORXgraphics_a_AR) libORXgraphics.a $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_LIBADD)
+	$(RANLIB) libORXgraphics.a
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/element_2d.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render_2d.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+render_2d.o: render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.o -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='render2D/render_2d.cc' object='render_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc
+
+render_2d.obj: render2D/render_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.obj -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Po"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='render2D/render_2d.cc' object='render_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/render_2d.Po' tmpdepfile='$(DEPDIR)/render_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`
+
+element_2d.o: render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.o -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='render2D/element_2d.cc' object='element_2d.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc
+
+element_2d.obj: render2D/element_2d.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.obj -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Po"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='render2D/element_2d.cc' object='element_2d.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/element_2d.Po' tmpdepfile='$(DEPDIR)/element_2d.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`
+
+text_engine.o: text_engine/text_engine.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.o -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/text_engine.cc' object='text_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc
+
+text_engine.obj: text_engine/text_engine.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.obj -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Po"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/text_engine.cc' object='text_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/text_engine.Po' tmpdepfile='$(DEPDIR)/text_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`
+
+text.o: text_engine/text.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.o -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/text.cc' object='text.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc
+
+text.obj: text_engine/text.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.obj -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Po"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/text.cc' object='text.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/text.Po' tmpdepfile='$(DEPDIR)/text.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`
+
+font.o: text_engine/font.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.o -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/font.cc' object='font.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc
+
+font.obj: text_engine/font.cc
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.obj -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Po"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='text_engine/font.cc' object='font.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/font.Po' tmpdepfile='$(DEPDIR)/font.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`
 uninstall-info-am:
 
@@ -323,5 +491,5 @@
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/text_engine
+	$(mkdir_p) $(distdir)/render2D $(distdir)/text_engine
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -365,5 +533,5 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
@@ -394,9 +562,11 @@
 clean: clean-recursive
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
 dvi: dvi-recursive
@@ -421,4 +591,5 @@
 
 maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -426,5 +597,5 @@
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-recursive
@@ -441,15 +612,17 @@
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
-
+	clean clean-generic clean-noinstLIBRARIES clean-recursive \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-recursive distclean-tags distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+include $(MAINSRCDIR)/defs/include_paths.am
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: trunk/src/lib/graphics/graphics_engine.cc
===================================================================
--- trunk/src/lib/graphics/graphics_engine.cc	(revision 5346)
+++ trunk/src/lib/graphics/graphics_engine.cc	(revision 5347)
@@ -21,8 +21,9 @@
 
 #include "render_2d.h"
+#include "text_engine.h"
 #include "light.h"
+#include "shader.h"
 #include "debug.h"
-#include "text_engine.h"
-#include "shader.h"
+
 #include "ini_parser.h"
 #include "substring.h"
@@ -84,7 +85,8 @@
   delete this->hwExtensions;
 
-  delete Render2D::getInstance();
   //TextEngine
   delete TextEngine::getInstance();
+  // render 2D
+  delete Render2D::getInstance();
 
   SDL_QuitSubSystem(SDL_INIT_VIDEO);
Index: trunk/src/lib/graphics/text_engine/default_font.xpm
===================================================================
--- trunk/src/lib/graphics/text_engine/default_font.xpm	(revision 5347)
+++ trunk/src/lib/graphics/text_engine/default_font.xpm	(revision 5347)
@@ -0,0 +1,268 @@
+/* XPM */
+static char * font_xpm[] = {
+"256 256 9 1",
+" 	c None",
+".	c #FEFEFE",
+"+	c #FDFDFD",
+"@	c #FAFAFA",
+"#	c #FBFBFB",
+"$	c #F8F8F8",
+"%	c #FCFCFC",
+"&	c #F9F9F9",
+"*	c #F7F7F7",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .               .               .               .               .               .               .               .               .     .         .     .         .     .         .     .         .     .         .     .         .     .       ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .               .               .               .               .               .               .               .               .               .               .               .               .               .               .             ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .               .               .               .               .               .               .               .               .               .               .     .         .     .         .     .         .     .         .     .       ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .               .               .               .               .               .               .               .               .               .               .               .               .               .               .             ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                  ..              ...             .                    ..         .                 +......       ..                 ..            .              .               .               ..              .               ..                   ..       ",
+"                  ..              ...                                 ...                          ........       .+               +...           ...+                                            ..                              ..                  ..        ",
+"                  ..              ...                              .........                       ..              @               ..               ..+                                            #                                                  .+        ",
+"                  ..                                              ..........                        ...                           ...                ..                                                                                              ..$        ",
+"                  ++                                              ... #..                          ...++  .+                      ...                ..                                                                                             #..         ",
+"                                                                  %......%%%.                     ...  %....                      ...                ..                                                                                             ..          ",
+"                  ..                                               +........+                     ..........+                     ...                .+                                                                                            +..          ",
+"                  ..                              .                    ..  ..     .               ...........#                    ...                .+           .               .                               .                                ..           ",
+"                  ..                                              &..........                       .....+                        ...                .+                                                                                            %@           ",
+"                                                                  &.........%                                                     ...                .+                                                                                                         ",
+"                                                                      ...                                                          ..               ..+                                                                                                         ",
+"                                                                                                                                   +...           ....#                                                                                                         ",
+"                                                                                                                                    ++.           ..%                                                                                                           ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"   .+....+#        ....           ..........      ..........             ..       ...........      +%.++%%##      ..........       .......+        +.....+%       ..              ..              .               .               .                ......       ",
+"  ..........      .....           ..........      ........%              ..       ...........      .........      ..........       ........+      &........+      ..              ..                                                               ......+      ",
+"  ...     .+        ...                   %.                      ..     ..                                                        ..    ..+      &..     ..                                                                                           ...      ",
+"  ..      ..        ...            +........             ..+      ..........       ........%      .........                        ........       @.........      ..              ..                                                                .....+      ",
+"  ..      ..        ...           ..........            .....     ..........       .........%     ..........           ..%         ........+       +........      ..              ..                                                                .....       ",
+"  ..      ..        ...                                   ...                             ...     ...     ..          @.+         ...     ..#                                      #                                                                            ",
+"  %......#.+        ...           ..........       ..........            ..        ..........     #..@@%+...         ...          ..........$      ........                                                                                          .          ",
+"   ........         ...           ...........     &.........             ..       &.........+      +........        ..+           ..........      .........                                                                                         ..          ",
+"     ....+           .            ..........       ........              ..        ........+         ......         ..              .......        ......+                                                                                           .          ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .........+      .........%       ........       ........+.       %.........      +........       .+.......      ...      ...    ...                  ...        ...     ..&     ...              .%.       .#.   +#%      ..     %.......+    ",
+"                  ...........     ..........#     .........       ..........+     +..........%    +.........      ..........      ...      ...    ...                  ...        ...   ++.       ...             %...+     ....  %...+     ..     ..........@  ",
+"                           %.%            ...     +..                      ..     @.       +..    +.+             +..             ...      ...    ...                  ...        ...  ..+        ...             ..#..     ..... ... .#    ..    +..      ..%  ",
+"                   ...........    ..........      ..                       ..     &...........    ..........      ...  ....       ... *.......    ...                  ...        ...  ..         ...             ... ..   .. ... ...  .%   ..    ...       ..  ",
+"                  ............    ..........      ..              ...      ..     &.........+     ..........      ...  .....      ... *.......    ...                  ...        ...  .#         ...             ... +.   .. ... ...  $..  ..    ...       ..  ",
+"                  ...      ...    ...      .+     ..              ...      ..     &..             ...             ...     ..      ...      ...    ...                  ...        ...  ...        ...             ...  .% +.  ... ...   +.. ..    +..       ..  ",
+"                  ............    ...........     %.+......       ..........+      ..........     ...             #.........      ...      ...    ...              ......+        ...   #.+       %.........      ...  ....#  ... ...    .....    %........#..  ",
+"  .               .........%..    ...........      +.......       ..........       %..........    ...              .........      ...      ...    ...             .......         ...    ...       .........      ...   ...   ... ...     ...@     +........+   ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .........%.      .+......+.     .........%       .........      ....... ....... ..       ..      ..       ..+   %..    ...    +. ...     ...    ...      ...    ..........         ..            ..              ..             .               ........      ",
+"  ..........+     %..........+    ..........#     ..........      &&&&#.. ....... ..       ..      %..      ..     ..    ...@   ..  ...   ..+     ...      ...     .........       ....            ..              ...                                          ",
+"           ..     %..      ..%            ...     ..+                  .. ..      ..       ..       ..     +.      ...   ....   ..   %.. ...      %..      ...                     ..               ..              ..+                                         ",
+"  ..........+     ..       ...    ..........%     .........+           .. ..      ..       ..       ..+   ..+       ..  .. .+  %..    .....        ..........                     ...               ..               ..                                         ",
+"  .........+.     ..       ...    ........+.       .........+          .. ..      ..       ..        ..   ..        ..  +. ..  +.     ....+         ........$        ....         ...                ..              ..                                         ",
+"  ...             ..%  %%  %..    ...   #.+                ..          .. ..      %..      ..        ..+ %..        ... .. ..+ ..    ... ...                        ..%           ...                ..              ..                                         ",
+"  ..              %......#+..#    ..     +..       ..........          .. ..       .........%         ..#..          +...   ....+   ...   ...         ....         .........      ...                 ..             .+                                         ",
+"  ..               %.........     ..      ..@     &..........          .. ..       #........           +..%          %..+   ....   ...     ...        ....        ...........     ...                 ..             .+                                         ",
+"                       ..                  ..                                                                                                                                     ...                                .+                                         ",
+"                                            ..                                                                                                                                    ...                                .+                                         ",
+"                                             ..                                                                                                                                    ..                               ..+                                         ",
+"                                                                                                                                                                                   +...                           ....                                          ",
+"                                                                                                                                                                                    %+.                            .%                                           ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"   ..             .........+      .........%       ........       ........+.       +........       +........       .+.......      ...      ...    ...                  ...        ...     ..&     ...              .+.       .%.   +%+      ..     %.......++   ",
+"                  .........+.     ..........#     +........        .........+     #.........      +.........      +.........      ...      ...    ...                  ...        ...   ...       ...             %...+     ....  %...+     ..     ..........#  ",
+"                           %.%            ...     +..                      ..     +.              +.+             +..             ...      ...    ...                  ...        ...  ..+        ...             ..#..     ..... ... .%    ..    +..      ..%  ",
+"                   ...........    ..........      ..               .       ..     ..........      ..........      ...  ....       ... *.......    ...                  ...        ...  ..         ...             ... ..   .. ... ...  .+   ..    ...       ..  ",
+"                  ............    ..........      ..              ...      ..     ..........      ..........      ...  .....      ... *.......    ...                  ...        ...  .%         ...             ... +.   .. ... ...  $..  ..    ...       ..  ",
+"                  ...      ...    ...      .+     ...             ...      ..     ...             ...             ...     ..      ...      ...    ...                  ...        ...  ...        ...             ...  .% +.  ... ...   +.. ..    +..       ..  ",
+"                  ............    ...........     %.+......       ..........+     %.........      ...             #.........      ...      ...    ...              ......+        ...   #.+       %.........      ...   ...#  ... ...    .....     ........%..  ",
+"                  .........%..    ...........      +.......       .........+       %........      ...              .........      ...      ...    ...             .......         ...     ..+      .........      ...   ...   ... ...     ...@     +........+   ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .........+.      .+......+.     .........+.      .........      ....... ....... ..       ..      ..       ..+   %..    ...    +. ...     ...    ...      ...    ..........      .               ...             .               .               .             ",
+"  ..........+     %..........%    ..........%     ..........       &&&#.. ....... ..       ..      %..      ..     ..    ...@   ..  ...   ..+     ...      ...     .........                      ...                                                           ",
+"           ..     +..      ..%             ..     ..+                  .. ..      ..       ..       ..     +.      ...   ....   ..   %.. ...      #..      ...                                    ..                                                            ",
+"  ..........+     ..       ...    ..........%     +........+           .. ..      ..       ..       +..   ..+       ..  .. .+  %.+    .....        ..........          ..                                                                                       ",
+"  .........+      ..       ...    .........+       .........+          .. ..      ..       ..        ..   ..        ..  +. ..  +.     ....+         ........$        ....                                                                                       ",
+"  ...             ..%  ++  %..    ...      .%              ..          .. ..      %..      ..         .+ +..        +.. ..  .+ ..    ... ...                        ..#                           &&                                                            ",
+"  ..              #......#+..#    ..       ..     &..........          .. ..       .........+         +.%..          +...   ....+   ...   ...         ....         .........                      ...                                                           ",
+"  ..               %.........     ..       ...    &..........          .. ..       #........           +..           %..+   ....   ...     ...        ....        ...........                     ...                                                           ",
+"                       ..                                                                                                                                                                                                                                       ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"  .               .               .               .               .               .               .               .               .               .                                                                                                             ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                  ..                   ..           .+.....                         ..      ...   ...                             .. ..                                                                                                                         ",
+"                  ..                   ...          ......                          ..      ...   ...                             ..  .                                                                                                                         ",
+"                                   %.......         ...                             ..      ...   ..                                                                                                                                                            ",
+"                  ..              +........       #%.....                         . +......... .                                                                                                                                                                ",
+"                  ..              +..  +.         .....%#                         #  .+.....+@ #                                                                                                                                                                ",
+"                  ..              ..   #.           ..                                            &&                                                                                                                                                            ",
+"                  ..              ..   &.           ......                              ...       ...                                                                                                                                                           ",
+"                  ..              ...  @.         +.......                             ....       ...                                                                                                                                                           ",
+"                                  +...@+...                                                                                                                                                                                                                     ",
+"                                   #.......                                                                                                                                                                                                                     ",
+"                                       ...                                                                                                                                                                                                                      ",
+"                                       ..                                                                                                                                                                                                                       ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                   ..                                                              ..+                                                                                                                ..        ",
+"                                                                                                                                                                                                                                                      ..        ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                   +....        ",
+"                                                                                                                                                                                                                                                  +.....        ",
+"                                                                                                                                                                                                                                                  ...           ",
+"                                                                                                                                                                                                                                                  +.......      ",
+"                                                                                                                                                                                                                                                   .......      ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"      .@               ..             ...             ...+           .. ..                        ..........%..... ........           +.                .%            .+.+           ..  .         ..              @.              ..+..           .  .         ",
+"                       *             %% #%           ...&            .  ..                         ...........@   #........                                                           .  .          %%                                             .  .         ",
+"   ........                                                                                                ..+    +..                ......                          ......                                        .                 .                          ",
+"  ...........     .........+      .........+      .........+      .........+                       .......+..%.......              +.........      %.........      +.........      %.........       ...           ...               ...             ..          ",
+"   ........%.     ...........     ...........     ...........     ...........      ........%      ...........#.......             +..........+     ..........%    +..........+     ..........%      ...           ...               ...             ..          ",
+"           ..+             %.%             %.%             %.%             %.%    ...........     ...      ..+    ..+             &..      +..    @..      +..    &..      +..    @..       ..      ...           ...               ...             ..          ",
+"   ...........     ...........     ...........     ...........     ...........             %.%    ........+....   +........       &...........    &...........    &...........    &...........      ...           ...               ...             ..          ",
+"  ............    ............    ............    ............    ............      ...... ...     .......+%...... ++......       &.........%     &.........+     &.........%     &.........+       ...           ...               ...             ..          ",
+"  ..       ...    ...      ...    ...      ...    ...      ...    ...      ...    +...........                        +..         #..             &..             #..             &..               ...           ...               ...             ..          ",
+"  ............    ............    ............    ............    ............    ...      ...                                     ...........     ..........      ...........     ..........       ...           ...               ...             ..          ",
+"   ........%..    .........+..    .........+..    .........+..    .........+..    ...      ...                                      +.........     %..........      +.........     %..........      ...           ...               ...             ..          ",
+"                    ......  .       ......  .       ......  .       ......  .     ............                                                       ........                        ........        .                                              ..          ",
+"                                                                                   .......+ ..                                                                                                                                                                  ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"   .........+          ....           ..+               ..            ....             ...#           .  ..                          .......+..       ..               &+.            ..+.           .@ .+              +.        ...             ..........    ",
+"    .........+        +..                               *                             ...             .  .                          +.........%                                                      .@  +                        .........++     ..+.......+   ",
+"            ..                       ......                          ......                                                        %..    ..%.+   ..       ..     ..       ..     ...      ..      .       ..      ..      ...    ...........     ..%     ...   ",
+"  .......   ..     +#%      ..     +........+      %.......+       +........+      %.......+       %.......+                       ...   %+  ..   ...      ..     ...      ..     ...      ..     ...      ..     ...      ...             ..     ..........    ",
+"  .......   ..    %...%     ..    +..........+    #..........     +..........+    #..........     #..........                      ...  ..   ..   ...      ..     ...      ..     ...      ..     ...      ..     +..      ...            ...     ...........   ",
+"   ...      ..    ..  .#    ..    ..       ..+    +..      ..%    ..       ..+    +..      ..%    +..      ..%                     ... +.    ..   ...      ..     ...      ..     ...      ..     ...      ..      ..........     ..........+     ..&      ..   ",
+"   ...........    ..   .%   ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ...++   #..   ...      ..     ...      ..     ...      ..     ...      ..      +........@     .........#      ..&  +.....   ",
+"   .........+     ..   &..  ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ..........    ...      ..     ...      ..     +..      ..     ...      ..                     ...             ..&  +.....   ",
+"                  ..    ... ..    +.+      #..    +.       ...    +..      #..    +.       ...    +..      ...                      .@......%     %..      .+     %..      .+     +..     ..+     %..      .+                     ..              ..&           ",
+"                  ..     .....    @..........     %........%..     ..........     %........%..    %........%..                                     ..........      ..........      +........       ..........         ....                        ..            ",
+"                  ..      ...@     %+......%+      +........+      %+......%+      +........+      +........+                                      @+.......       &+.......         .....+        &+.......          ....                                      ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"      .+               ..            .....            ...%          ... ..           .  +         ..........%..... ........           ..+              ..+            .+.#           ..  .          ..             ..%             ..+.%           .  .         ",
+"                                                     ...             .  ..           .  %          ........%..#   #........                                                           .  .                                                         .  .         ",
+"   ........        ........        ........        ........        ........          ...#                  ...    ...                .......         .......         .......                         ..            ..                .                          ",
+"  ...........     ...........     ...........     ...........     ...........                      ..................              +........       +........       +........        ........         ..           ...               ...             ..          ",
+"           %.+             %.+             %.+             %.+             %.+    .........%      ............    ...             %.+             %.+             %.+             #.........         ..           ...               ...             ..          ",
+"           ..+             ..+             ..+             ..+             ..+    ...........     ...      ...    ...             ..              ..              ..#             +.                 ..           ...               ...             ..          ",
+"  %...........    %...........    %...........    %...........    %...........             %.%    .............   +........       ..........      ..........      ..........      ..........         ..           ...               ...             ..          ",
+"  ............    ............    ............    ............    ............     +...... ...     ........%...... ++......       ..........      ..........      ..........      ..........         ..           ...               ...             ..          ",
+"  ..       ...    ..       ...    ..       ...    ..       ...    ...      ...    +...........                        ...         ...             ...             ...             ...                ..           ...               ...             ..          ",
+"  ............    ............    ............    ............    ............    ...      ...                       &@            .........       .........       .........      %.........         ..           ...               ...             ..          ",
+"   ........%..     ........%..     ........%..     ........%..     ........%..    ...      ...                                     @+.......       @+.......       @+.......       %........         ..           ...               ...             ..          ",
+"                                                                                  .........+..                                                                                                                                                                  ",
+"                                                                                   .......+ ..                                                                                                                                                                  ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"   ..........          +..%           %..              ..+            ....             ..++          ..  ..                          .......+..       ..               ...           ..%..           .. ..             ..@        ...                ..  .      ",
+"    .........+        +..                                                             +..             .  .                          +.........%                                                      ..  .                        .........++         .  .      ",
+"            ..      *                ......          ......          ......          ......          ......                        %..    ..#.+   ..       ..     ...      ..     ...      ..     ..       ..     ...      ...    ...........      ..      ..   ",
+"  .......   ..     ..++     ..     +........+      +........+      +........+      +........+      +........+                      ...   ++  ..   ...      ..     ...      ..     ...      ..     ...      ..     ...      ...             ..      ..      ...  ",
+"  .......   ..    +....#    ..    +..      ..+    +..      ..+    +..      ..+    +..      ..+    +..      ..+                     ...  ..   ..   ...      ..     ...      ..     ...      ..     ...      ..     %..      ...    ...........      ..      ...  ",
+"   ...      ..    ..  .+*   ..    ..       ..+    ..       ..+    ..       ..+    ..       ..+    ...      ..+                     ... +.    ..   ...      ..     ...      ..     ...      ..     ...      ..      +.........     ..........+      ..      ..   ",
+"   ...........    ..   ++   ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ...++...#..   ...      ..     ...      ..     ...      ..     ...      ..       ........@     ...              +........%   ",
+"   .........+     ..    +.  ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      .........+    ...      ..     +..      ..     +..      ..     ...      ..                     ...                +.....+    ",
+"                  ..     .....    +.+      #..    +..      #..    +..      #..    +..      #..    +..      #..                      .&......      %..     ..+     +..     ..+     +..     ..+     #..     ..+                      .                            ",
+"                  ..      ...+     ..........      ..........      ..........      ..........      ..........                                      ..........      %........       %........       ..........         ....                            ....      ",
+"                  ..       %+       +......%        +......%        +......%        +......%        +......%                                        +.....+.         .....+          .....+         +.......           ...                            ....      ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                "};
Index: trunk/src/lib/graphics/text_engine/font.cc
===================================================================
--- trunk/src/lib/graphics/text_engine/font.cc	(revision 5346)
+++ trunk/src/lib/graphics/text_engine/font.cc	(revision 5347)
@@ -24,5 +24,5 @@
 #include <SDL/SDL_image.h>
 #endif
-#include "font.xpm"
+#include "default_font.xpm"
 
 #include "debug.h"
@@ -32,5 +32,5 @@
 
 /**
- * constructs a Font
+ * constructs a Font out of a TTF-FIle
  * @param fontFile the File to load the font from
  * @param fontSize the Size of the Font in Pixels
@@ -41,25 +41,41 @@
 
   this->setSize(fontSize);
+  this->setStyle("c");
 
   if (fontFile != NULL)
     this->loadFont(fontFile);
-
-  this->setStyle("c");//TTF_STYLE_NORMAL);
-
-  this->fastTextureID = this->createFastTexture();
-
-
-//  this->createAsciiImage("test.bmp");
+}
+
+/**
+ * constructs a Font out of an ImageFile
+ * @param imageFile the ImageFile to load the Font From.
+ */
+Font::Font(const char* imageFile)
+{
+  this->init();
+  this->setName(imageFile);
+  //  this->setSize(fontSize);
+  SDL_Surface* image = NULL;
+  if (imageFile != NULL)
+    image = IMG_Load(imageFile);
+  else
+    return;
+  if (image != NULL)
+  {
+    this->loadFontFromSDL_Surface(image);
+    SDL_FreeSurface(image);
+  }
+  else
+    PRINTF(1)("loading from surface %s failed: %s\n", imageFile, IMG_GetError());
 }
 
 /**
  * constructs a Font
- * @param fontFile the File to load the font from
- * @param fontSize the Size of the Font in Pixels
+ * @param xpmArray the xpm-ARRAY to load the font from
  */
 Font::Font(char** xpmArray)
 {
   this->init();
-
+  this->setName("XPM-array-font");
   //  this->setSize(fontSize);
   SDL_Surface* image = NULL;
@@ -73,5 +89,4 @@
   else
     PRINTF(1)("loading from surface failed: %s\n", IMG_GetError());
-
 }
 
@@ -91,5 +106,6 @@
       if (this->glyphArray[i] != NULL)
       {
-        glDeleteLists(this->glyphArray[i]->displayList, 1);
+        if (this->glyphArray[i]->displayList != 0)
+          glDeleteLists(this->glyphArray[i]->displayList, 1);
         delete this->glyphArray[i];
       }
@@ -97,4 +113,9 @@
     delete[] this->glyphArray;
   }
+
+  //! @todo check if we really do not need to delete the fastTextureID here.
+//   if (this->fastTextureID != 0)
+//     if(glIsTexture(this->fastTextureID))
+//       glDeleteTextures(1, &this->fastTextureID);
 
   // erease this font out of the memory.
@@ -123,22 +144,34 @@
 bool Font::loadFont(const char* fontFile)
 {
-  if (!this->getName())
-  {
-    this->setName(fontFile);
-
-    this->font = TTF_OpenFont(this->getName(), this->fontSize);
-    if(!this->font)
-    {
-      PRINTF(1)("TTF_OpenFont: %s\n", TTF_GetError());
+  // checking for existent Font.
+  if (this->font != NULL)
+  {
+    TTF_CloseFont(this->font);
+    this->font = NULL;
+  }
+  if (this->fastTextureID != 0)
+  {
+    if(glIsTexture(this->fastTextureID))
+      glDeleteTextures(1, &this->fastTextureID);
+    this->fastTextureID = 0;
+  }
+
+  this->setName(fontFile);
+  this->font = TTF_OpenFont(this->getName(), this->fontSize);
+
+  if(this->font != NULL)
+  {
+    this->fastTextureID = this->createFastTexture();
+    if (this->fastTextureID != 0)
+      return true;
+    else
       return false;
-    }
-    else
-      return true;
   }
   else
   {
-    PRINTF(2)("Font already initialized, unable to change it now.\n");
+    PRINTF(1)("TTF_OpenFont: %s\n", TTF_GetError());
     return false;
   }
+
 }
 
@@ -152,4 +185,17 @@
   if(surface == NULL)
     return false;
+
+  if (this->font != NULL)
+  {
+    TTF_CloseFont(this->font);
+    this->font = NULL;
+  }
+  if (this->fastTextureID != 0)
+  {
+    if(glIsTexture(this->fastTextureID))
+      glDeleteTextures(1, &this->fastTextureID);
+    this->fastTextureID = 0;
+  }
+
   this->fastTextureID = Text::loadTexture(surface, NULL);
 
@@ -195,6 +241,6 @@
 /**
  *  sets a specific renderStyle
- * @param renderStyle the Style to render: a char-array containing:
-   i: italic, b: bold, u, underline
+ * @param renderStyle the Style to render: a string (char-array) containing:
+ *   i: italic, b: bold, u, underline
  */
 void Font::setStyle(const char* renderStyle)
@@ -212,6 +258,6 @@
   if (likely(this->font != NULL))
     TTF_SetFontStyle(this->font, this->renderStyle);
-  else
-    PRINTF(2)("Font was not initialized, please do so before setting the Font-Style.\n");
+//  else
+//    PRINTF(2)("Font was not initialized, please do so before setting the Font-Style.\n");
 }
 
@@ -363,4 +409,5 @@
 {
   Glyph* rg = new Glyph;
+  rg->displayList = 0;
   rg->character = character;
   if (likely (this->font!= NULL))
@@ -537,5 +584,5 @@
  * @returns the optimal size to use as the texture size
 
-   @todo: this algorithm can be a lot more faster, althought it does
+   @todo: this algorithm can be a lot faster, althought it does
    not really matter within the init-context, and 128 glyphs.
 
@@ -545,4 +592,7 @@
 int Font::findOptimalFastTextureSize()
 {
+  if (this->glyphArray == NULL)
+    return 0;
+
   int i;
   int x,y; // the counters
@@ -555,5 +605,5 @@
   {
     x = 0; y = 0;
-    for (i = 0; i <= FONT_HIGHEST_KNOWN_CHAR; i++)
+    for (i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
     {
       if((tmpGlyph = this->glyphArray[i]) != NULL)
Index: trunk/src/lib/graphics/text_engine/font.h
===================================================================
--- trunk/src/lib/graphics/text_engine/font.h	(revision 5346)
+++ trunk/src/lib/graphics/text_engine/font.h	(revision 5347)
@@ -31,5 +31,5 @@
 //! A struct for handling glyphs
 /**
-   a Glyph is one letter of a certain font
+ * a Glyph is one letter of a certain font
  */
 struct Glyph
@@ -56,5 +56,5 @@
 /// FONT ///
 ////////////
-//! A class to handle a Font of a certain ttf-File, Size and Color.
+//! A class to handle a Font of a certain ttf-File/image-file, Size.
 class Font : public BaseObject
 {
@@ -64,4 +64,5 @@
     Font(const char* fontFile,
          unsigned int fontSize);
+    Font(const char* imageFile);
     Font(char** xpmArray);
     virtual ~Font();
@@ -102,5 +103,5 @@
   private:
     static Font*  defaultFont;         //!< a default font, that is used, if other fonts were unable to be loaded.
-  // information about the Font
+    // information about the Font
     TTF_Font*     font;                //!< The font we use for this.
     unsigned int  fontSize;            //!< The size of the font in pixels. each Font has one size.
Index: trunk/src/lib/graphics/text_engine/font.xpm
===================================================================
--- trunk/src/lib/graphics/text_engine/font.xpm	(revision 5346)
+++ 	(revision )
@@ -1,268 +1,0 @@
-/* XPM */
-static char * font_xpm[] = {
-"256 256 9 1",
-" 	c None",
-".	c #FEFEFE",
-"+	c #FDFDFD",
-"@	c #FAFAFA",
-"#	c #FBFBFB",
-"$	c #F8F8F8",
-"%	c #FCFCFC",
-"&	c #F9F9F9",
-"*	c #F7F7F7",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .               .               .               .               .               .               .               .               .     .         .     .         .     .         .     .         .     .         .     .         .     .       ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .               .               .               .               .               .               .               .               .               .               .               .               .               .               .             ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .               .               .               .               .               .               .               .               .               .               .     .         .     .         .     .         .     .         .     .       ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .               .               .               .               .               .               .               .               .               .               .               .               .               .               .             ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                  ..              ...             .                    ..         .                 +......       ..                 ..            .              .               .               ..              .               ..                   ..       ",
-"                  ..              ...                                 ...                          ........       .+               +...           ...+                                            ..                              ..                  ..        ",
-"                  ..              ...                              .........                       ..              @               ..               ..+                                            #                                                  .+        ",
-"                  ..                                              ..........                        ...                           ...                ..                                                                                              ..$        ",
-"                  ++                                              ... #..                          ...++  .+                      ...                ..                                                                                             #..         ",
-"                                                                  %......%%%.                     ...  %....                      ...                ..                                                                                             ..          ",
-"                  ..                                               +........+                     ..........+                     ...                .+                                                                                            +..          ",
-"                  ..                              .                    ..  ..     .               ...........#                    ...                .+           .               .                               .                                ..           ",
-"                  ..                                              &..........                       .....+                        ...                .+                                                                                            %@           ",
-"                                                                  &.........%                                                     ...                .+                                                                                                         ",
-"                                                                      ...                                                          ..               ..+                                                                                                         ",
-"                                                                                                                                   +...           ....#                                                                                                         ",
-"                                                                                                                                    ++.           ..%                                                                                                           ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"   .+....+#        ....           ..........      ..........             ..       ...........      +%.++%%##      ..........       .......+        +.....+%       ..              ..              .               .               .                ......       ",
-"  ..........      .....           ..........      ........%              ..       ...........      .........      ..........       ........+      &........+      ..              ..                                                               ......+      ",
-"  ...     .+        ...                   %.                      ..     ..                                                        ..    ..+      &..     ..                                                                                           ...      ",
-"  ..      ..        ...            +........             ..+      ..........       ........%      .........                        ........       @.........      ..              ..                                                                .....+      ",
-"  ..      ..        ...           ..........            .....     ..........       .........%     ..........           ..%         ........+       +........      ..              ..                                                                .....       ",
-"  ..      ..        ...                                   ...                             ...     ...     ..          @.+         ...     ..#                                      #                                                                            ",
-"  %......#.+        ...           ..........       ..........            ..        ..........     #..@@%+...         ...          ..........$      ........                                                                                          .          ",
-"   ........         ...           ...........     &.........             ..       &.........+      +........        ..+           ..........      .........                                                                                         ..          ",
-"     ....+           .            ..........       ........              ..        ........+         ......         ..              .......        ......+                                                                                           .          ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .........+      .........%       ........       ........+.       %.........      +........       .+.......      ...      ...    ...                  ...        ...     ..&     ...              .%.       .#.   +#%      ..     %.......+    ",
-"                  ...........     ..........#     .........       ..........+     +..........%    +.........      ..........      ...      ...    ...                  ...        ...   ++.       ...             %...+     ....  %...+     ..     ..........@  ",
-"                           %.%            ...     +..                      ..     @.       +..    +.+             +..             ...      ...    ...                  ...        ...  ..+        ...             ..#..     ..... ... .#    ..    +..      ..%  ",
-"                   ...........    ..........      ..                       ..     &...........    ..........      ...  ....       ... *.......    ...                  ...        ...  ..         ...             ... ..   .. ... ...  .%   ..    ...       ..  ",
-"                  ............    ..........      ..              ...      ..     &.........+     ..........      ...  .....      ... *.......    ...                  ...        ...  .#         ...             ... +.   .. ... ...  $..  ..    ...       ..  ",
-"                  ...      ...    ...      .+     ..              ...      ..     &..             ...             ...     ..      ...      ...    ...                  ...        ...  ...        ...             ...  .% +.  ... ...   +.. ..    +..       ..  ",
-"                  ............    ...........     %.+......       ..........+      ..........     ...             #.........      ...      ...    ...              ......+        ...   #.+       %.........      ...  ....#  ... ...    .....    %........#..  ",
-"  .               .........%..    ...........      +.......       ..........       %..........    ...              .........      ...      ...    ...             .......         ...    ...       .........      ...   ...   ... ...     ...@     +........+   ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .........%.      .+......+.     .........%       .........      ....... ....... ..       ..      ..       ..+   %..    ...    +. ...     ...    ...      ...    ..........         ..            ..              ..             .               ........      ",
-"  ..........+     %..........+    ..........#     ..........      &&&&#.. ....... ..       ..      %..      ..     ..    ...@   ..  ...   ..+     ...      ...     .........       ....            ..              ...                                          ",
-"           ..     %..      ..%            ...     ..+                  .. ..      ..       ..       ..     +.      ...   ....   ..   %.. ...      %..      ...                     ..               ..              ..+                                         ",
-"  ..........+     ..       ...    ..........%     .........+           .. ..      ..       ..       ..+   ..+       ..  .. .+  %..    .....        ..........                     ...               ..               ..                                         ",
-"  .........+.     ..       ...    ........+.       .........+          .. ..      ..       ..        ..   ..        ..  +. ..  +.     ....+         ........$        ....         ...                ..              ..                                         ",
-"  ...             ..%  %%  %..    ...   #.+                ..          .. ..      %..      ..        ..+ %..        ... .. ..+ ..    ... ...                        ..%           ...                ..              ..                                         ",
-"  ..              %......#+..#    ..     +..       ..........          .. ..       .........%         ..#..          +...   ....+   ...   ...         ....         .........      ...                 ..             .+                                         ",
-"  ..               %.........     ..      ..@     &..........          .. ..       #........           +..%          %..+   ....   ...     ...        ....        ...........     ...                 ..             .+                                         ",
-"                       ..                  ..                                                                                                                                     ...                                .+                                         ",
-"                                            ..                                                                                                                                    ...                                .+                                         ",
-"                                             ..                                                                                                                                    ..                               ..+                                         ",
-"                                                                                                                                                                                   +...                           ....                                          ",
-"                                                                                                                                                                                    %+.                            .%                                           ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"   ..             .........+      .........%       ........       ........+.       +........       +........       .+.......      ...      ...    ...                  ...        ...     ..&     ...              .+.       .%.   +%+      ..     %.......++   ",
-"                  .........+.     ..........#     +........        .........+     #.........      +.........      +.........      ...      ...    ...                  ...        ...   ...       ...             %...+     ....  %...+     ..     ..........#  ",
-"                           %.%            ...     +..                      ..     +.              +.+             +..             ...      ...    ...                  ...        ...  ..+        ...             ..#..     ..... ... .%    ..    +..      ..%  ",
-"                   ...........    ..........      ..               .       ..     ..........      ..........      ...  ....       ... *.......    ...                  ...        ...  ..         ...             ... ..   .. ... ...  .+   ..    ...       ..  ",
-"                  ............    ..........      ..              ...      ..     ..........      ..........      ...  .....      ... *.......    ...                  ...        ...  .%         ...             ... +.   .. ... ...  $..  ..    ...       ..  ",
-"                  ...      ...    ...      .+     ...             ...      ..     ...             ...             ...     ..      ...      ...    ...                  ...        ...  ...        ...             ...  .% +.  ... ...   +.. ..    +..       ..  ",
-"                  ............    ...........     %.+......       ..........+     %.........      ...             #.........      ...      ...    ...              ......+        ...   #.+       %.........      ...   ...#  ... ...    .....     ........%..  ",
-"                  .........%..    ...........      +.......       .........+       %........      ...              .........      ...      ...    ...             .......         ...     ..+      .........      ...   ...   ... ...     ...@     +........+   ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .........+.      .+......+.     .........+.      .........      ....... ....... ..       ..      ..       ..+   %..    ...    +. ...     ...    ...      ...    ..........      .               ...             .               .               .             ",
-"  ..........+     %..........%    ..........%     ..........       &&&#.. ....... ..       ..      %..      ..     ..    ...@   ..  ...   ..+     ...      ...     .........                      ...                                                           ",
-"           ..     +..      ..%             ..     ..+                  .. ..      ..       ..       ..     +.      ...   ....   ..   %.. ...      #..      ...                                    ..                                                            ",
-"  ..........+     ..       ...    ..........%     +........+           .. ..      ..       ..       +..   ..+       ..  .. .+  %.+    .....        ..........          ..                                                                                       ",
-"  .........+      ..       ...    .........+       .........+          .. ..      ..       ..        ..   ..        ..  +. ..  +.     ....+         ........$        ....                                                                                       ",
-"  ...             ..%  ++  %..    ...      .%              ..          .. ..      %..      ..         .+ +..        +.. ..  .+ ..    ... ...                        ..#                           &&                                                            ",
-"  ..              #......#+..#    ..       ..     &..........          .. ..       .........+         +.%..          +...   ....+   ...   ...         ....         .........                      ...                                                           ",
-"  ..               %.........     ..       ...    &..........          .. ..       #........           +..           %..+   ....   ...     ...        ....        ...........                     ...                                                           ",
-"                       ..                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"  .               .               .               .               .               .               .               .               .               .                                                                                                             ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                  ..                   ..           .+.....                         ..      ...   ...                             .. ..                                                                                                                         ",
-"                  ..                   ...          ......                          ..      ...   ...                             ..  .                                                                                                                         ",
-"                                   %.......         ...                             ..      ...   ..                                                                                                                                                            ",
-"                  ..              +........       #%.....                         . +......... .                                                                                                                                                                ",
-"                  ..              +..  +.         .....%#                         #  .+.....+@ #                                                                                                                                                                ",
-"                  ..              ..   #.           ..                                            &&                                                                                                                                                            ",
-"                  ..              ..   &.           ......                              ...       ...                                                                                                                                                           ",
-"                  ..              ...  @.         +.......                             ....       ...                                                                                                                                                           ",
-"                                  +...@+...                                                                                                                                                                                                                     ",
-"                                   #.......                                                                                                                                                                                                                     ",
-"                                       ...                                                                                                                                                                                                                      ",
-"                                       ..                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                   ..                                                              ..+                                                                                                                ..        ",
-"                                                                                                                                                                                                                                                      ..        ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                   +....        ",
-"                                                                                                                                                                                                                                                  +.....        ",
-"                                                                                                                                                                                                                                                  ...           ",
-"                                                                                                                                                                                                                                                  +.......      ",
-"                                                                                                                                                                                                                                                   .......      ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"      .@               ..             ...             ...+           .. ..                        ..........%..... ........           +.                .%            .+.+           ..  .         ..              @.              ..+..           .  .         ",
-"                       *             %% #%           ...&            .  ..                         ...........@   #........                                                           .  .          %%                                             .  .         ",
-"   ........                                                                                                ..+    +..                ......                          ......                                        .                 .                          ",
-"  ...........     .........+      .........+      .........+      .........+                       .......+..%.......              +.........      %.........      +.........      %.........       ...           ...               ...             ..          ",
-"   ........%.     ...........     ...........     ...........     ...........      ........%      ...........#.......             +..........+     ..........%    +..........+     ..........%      ...           ...               ...             ..          ",
-"           ..+             %.%             %.%             %.%             %.%    ...........     ...      ..+    ..+             &..      +..    @..      +..    &..      +..    @..       ..      ...           ...               ...             ..          ",
-"   ...........     ...........     ...........     ...........     ...........             %.%    ........+....   +........       &...........    &...........    &...........    &...........      ...           ...               ...             ..          ",
-"  ............    ............    ............    ............    ............      ...... ...     .......+%...... ++......       &.........%     &.........+     &.........%     &.........+       ...           ...               ...             ..          ",
-"  ..       ...    ...      ...    ...      ...    ...      ...    ...      ...    +...........                        +..         #..             &..             #..             &..               ...           ...               ...             ..          ",
-"  ............    ............    ............    ............    ............    ...      ...                                     ...........     ..........      ...........     ..........       ...           ...               ...             ..          ",
-"   ........%..    .........+..    .........+..    .........+..    .........+..    ...      ...                                      +.........     %..........      +.........     %..........      ...           ...               ...             ..          ",
-"                    ......  .       ......  .       ......  .       ......  .     ............                                                       ........                        ........        .                                              ..          ",
-"                                                                                   .......+ ..                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"   .........+          ....           ..+               ..            ....             ...#           .  ..                          .......+..       ..               &+.            ..+.           .@ .+              +.        ...             ..........    ",
-"    .........+        +..                               *                             ...             .  .                          +.........%                                                      .@  +                        .........++     ..+.......+   ",
-"            ..                       ......                          ......                                                        %..    ..%.+   ..       ..     ..       ..     ...      ..      .       ..      ..      ...    ...........     ..%     ...   ",
-"  .......   ..     +#%      ..     +........+      %.......+       +........+      %.......+       %.......+                       ...   %+  ..   ...      ..     ...      ..     ...      ..     ...      ..     ...      ...             ..     ..........    ",
-"  .......   ..    %...%     ..    +..........+    #..........     +..........+    #..........     #..........                      ...  ..   ..   ...      ..     ...      ..     ...      ..     ...      ..     +..      ...            ...     ...........   ",
-"   ...      ..    ..  .#    ..    ..       ..+    +..      ..%    ..       ..+    +..      ..%    +..      ..%                     ... +.    ..   ...      ..     ...      ..     ...      ..     ...      ..      ..........     ..........+     ..&      ..   ",
-"   ...........    ..   .%   ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ...++   #..   ...      ..     ...      ..     ...      ..     ...      ..      +........@     .........#      ..&  +.....   ",
-"   .........+     ..   &..  ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ..........    ...      ..     ...      ..     +..      ..     ...      ..                     ...             ..&  +.....   ",
-"                  ..    ... ..    +.+      #..    +.       ...    +..      #..    +.       ...    +..      ...                      .@......%     %..      .+     %..      .+     +..     ..+     %..      .+                     ..              ..&           ",
-"                  ..     .....    @..........     %........%..     ..........     %........%..    %........%..                                     ..........      ..........      +........       ..........         ....                        ..            ",
-"                  ..      ...@     %+......%+      +........+      %+......%+      +........+      +........+                                      @+.......       &+.......         .....+        &+.......          ....                                      ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"      .+               ..            .....            ...%          ... ..           .  +         ..........%..... ........           ..+              ..+            .+.#           ..  .          ..             ..%             ..+.%           .  .         ",
-"                                                     ...             .  ..           .  %          ........%..#   #........                                                           .  .                                                         .  .         ",
-"   ........        ........        ........        ........        ........          ...#                  ...    ...                .......         .......         .......                         ..            ..                .                          ",
-"  ...........     ...........     ...........     ...........     ...........                      ..................              +........       +........       +........        ........         ..           ...               ...             ..          ",
-"           %.+             %.+             %.+             %.+             %.+    .........%      ............    ...             %.+             %.+             %.+             #.........         ..           ...               ...             ..          ",
-"           ..+             ..+             ..+             ..+             ..+    ...........     ...      ...    ...             ..              ..              ..#             +.                 ..           ...               ...             ..          ",
-"  %...........    %...........    %...........    %...........    %...........             %.%    .............   +........       ..........      ..........      ..........      ..........         ..           ...               ...             ..          ",
-"  ............    ............    ............    ............    ............     +...... ...     ........%...... ++......       ..........      ..........      ..........      ..........         ..           ...               ...             ..          ",
-"  ..       ...    ..       ...    ..       ...    ..       ...    ...      ...    +...........                        ...         ...             ...             ...             ...                ..           ...               ...             ..          ",
-"  ............    ............    ............    ............    ............    ...      ...                       &@            .........       .........       .........      %.........         ..           ...               ...             ..          ",
-"   ........%..     ........%..     ........%..     ........%..     ........%..    ...      ...                                     @+.......       @+.......       @+.......       %........         ..           ...               ...             ..          ",
-"                                                                                  .........+..                                                                                                                                                                  ",
-"                                                                                   .......+ ..                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"   ..........          +..%           %..              ..+            ....             ..++          ..  ..                          .......+..       ..               ...           ..%..           .. ..             ..@        ...                ..  .      ",
-"    .........+        +..                                                             +..             .  .                          +.........%                                                      ..  .                        .........++         .  .      ",
-"            ..      *                ......          ......          ......          ......          ......                        %..    ..#.+   ..       ..     ...      ..     ...      ..     ..       ..     ...      ...    ...........      ..      ..   ",
-"  .......   ..     ..++     ..     +........+      +........+      +........+      +........+      +........+                      ...   ++  ..   ...      ..     ...      ..     ...      ..     ...      ..     ...      ...             ..      ..      ...  ",
-"  .......   ..    +....#    ..    +..      ..+    +..      ..+    +..      ..+    +..      ..+    +..      ..+                     ...  ..   ..   ...      ..     ...      ..     ...      ..     ...      ..     %..      ...    ...........      ..      ...  ",
-"   ...      ..    ..  .+*   ..    ..       ..+    ..       ..+    ..       ..+    ..       ..+    ...      ..+                     ... +.    ..   ...      ..     ...      ..     ...      ..     ...      ..      +.........     ..........+      ..      ..   ",
-"   ...........    ..   ++   ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      ...++...#..   ...      ..     ...      ..     ...      ..     ...      ..       ........@     ...              +........%   ",
-"   .........+     ..    +.  ..    ..       ...    ..       ...    ..       ...    ..       ...    ...      ...                      .........+    ...      ..     +..      ..     +..      ..     ...      ..                     ...                +.....+    ",
-"                  ..     .....    +.+      #..    +..      #..    +..      #..    +..      #..    +..      #..                      .&......      %..     ..+     +..     ..+     +..     ..+     #..     ..+                      .                            ",
-"                  ..      ...+     ..........      ..........      ..........      ..........      ..........                                      ..........      %........       %........       ..........         ....                            ....      ",
-"                  ..       %+       +......%        +......%        +......%        +......%        +......%                                        +.....+.         .....+          .....+         +.......           ...                            ....      ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                "};
Index: trunk/src/lib/graphics/text_engine/text_engine.cc
===================================================================
--- trunk/src/lib/graphics/text_engine/text_engine.cc	(revision 5346)
+++ trunk/src/lib/graphics/text_engine/text_engine.cc	(revision 5347)
@@ -76,5 +76,5 @@
     delete textIterator;
   }
-  // delete all remaining fonts (this is done in the ResourceManager)
+  // delete all remaining fonts (There should not be Anything to do here)
   tList<BaseObject>* fontList = ClassList::getList(CL_FONT);
   if (fontList != NULL)
@@ -127,7 +127,7 @@
 /**
  *  outputs some nice Debug information
-
-   @todo there should also be something outputted about Font
-*/
+ *
+ * @todo there should also be something outputted about Font
+ */
 void TextEngine::debug() const
 {
Index: trunk/src/lib/graphics/text_engine/text_engine.h
===================================================================
--- trunk/src/lib/graphics/text_engine/text_engine.h	(revision 5346)
+++ trunk/src/lib/graphics/text_engine/text_engine.h	(revision 5347)
@@ -1,16 +1,16 @@
 /*!
  * @file text_engine.h
-  *  Definition of textEngine, the Font and the Text
-
-    Text is the text outputed.
-    Font is a class that loads a certain ttf-file with a specific height into memory
-    TextEngine is used to manage the all the different Fonts that might be included
-
-    for more information see the specific classes.
-
-    !! IMPORTANT !! When using ttf fonts clear the license issues prior to
-   adding them to orxonox. This is really important, because we do not want
-   to offend anyone.
-*/
+ *  Definition of textEngine, the Font and the Text
+ *
+ * Text is the text outputed.
+ * Font is a class that loads a certain ttf-file with a specific height into memory
+ * TextEngine is used to manage the all the different Fonts that might be included
+ *
+ *   for more information see the specific classes.
+ *
+ *  !! IMPORTANT !! When using ttf fonts clear the license issues prior to
+ * adding them to orxonox. This is really important, because we do not want
+ * to offend anyone.
+ */
 
 #ifndef _TEXT_ENGINE_H
@@ -26,8 +26,5 @@
 class Text;
 
-///////////////////
-/// TEXT-ENGINE ///
-///////////////////
-//! A singleton Class that operates as a Handler for generating and rendering Text in 2D
+//! A singleton Class that operates as a Handler initializing FONTS.
 class TextEngine : public BaseObject
 {
