Changeset 3754 in orxonox.OLD

Timestamp:

Apr 8, 2005, 12:01:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: taken out the fontSet

Location:

orxonox/branches/textEngine/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• lib/graphics/font/fontset.cc (deleted)
• lib/graphics/font/fontset.h (deleted)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)

orxonox/branches/textEngine/src/Makefile.am

@@ -55 +55 @@
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
-                 lib/graphics/font/fontset.cc \
                  lib/graphics/font/glfont.cc \
                  lib/graphics/importer/array.cc \
@@ -112 +111 @@
                  lib/graphics/light.h \
                  lib/graphics/font/glfont.h \
-                 lib/graphics/font/fontset.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \

orxonox/branches/textEngine/src/Makefile.in

@@ -64 +64 @@
         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
-        fontset.$(OBJEXT) glfont.$(OBJEXT) array.$(OBJEXT) \
-        objModel.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
-        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
-        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
-        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
-        glmenu_imagescreen.$(OBJEXT)
+        glfont.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
+        primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
+        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -82 +81 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/fontset.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
@@ -263 +262 @@
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
-                 lib/graphics/font/fontset.cc \
                  lib/graphics/font/glfont.cc \
                  lib/graphics/importer/array.cc \
@@ -320 +318 @@
                  lib/graphics/light.h \
                  lib/graphics/font/glfont.h \
-                 lib/graphics/font/fontset.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \
@@ -420 +417 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@
@@ -773 +769 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`
-
-fontset.o: lib/graphics/font/fontset.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'lib/graphics/font/fontset.cc' || echo '$(srcdir)/'`lib/graphics/font/fontset.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/font/fontset.cc' object='fontset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.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 fontset.o `test -f 'lib/graphics/font/fontset.cc' || echo '$(srcdir)/'`lib/graphics/font/fontset.cc
-
-fontset.obj: lib/graphics/font/fontset.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.obj -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.obj `if test -f 'lib/graphics/font/fontset.cc'; then $(CYGPATH_W) 'lib/graphics/font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/font/fontset.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/font/fontset.cc' object='fontset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.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 fontset.obj `if test -f 'lib/graphics/font/fontset.cc'; then $(CYGPATH_W) 'lib/graphics/font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/font/fontset.cc'; fi`
 
 glfont.o: lib/graphics/font/glfont.cc

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -38 +38 @@
 #include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "fontset.h"
 #include "glfont.h"
 #include "list.h"
@@ -201 +200 @@
     {
       // initializing Font
-      testFont = new FontSet();
-      testFont->buildFont("../data/pictures/font.tga");
-      tmpFont = new GLFont("../data/fonts/dark_crystal.ttf");
+      tmpFont = new GLFont("../data/fonts/earth.ttf");
       this->glmis->step();
       // initializing the TrackManager
@@ -595 +592 @@
   skySphere->draw();
 
-  testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
   tmpFont->draw();
 

orxonox/branches/textEngine/src/story_entities/world.h

@@ -21 +21 @@
 class Skysphere;
 class LightManager;
-class FontSet;
 class GLFont;
 class Terrain;
@@ -96 +95 @@
   bool bPause;                  //!< pause mode
 
-  FontSet* testFont;            //!< A test Font. \todo fix this, so it is for real.
   GLFont* tmpFont;              //!< tmpFont \todo fix
   GLMenuImageScreen* glmis;     //!< The Level-Loader Display