Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8759 in orxonox.OLD for branches


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fontdata/src/lib/graphics/text_engine/font.cc

    r8758 r8759  
    111111Font& Font::operator=(const Font& font)
    112112{
     113  Material::operator=(font);
    113114  this->data = font.data;
    114   this->setDiffuseMap(font.data->texData);
    115115
    116116  return *this;
  • branches/fontdata/src/lib/graphics/text_engine/text.cc

    r8758 r8759  
    227227  glColor4fv(&this->_color[0]);
    228228
    229 
    230 /*  glActiveTexture(GL_TEXTURE0);
    231 
    232   glEnable(GL_BLEND);
    233   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    234   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, GL_MODULATE );
    235 
    236   glBindTexture(GL_TEXTURE_2D, this->_font.getTexture());*/
    237229  this->font().select();
    238   //printf("Texture is : %d\n",);
    239230  glTranslatef(getAbsCoor2D().x, getAbsCoor2D().y, 0);
    240231  glRotatef(this->getAbsDir2D(), 0, 0, 1);
Note: See TracChangeset for help on using the changeset viewer.