Changeset 5179 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Sep 13, 2005, 11:23:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellInput is now almost perfectly extern.
ShellCompletion taken out.
Working again

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

@@ -82 +82 @@
 
 /**
+ * sets the Font of this Text to font
+ * @param font the Font (normaly from the ResourceManager) to allocate to this Text
+ */
+void Text::setFont(Font* font)
+{
+  if (this->font != NULL)
+    ResourceManager::getInstance()->unload(this->font);
+  this->font = font;
+}
+
+/**
+ * sets the Font of this Text to font from fontFile
+ * @param fontFile the File to load the Font from.
+ * @param fontSize the Size of the Font
+ */
+void Text::setFont(const char* fontFile, unsigned int fontSize)
+{
+  Font* tmpFont;
+  Text* newText;
+  Vector tmpVec;
+
+  tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
+  if (!tmpFont)
+  {
+    PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
+    this->setFont(NULL);
+  }
+  else
+    this->setFont(tmpFont);
+}
+
+/**
  *  sets the Type of this Text
  * @param type the type to set.
@@ -87 +119 @@
 void Text::setType(TEXT_RENDER_TYPE type)
 {
-  if (this->font->font)
+  if (this->font != NULL && this->font->font)
     this->type = type;
   else
@@ -124 +156 @@
 
   // setting up the Text-Width if DYNAMIC
-  if (this->type & TEXT_RENDER_DYNAMIC && this->getAlignment() != TEXT_ALIGN_LEFT)
+  if (this->type & TEXT_RENDER_DYNAMIC && this->getAlignment() != TEXT_ALIGN_LEFT && this->font != NULL)
     {
       Glyph** glyphArray = this->font->getGlyphArray();
@@ -194 +226 @@
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
-  if(likely(type & TEXT_RENDER_DYNAMIC))
+  if(likely(type & TEXT_RENDER_DYNAMIC && this->font != NULL))
     {
       Glyph** glyphArray = this->font->getGlyphArray();

trunk/src/lib/graphics/text_engine.h

@@ -106 +106 @@
 {
  public:
-   Text(Font* font, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+   Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
   ~Text();
 
+  void setFont(Font* font);
+  void setFont(const char* fontFile, unsigned int fontSize);
   void setType(TEXT_RENDER_TYPE type);
   void setText(const char* text, bool isExtern = false);