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

Timestamp:

Oct 7, 2005, 6:17:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManage-fixes

File:

• trunk/src/lib/graphics/text_engine.cc (modified) (2 diffs)

trunk/src/lib/graphics/text_engine.cc

@@ -42 +42 @@
 /// TEXT ///
 ////////////
+
+/**
+ *  creates a new Text Element
+ * @param fontFile the Font to render this text in
+ * @param type The renderType to display this font in
+ */
+Text::Text(const char* fontFile, unsigned int fontSize, TEXT_RENDER_TYPE type)
+{
+  this->init();
+
+  if (fontFile != NULL)
+    this->setFont(fontFile, fontSize);
+  this->setType(type);
+}
+
 /**
  *  creates a new Text Element
  * @param font the Font to render this text in
  * @param type The renderType to display this font in
-
-   this constructor is private, because the user should initialize
-   a text with the TextEngine.
-*/
+ *
+ * this constructor is private, because the user should initialize
+ * a text with the TextEngine.
+ */
 Text::Text(Font* font, TEXT_RENDER_TYPE type)
 {
+  this->init();
+
+  this->font = font;
+  this->setType(type);
+}
+
+/**
+ *  deletes a Text out of memory
+ *
+ * This also ereases the text from the textList of the TextEngine
+*/
+Text::~Text()
+{
+  if (this->font != NULL)
+    ResourceManager::getInstance()->unload(this->font);
+
+  if (this->text)
+    delete[] this->text;
+}
+
+void Text::init()
+{
   this->setClassID(CL_TEXT, "Text");
 
   // initialize this Text
-  this->font = font;
+  this->font = NULL;
   this->text = NULL;
   this->externText = NULL;
@@ -62 +99 @@
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-  this->setType(type);
+  this->setType(TEXT_RENDER_DYNAMIC);
 
   this->setText(NULL);
-}
-
-/**
- *  deletes a Text out of memory
- *
- * This also ereases the text from the textList of the TextEngine
-*/
-Text::~Text()
-{
-  if (this->font != NULL)
-    ResourceManager::getInstance()->unload(this->font);
-
-  if (this->text)
-    delete[] this->text;
 }