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

Timestamp:

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

Author:

bensch

Message:

better, but still not running, yet

File:

• branches/fontdata/src/lib/graphics/text_engine/multi_line_text.cc (modified) (4 diffs)

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

@@ -82 +82 @@
   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(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
@@ -99 +99 @@
       ++lineNumber;
       posX = 0.0f;
-      posY += this->lineSpacing + this->size(); //this->font()->getMaxHeight();
+      posY += this->lineSpacing + this->size(); //this->font().getMaxHeight();
     }
 
-    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]);
@@ -141 +141 @@
       {
         this->lineEnds.push_back( i -1 );
-        width = this->font()->getGlyphArray()[this->text()[i-1]]->advance;
+        width = this->font().getGlyphArray()[this->text()[i-1]]->advance;
       }
       else
@@ -148 +148 @@
 
     // 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;
   }
   this->lineCount = lineEnds.size() + 1;
-  this->setSizeY2D((this->lineEnds.size()+1) * (this->lineSpacing + this->font()->getMaxHeight()));
+  this->setSizeY2D((this->lineEnds.size()+1) * (this->lineSpacing + this->font().getMaxHeight()));
 }