Changeset 5341 in orxonox.OLD

Timestamp:

Oct 9, 2005, 11:44:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: init-function of Font

Location:

trunk/src/lib/graphics

Files:

• text_engine.cc (modified) (4 diffs)
• text_engine.h (modified) (1 diff)

trunk/src/lib/graphics/text_engine.cc

@@ -260 +260 @@
     {
       Glyph** glyphArray;
-      if (false /*likely (this->font != NULL)*/)
+      if (likely (this->font != NULL))
       {
         glyphArray = this->font->getGlyphArray();
@@ -438 +438 @@
 Font::Font(const char* fontFile, unsigned int fontSize)
 {
-  this->setClassID(CL_FONT, "Font");
-  // setting default values.
-  this->font = NULL;
-  this->glyphArray = NULL;
-  this->fastTextureID = 0;
+  this->init();
 
   this->setSize(fontSize);
@@ -464 +460 @@
 Font::Font(char** xpmArray)
 {
-  this->setClassID(CL_FONT, "Font");
-  // setting default values.
-  this->font = NULL;
-  this->glyphArray = NULL;
-  this->fastTextureID = 0;
-
-//  this->setSize(fontSize);
+  this->init();
+
+  //  this->setSize(fontSize);
   SDL_Surface* image = NULL;
   if (xpmArray != NULL)
@@ -509 +501 @@
   if (likely(this->font != NULL))
     TTF_CloseFont(this->font);
+}
+
+/**
+ * initializes a Font (with default values)
+ */
+void Font::init()
+{
+    this->setClassID(CL_FONT, "Font");
+  // setting default values.
+  this->font = NULL;
+  this->glyphArray = NULL;
+  this->fastTextureID = 0;
 }
 

trunk/src/lib/graphics/text_engine.h

@@ -166 +166 @@
        unsigned int fontSize = FONT_DEFAULT_SIZE);
   Font(char** xpmArray);
-
   virtual ~Font();
+
+  void init();
 
   // font