Changeset 3707 in orxonox.OLD

Timestamp:

Apr 1, 2005, 12:11:24 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: now the Font is dynamical. See the fps

Location:

orxonox/branches/textEngine

Files:

• config.h.in (modified) (1 diff)
• configure (modified) (2 diffs)
• src/lib/graphics/font/glfont.h (modified) (1 diff)
• src/story_entities/world.cc (modified) (2 diffs)

orxonox/branches/textEngine/config.h.in

@@ -58 +58 @@
 /* Define to 1 if you have the <SDL_image.h> header file. */
 #undef HAVE_SDL_IMAGE_H
-
-/* Define to 1 if you have the <SDL/SDL.h> header file. */
-#undef HAVE_SDL_SDL_H
 
 /* Define to 1 if you have the <SDL_ttf.h> header file. */

orxonox/branches/textEngine/configure

@@ -4132 +4132 @@
 echo "mingw-WINDOWS detected"
 
+CPPFLAGS="-I/usr/include/SDL -I/mingw/include/SDL"
+
     mingw="yes"
     MSBITFIELDS="-mms-bitfields"
@@ -4738 +4740 @@
 # checking for SDL-headers
 
-for ac_header in SDL/SDL.h
+for ac_header in SDL.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

orxonox/branches/textEngine/src/lib/graphics/font/glfont.h

@@ -12 +12 @@
 
 /* some default values */
-#define FONT_DEFAULT_SIZE       18                   //!< default size of the Text
+#define FONT_DEFAULT_SIZE       50                   //!< default size of the Text
 #define FONT_DEFAULT_TEXT       "orxonox 1234567890" //!< some default text to display
 #define FONT_DEFAULT_COLOR_R    256                  //!< the default red part (color) of the text

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

@@ -203 +203 @@
       testFont = new FontSet();
       testFont->buildFont("../data/pictures/font.tga");
-      tmpFont = new GLFont("../data/fonts/refluxed.ttf");
+      tmpFont = new GLFont("../data/fonts/dark_crystal.ttf");
       this->glmis->step();
       // initializing the TrackManager
@@ -747 +747 @@
         {
           float fps = 1000/dt;
-          PRINTF(0)("fps = %f\n", fps);
+
+          // temporary, only for showing how fast the text-engine is
           char tmpChar[20];
-          sprintf(tmpChar, "fps: %d", rand());
+          sprintf(tmpChar, "fps: %4.0f", fps);
           tmpFont->setText(tmpChar);
           tmpFont->createTexture();