Changeset 4681 in orxonox.OLD

Timestamp:

Jun 24, 2005, 12:32:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer font, and now i should reimplement font

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -157 +157 @@
     fullscreenFlag = 0;
 
-  printf ("ok\n");
   if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags | fullscreenFlag)) == NULL)
     {
@@ -339 +338 @@
     {
 #ifndef NO_TEXT
-      this->geTextCFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextCFPS->setPosition(5, 500);
-      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMaxFPS->setPosition(5, 530);
-      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMinFPS->setPosition(5, 560);

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -59 +59 @@
     void listModes(void);
 
+    /** \brief swaps the GL_BUFFERS */
+    static void swapBuffers(void) { SDL_GL_SwapBuffers(); };
+
   public:
     static bool texturesEnabled;

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -254 +254 @@
       glTranslatef(pos.x, pos.y, 0);
 
-      //      printf("%d, %d\n", this->font->getFastTextureID(), glyphArray[65]->displayList);
       char* tmpText = this->text;
       while (*tmpText != '\0')

orxonox/trunk/src/story_entities/world.cc

@@ -1072 +1072 @@
          until there is need or time to do it the other way around.
          \todo: GraphicsEngine ticks world: separation of processes and data...
+
+        bensch: in my opinion the GraphicsEngine could draw the world, but not tick it,
+         beceause graphics have nothing(or at least not much) to do with Motion.
       */
       GraphicsEngine::getInstance()->tick(this->dtS);
@@ -1110 +1113 @@
   /* \todo draw HUD */
   // flip buffers
-  SDL_GL_SwapBuffers();
+  GraphicsEngine::swapBuffers();
   //SDL_Surface* screen = Orxonox::getInstance()->getScreen ();
   //SDL_Flip (screen);