Changeset 8759 in orxonox.OLD for branches

Timestamp:

Jun 23, 2006, 10:25:50 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Material Copy constructor as should be

Location:

branches/fontdata/src/lib/graphics/text_engine

Files:

• font.cc (modified) (1 diff)
• text.cc (modified) (1 diff)

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

@@ -111 +111 @@
 Font& Font::operator=(const Font& font)
 {
+  Material::operator=(font);
   this->data = font.data;
-  this->setDiffuseMap(font.data->texData);
 
   return *this;

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

@@ -227 +227 @@
   glColor4fv(&this->_color[0]);
 
-
-/*  glActiveTexture(GL_TEXTURE0);
-
-  glEnable(GL_BLEND);
-  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();
-  //printf("Texture is : %d\n",);
   glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
   glRotatef(this->getAbsDir2D(), 0, 0, 1);