Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5421 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 22, 2005, 2:23:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: GUI-Element visible

Location:
trunk/src/lib
Files:
6 edited

Legend:

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

    r5417 r5421  
    566566    this->geTextCFPS->setName("curFPS");
    567567    this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
    568     this->geTextCFPS->setAbsCoor2D(5, 15);
     568    this->geTextCFPS->setAbsCoor2D(5, 0);
    569569  }
    570570  if (this->geTextMaxFPS == NULL)
     
    573573    this->geTextMaxFPS->setName("MaxFPS");
    574574    this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
    575     this->geTextMaxFPS->setAbsCoor2D(5, 40);
     575    this->geTextMaxFPS->setAbsCoor2D(5, 20);
    576576  }
    577577  if (this->geTextMinFPS == NULL)
     
    580580    this->geTextMinFPS->setName("MinFPS");
    581581    this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
    582     this->geTextMinFPS->setAbsCoor2D(5, 65);
     582    this->geTextMinFPS->setAbsCoor2D(5, 40);
    583583  }
    584584}
  • trunk/src/lib/graphics/text_engine/font.h

    r5369 r5421  
    7676    inline GLuint getFastTextureID() const { return this->fastTextureID; };
    7777    /** @returns the default Font */
    78     inline static Font* getDefaultFont() { return Font::defaultFont; };
     78    inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
    7979
    8080    void createAsciiImage(const char* fileName);
  • trunk/src/lib/graphics/text_engine/text.h

    r5418 r5421  
    1818#define  TEXT_DEFAULT_BLENDING       1.0f                       //!< the default blending of the text, (no blending at all)
    1919
    20 #define TEXT_DEFAULT_ALIGNMENT       TEXT_ALIGN_CENTER          //!< default alignment
    21 #define TEXT_DEFAULT_SIZE            20                         //!< default size of the Text
     20#define  TEXT_DEFAULT_ALIGNMENT      TEXT_ALIGN_LEFT            //!< default alignment
     21#define  TEXT_DEFAULT_SIZE           20                         //!< default size of the Text
    2222
    2323
  • trunk/src/lib/gui/gl_gui/glgui_button.cc

    r5404 r5421  
    5757{
    5858  this->label->setText(label);
     59  this->label->setRelCoor2D(5, 5);
     60  this->setSize2D(this->label->getSizeX2D()+10, this->label->getSizeY2D()+10);
    5961}
    6062
  • trunk/src/lib/gui/gl_gui/glgui_button.h

    r5395 r5421  
    4343
    4444  private:
    45 
    4645    GLGui_ButtonState    state;
    4746};
  • trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

    r5420 r5421  
    5050  this->backMat = new Material();
    5151  this->backMat->setDiffuse(0, 0, 0);
    52 
    53   this->setSize2D(label->getSizeX2D()+10, label->getSizeY2D()+10);
    5452}
    5553
     
    8280{
    8381
     82
    8483}
Note: See TracChangeset for help on using the changeset viewer.