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

Timestamp:

Jun 23, 2006, 10:20:35 PM (18 years ago)

Author:

bensch

Message:

font is a Material now

File:

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

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

@@ -76 +76 @@
   glActiveTexture(GL_TEXTURE0);
 
-  glColor4fv(&this->color()[0]);
+/*  glColor4fv(&this->color()[0]);
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);
@@ -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());*/
+  this->font().select();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);