Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3536 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Mar 13, 2005, 11:57:19 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: GL_TEXTURE_2D-patch: now only enabled and disabled through Material

Location:
orxonox/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

    r3484 r3536  
    171171  glDisable(GL_LIGHTING);
    172172
    173   backMat->select();
    174173  glBegin(GL_QUADS);
    175174  glColor3f(0.96, 0.84, 0.34);
     
    210209  glEnd();
    211210
    212   glEnable(GL_TEXTURE_2D);
     211  backMat->select();
    213212  glBegin(GL_QUADS);
    214213  glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);
  • orxonox/trunk/src/lib/graphics/importer/material.cc

    r3454 r3536  
    153153
    154154  if (this->diffuseTextureSet)
    155     glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
     155    {
     156      glEnable(GL_TEXTURE_2D);
     157      glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
     158    }
    156159  else
    157     glBindTexture(GL_TEXTURE_2D, 0);
    158  
     160    {
     161      glDisable(GL_TEXTURE_2D);
     162      glBindTexture(GL_TEXTURE_2D, 0);
     163    }
    159164}
    160165
  • orxonox/trunk/src/world_entities/skysphere.cc

    r3531 r3536  
    105105void Skysphere::draw()
    106106{
    107   glEnable(GL_TEXTURE_2D);
    108107  glPushMatrix();
    109108  glMatrixMode(GL_MODELVIEW);
     
    119118  gluSphere(sphereObj, sphereRadius, 20, 20);
    120119  glPopMatrix();
    121   glDisable(GL_TEXTURE_2D);
    122120}
    123121
Note: See TracChangeset for help on using the changeset viewer.