Changeset 8768 in orxonox.OLD for trunk

Timestamp:

Jun 24, 2006, 3:59:11 AM (19 years ago)

Author:

bensch

Message:

trunk: font: cleaner draw() of Texts

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (1 diff)
• font_data.h (modified) (1 diff)
• limited_width_text.cc (modified) (1 diff)
• multi_line_text.cc (modified) (1 diff)
• text.cc (modified) (1 diff)

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

@@ -150 +150 @@
   Font::defaultFontData = Font(font_xpm).data;
 }
+
 
 /**

trunk/src/lib/graphics/text_engine/font_data.h

@@ -70 +70 @@
   const TextureDataPointer& textureData() const { return texData; };
 
-  bool rebuild();
+  bool rebuild() { return texData->rebuild(); };
 
 private:
-
   void initGlyphs(TTF_Font* font, Uint16 from, Uint16 count);
   bool getGlyphMetrics(TTF_Font* font, Glyph* glyph, Uint16 character);

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

@@ -70 +70 @@
 
   // drawing this Text.
-  // setting the Blending effects
-  glColor4fv(&this->color()[0]);
-
-
-  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 );
-//
-//   glBindTexture(GL_TEXTURE_2D, this->font().getTexture());
   this->font().select();
 

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

@@ -73 +73 @@
 
   // drawing this Text.
-  // setting the Blending effects
-  glActiveTexture(GL_TEXTURE0);
+  this->font().select();
 
-/*  glColor4fv(&this->color()[0]);
-  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();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);

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

@@ -226 +226 @@
     glTranslatef(-this->getSizeX2D()/2, 0, 0);
 
+
   this->font().select();
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);