Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4681 in orxonox.OLD for orxonox/trunk


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/graphics/graphics_engine.cc

    r4663 r4681  
    157157    fullscreenFlag = 0;
    158158
    159   printf ("ok\n");
    160159  if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags | fullscreenFlag)) == NULL)
    161160    {
     
    339338    {
    340339#ifndef NO_TEXT
    341       this->geTextCFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
     340      this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
    342341      this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
    343342      this->geTextCFPS->setPosition(5, 500);
    344       this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
     343      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
    345344      this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
    346345      this->geTextMaxFPS->setPosition(5, 530);
    347       this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
     346      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
    348347      this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
    349348      this->geTextMinFPS->setPosition(5, 560);
  • orxonox/trunk/src/lib/graphics/graphics_engine.h

    r4619 r4681  
    5959    void listModes(void);
    6060
     61    /** \brief swaps the GL_BUFFERS */
     62    static void swapBuffers(void) { SDL_GL_SwapBuffers(); };
     63
    6164  public:
    6265    static bool texturesEnabled;
  • orxonox/trunk/src/lib/graphics/text_engine.cc

    r4597 r4681  
    254254      glTranslatef(pos.x, pos.y, 0);
    255255
    256       //      printf("%d, %d\n", this->font->getFastTextureID(), glyphArray[65]->displayList);
    257256      char* tmpText = this->text;
    258257      while (*tmpText != '\0')
  • orxonox/trunk/src/story_entities/world.cc

    r4664 r4681  
    10721072         until there is need or time to do it the other way around.
    10731073         \todo: GraphicsEngine ticks world: separation of processes and data...
     1074
     1075        bensch: in my opinion the GraphicsEngine could draw the world, but not tick it,
     1076         beceause graphics have nothing(or at least not much) to do with Motion.
    10741077      */
    10751078      GraphicsEngine::getInstance()->tick(this->dtS);
     
    11101113  /* \todo draw HUD */
    11111114  // flip buffers
    1112   SDL_GL_SwapBuffers();
     1115  GraphicsEngine::swapBuffers();
    11131116  //SDL_Surface* screen = Orxonox::getInstance()->getScreen ();
    11141117  //SDL_Flip (screen);
Note: See TracChangeset for help on using the changeset viewer.