Changeset 8754 in orxonox.OLD for branches/fontdata/src/lib/graphics/text_engine/text.cc

Timestamp:

Jun 23, 2006, 6:58:01 PM (18 years ago)

Author:

bensch

Message:

better, but still not running, yet

File:

• branches/fontdata/src/lib/graphics/text_engine/text.cc (modified) (8 diffs)

branches/fontdata/src/lib/graphics/text_engine/text.cc

@@ -28 +28 @@
  */
 Text::Text(const std::string& fontFile, unsigned int textSize)
+  : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
 {
   this->setClassID(CL_TEXT, "Text");
@@ -38 +39 @@
 
   this->setAlignment(TEXT_DEFAULT_ALIGNMENT);
-
-  this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
 }
 
 Text::Text(const Text& text)
+  : _font()
 {
   this->setClassID(CL_TEXT, "Text");
-  this->_font = NULL;
 
   *this = text;
@@ -93 +92 @@
   this->_color = text._color;
   this->setAlignment(text.getAlignment());
-  if (this->_font != NULL)
-    ResourceManager::getInstance()->unload(this->_font);
-
-  this->_font = (Font*)ResourceManager::getInstance()->copy( text._font ); //!< HACK
+
+  this->_font = text._font;
 
   this->_text = text._text;
@@ -192 +189 @@
 
   // unloading the Font if we alrady have one loaded.
-  this->_font = newFont;
+  this->_font = *newFont;
 //   if (oldFont != NULL && oldFont != Font::getDefaultFont())
 //     ResourceManager::getInstance()->unload(oldFont);
@@ -238 +235 @@
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
 
-  glBindTexture(GL_TEXTURE_2D, this->_font->getTexture());
+  glBindTexture(GL_TEXTURE_2D, this->_font.getTexture());
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
@@ -247 +244 @@
   for (unsigned int i = 0; i < this->_text.size(); i++)
   {
-    if(likely((tmpGlyph = this->font()->getGlyphArray()[this->_text[i]]) != NULL))
+    if(likely((tmpGlyph = this->font().getGlyphArray()[this->_text[i]]) != NULL))
     {
       glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
@@ -277 +274 @@
   float width = 0;
   for (unsigned int i = 0; i < this->_text.size(); i++)
-    if(this->_font->getGlyphArray()[this->_text[i]] != NULL)
-      width += this->_font->getGlyphArray()[this->_text[i]]->advance;
+    if(this->_font.getGlyphArray()[this->_text[i]] != NULL)
+      width += this->_font.getGlyphArray()[this->_text[i]]->advance;
   this->setSizeX2D(width * this->size());
 }
@@ -288 +285 @@
 void Text::debug() const
 {
-  PRINT(0)("=== TEXT: %s (with Font:'%s')  displaying %s ===\n", this->getName(), this->_font->getName(), this->_text.c_str());
+  PRINT(0)("=== TEXT: %s (with Font:'%s')  displaying %s ===\n", this->getName(), this->_font.getName(), this->_text.c_str());
   PRINT(0)("Color: r=%0.2f g=%0.2f b=%0.2f a=%0.2f\n", this->_color.r(), this->_color.g(), this->_color.b(), this->_color.a());
 }