Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8757 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 23, 2006, 8:41:13 PM (18 years ago)
Author:
bensch
Message:

font: looks same as before

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fontdata/src/lib/graphics/text_engine/font.cc

    r8756 r8757  
    3333  : data(Font::defaultFontData)
    3434{
    35   printf("Font()\n");
    3635  this->init();
    3736
     
    4645  : data(Font::defaultFontData)
    4746{
    48   printf("Font(const std::string& fontFile, unsigned int renderSize)\n");
    4947  this->init();
    50 
    51   assert(data.get() != NULL);
    52 
    53   this->setStyle("c");
    5448
    5549  if (!fontFile.empty())
     
    6458  : data(Font::defaultFontData)
    6559{
    66   printf("Font(const std::string& imageFile)\n");
    6760  this->init();
    6861
     
    9083  : data(Font::defaultFontData)
    9184{
    92   printf("Font(char** xpmArray)\n");
    93 
    9485  this->init();
    9586  this->setName("XPM-array-font");
     
    156147  this->setName(fontFile);
    157148  this->data->fontTTF = TTF_OpenFont(fontFile.c_str(), renderSize);
     149  this->data->renderSize = renderSize;
    158150
    159151  if(this->data->fontTTF != NULL)
    160152  {
     153    this->setStyle("c");
    161154    this->createFastTexture();
    162155    if (this->getTexture() != 0)
Note: See TracChangeset for help on using the changeset viewer.