Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5421 in orxonox.OLD for trunk/src/lib/graphics/text_engine


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

orxonox/trunk: GUI-Element visible

Location:
trunk/src/lib/graphics/text_engine
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.