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

Timestamp:

Oct 13, 2005, 12:00:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering font with RenderSize, but not with TextSize. This makes the Font more controllable

File:

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

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

@@ -32 +32 @@
  * @param type The renderType to display this font in
  */
-Text::Text(const char* fontFile, unsigned int fontSize, TEXT_RENDER_TYPE type)
+Text::Text(const char* fontFile, unsigned int textSize, TEXT_RENDER_TYPE type)
 {
   this->init();
 
   if (fontFile != NULL)
-    this->setFont(fontFile, fontSize);
+    this->setFont(fontFile, textSize);
   this->setType(type);
+  this->size = textSize;
 }
 
@@ -109 +110 @@
 void Text::setType(TEXT_RENDER_TYPE type)
 {
-  if (this->font != NULL && this->font->font)
+  if (this->font != NULL && this->font->fontTTF)
     this->type = type;
   else
@@ -150 +151 @@
     Glyph** glyphArray = this->font->getGlyphArray();
 
-    int width = 0;
+    float width = 0;
     const char* tmpText = this->externText;
     if (this->externText == NULL)
@@ -184 +185 @@
   {
     SDL_Color theColor = { (int)(this->color.x*255), (int)(this->color.y*255), (int)(this->color.z*255) };
-    tmpSurf = TTF_RenderText_Blended(this->font->font,
+    tmpSurf = TTF_RenderText_Blended(this->font->fontTTF,
                                      this->text,
                                      theColor);
@@ -248 +249 @@
           glBegin(GL_QUADS);
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
-          glVertex2d(0, - tmpGlyph->bearingY);
+          glVertex2d(0, - tmpGlyph->bearingY * this->size);
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-          glVertex2d(0, tmpGlyph->height - tmpGlyph->bearingY);
+          glVertex2d(0, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-          glVertex2d(tmpGlyph->width, tmpGlyph->height - tmpGlyph->bearingY);
+          glVertex2d(tmpGlyph->width*this->size, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-          glVertex2d(tmpGlyph->width, - tmpGlyph->bearingY);
+          glVertex2d(tmpGlyph->width*this->size, - tmpGlyph->bearingY*this->size);
           glEnd();
           glEndList();
-          glTranslatef(glyphArray[*tmpText]->width, 0, 0);
+          glTranslatef(glyphArray[*tmpText]->width*this->size, 0, 0);
         }
         tmpText++;
@@ -371 +372 @@
   glGenTextures(1, &texture);
   glBindTexture(GL_TEXTURE_2D, texture);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexImage2D(GL_TEXTURE_2D,