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

Timestamp:

Jun 24, 2006, 2:16:12 AM (18 years ago)

Author:

bensch

Message:

merged the new Font-Implementation back here
merged with svn merge ​https://svn.orxonox.net/orxonox/branches/fontdata . -r8752:HEAD
no conflicts, naturally

File:

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

trunk/src/lib/graphics/text_engine/limited_width_text.cc

@@ -76 +76 @@
   glActiveTexture(GL_TEXTURE0);
 
-  glEnable(GL_BLEND);
-  glEnable(GL_TEXTURE_2D);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
+//   glEnable(GL_BLEND);
+//   glEnable(GL_TEXTURE_2D);
+//   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
+//
+//   glBindTexture(GL_TEXTURE_2D, this->font().getTexture());
+  this->font().select();
 
-  glBindTexture(GL_TEXTURE_2D, this->font()->getTexture());
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
@@ -90 +92 @@
   for (unsigned int i = 0; i < this->_dotedText.size(); i++)
   {
-    if(likely((tmpGlyph = this->font()->getGlyphArray()[this->_dotedText[i]]) != NULL))
+    if(likely((tmpGlyph = this->font().getGlyphArray()[this->_dotedText[i]]) != NULL))
     {
       glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
@@ -118 +120 @@
 void LimitedWidthText::setupTextWidth()
 {
-  float dotsSize = this->font()->getGlyphArray()[46]->advance * 3.0;
+  float dotsSize = this->font().getGlyphArray()[46]->advance * 3.0;
 
   float width = 0.0f;
@@ -134 +136 @@
           this->_dotedText = this->text().substr(0, i) + "...";
           if (i > 0)
-            width -= this->font()->getGlyphArray()[this->text()[i-1]]->advance;
+            width -= this->font().getGlyphArray()[this->text()[i-1]]->advance;
           width += dotsSize;
           break;
         }
         // Advance the Text.
-        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;
       }
       break;
@@ -152 +154 @@
           this->_dotedText = std::string("...") + this->text().substr(i);
           if (i + 1 < (int)text().size() )
-            width -= this->font()->getGlyphArray()[this->text()[i+1]]->advance;
+            width -= this->font().getGlyphArray()[this->text()[i+1]]->advance;
           width += dotsSize;
           break;
         }
         // Advance the Text.
-        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;
       }
       break;