Changeset 5368 in orxonox.OLD for trunk/src/lib/graphics/text_engine/font.h

Timestamp:

Oct 13, 2005, 12:00:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering font with RenderSize, but not with TextSize. This makes the Font more controllable

File:

• trunk/src/lib/graphics/text_engine/font.h (modified) (5 diffs)

trunk/src/lib/graphics/text_engine/font.h

@@ -37 +37 @@
   // Glyph-specific (size and so on)
   Uint16   character;         //!< The character
-  int      minX;              //!< The minimum distance from the origin in X
-  int      maxX;              //!< The maximum distance from the origin in X
-  int      minY;              //!< The minimum distance from the origin in Y
-  int      maxY;              //!< The maximum distance from the origin in Y
-  int      width;             //!< The width of the Glyph
-  int      height;            //!< The height of the Glyph
-  int      bearingX;          //!< How much is right of the Origin
-  int      bearingY;          //!< How much is above the Origin
-  int      advance;           //!< How big a Glyph would be in monospace-mode
+  float    minX;              //!< The minimum distance from the origin in X
+  float    maxX;              //!< The maximum distance from the origin in X
+  float    minY;              //!< The minimum distance from the origin in Y
+  float    maxY;              //!< The maximum distance from the origin in Y
+  float    width;             //!< The width of the Glyph
+  float    height;            //!< The height of the Glyph
+  float    bearingX;          //!< How much is right of the Origin
+  float    bearingY;          //!< How much is above the Origin
+  float    advance;           //!< How big a Glyph would be in monospace-mode
 
   GLfloat texCoord[4];        //!< Texture coordinates: 0:left, 1:right, 2: top, 3: bottom.
@@ -58 +58 @@
   public:
     Font(const char* fontFile,
-         unsigned int fontSize);
+         unsigned int renderSize);
     Font(const char* imageFile);
     Font(char** xpmArray);
@@ -66 +66 @@
 
   // font
-    bool loadFont(const char* fontFile);
+    bool loadFontFromTTF(const char* fontFile);
     bool loadFontFromSDL_Surface(SDL_Surface* surface);
 
-    void setSize(unsigned int fontSize);
     void setStyle(const char* renderStyle);
 
@@ -82 +81 @@
     static void initDefaultFont();
     static void removeDefaultFont();
+
 
   private:
@@ -99 +99 @@
     static Font*  defaultFont;         //!< a default font, that is used, if other fonts were unable to be loaded.
     // information about the Font
-    TTF_Font*     font;                //!< The font we use for this.
-    unsigned int  fontSize;            //!< The size of the font in pixels. each Font has one size.
+    TTF_Font*     fontTTF;             //!< The font we use for this.
     int           renderStyle;         //!< The Renderstyle
+    unsigned int  renderSize;          //!< How big the Font should be rendered.
 
     Glyph**       glyphArray;          //!< An Array of all the Glyphs stored in the Array of Glyphs.