Changeset 3767 in orxonox.OLD for orxonox/branches/textEngine/src/lib/graphics/font/text_engine.cc

Timestamp:

Apr 9, 2005, 4:52:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: some reimplementation

File:

• orxonox/branches/textEngine/src/lib/graphics/font/text_engine.cc (modified) (3 diffs)

orxonox/branches/textEngine/src/lib/graphics/font/text_engine.cc

@@ -17 +17 @@
    !! IMPORTANT !! When using ttf fonts clear the license issues prior to
    adding them to orxonox. This is really important, because we do not 
-   want to defend anyone.
+   want to offend anyone.
 */
 
@@ -43 +43 @@
    \brief constructs a Font
    \param fontFile the File to load the font from
-*/
-Font::Font(const char* fontFile)
-{
-  this->init(fontFile);
-}
-
-/**
-   \brief destructs a font
-*/
-Font::~Font(void)
-{
-  delete this->currentText;
-
-  if (this->glyphArray)
-    {
-      for (int i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
-        delete this->glyphArray[i];
-      delete []this->glyphArray;
-    }
-
-  if (this->font)
-    TTF_CloseFont(this->font);
-}
-
-/**
-   \brief initializes a new Font
-   \param fontFile The file to load a Font from
-   \param fontSize the Size in pixels of the Font
-*/
-bool Font::init(const char* fontFile, unsigned int fontSize)
-{
-  if (!TTF_WasInit())
+   \param fontSize the Size of the Font in Pixels
+   \param r Red value of the Font.
+   \param g Green value of the Font.
+   \param b Blue value of the Font.
+*/
+Font::Font(const char* fontFile, unsigned int fontSize, Uint8 r, Uint8 g, Uint8 b)
+{
+   if (!TTF_WasInit())
     TextEngine::enableFonts();
 
@@ -96 +72 @@
   this->setFont(fontFile);
 
-  this->setColor(0, 255, 0);
   this->setPosition(0, 0);
 
   this->setText(FONT_DEFAULT_TEXT);
   
-  this->setColor(0,255,0);
+  this->setColor(r, g, b);
 
   this->createTexture();
 
   this->fastTextureID = this->createFastTexture();
+}
+
+/**
+   \brief destructs a font
+*/
+Font::~Font(void)
+{
+  delete this->currentText;
+
+  if (this->glyphArray)
+    {
+      for (int i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
+        delete this->glyphArray[i];
+      delete []this->glyphArray;
+    }
+
+  if (this->font)
+    TTF_CloseFont(this->font);
 }