Changeset 7449 in orxonox.OLD

Timestamp:

Apr 29, 2006, 8:22:14 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: dafaultFont(xpm/SDL_Surface) renders again

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (8 diffs)
• font.h (modified) (2 diffs)

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

@@ -32 +32 @@
 
 /**
- * constructs a Font out of a TTF-FIle
+ * @brief constructs a Font out of a TTF-FIle
  * @param fontFile the File to load the font from
  * @param fontSize the Size of the Font in Pixels
@@ -48 +48 @@
 
 /**
- * constructs a Font out of an ImageFile
+ * @brief constructs a Font out of an ImageFile
  * @param imageFile the ImageFile to load the Font From.
  */
@@ -71 +71 @@
 
 /**
- * constructs a Font
+ * @brief constructs a Font
  * @param xpmArray the xpm-ARRAY to load the font from
  */
@@ -93 +93 @@
 
 /**
- * destructs a font
+ * @brief destructs a font
+ *
  * this releases the memory a font uses to be opened.
  * deletes the glLists, and the TTF-handler, if present.
@@ -105 +106 @@
     {
       if (this->glyphArray[i] != NULL)
-      {
         delete this->glyphArray[i];
-      }
     }
     delete[] this->glyphArray;
@@ -123 +122 @@
 
 /**
- * initializes a Font (with default values)
+ * @brief initializes a Font (with default values)
  */
 void Font::init()
@@ -166 +165 @@
 
 /**
- * loads a font From an XPM-array.
+ * @brief loads a font From an XPM-array.
  * @param xpmArray the array of the XPM to load the font from.
  */
@@ -203 +202 @@
       tmpGlyph->texCoord[0] = cx;
       tmpGlyph->texCoord[1] = cx+0.0625f;
-      tmpGlyph->texCoord[2] = cy+0.001f;
+      tmpGlyph->texCoord[2] = cy;
       tmpGlyph->texCoord[3] = cy+0.0625f;
-      tmpGlyph->width = 1;
-      tmpGlyph->advance = 1;
-      tmpGlyph->bearingX = 1;
-      tmpGlyph->bearingY = 1;
-      tmpGlyph->height = 1;
+      tmpGlyph->minX = 0.0f;
+      tmpGlyph->maxX = 1.0f;
+      tmpGlyph->minY = 0.0f;
+      tmpGlyph->maxY = 1.0f;
+      tmpGlyph->width = 1.0f;
+      tmpGlyph->advance = 1.0f;
+      tmpGlyph->bearingX = 0.0f;
+      tmpGlyph->bearingY = 0.0f;
+      tmpGlyph->height = 1.0f;
     }
   }

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

@@ -61 +61 @@
     virtual ~Font();
 
-    void init();
-
   //  font
     bool loadFontFromTTF(const std::string& fontFile);
@@ -82 +80 @@
 
   private:
+    void init();
     int getMaxHeight() const;
     int getMaxAscent() const;