Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7889 in orxonox.OLD


Ignore:
Timestamp:
May 27, 2006, 3:14:45 AM (18 years ago)
Author:
bensch
Message:

gui: fixed one of the holy bugs

Location:
branches/gui/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/gui/src/lib/graphics/text_engine/multi_line_text.cc

    r7758 r7889  
    6464    return;
    6565  glPushMatrix();
     66  glPushAttrib(GL_ENABLE_BIT);
    6667  // transform for alignment.
    6768  // TODO make the Stuff with the alignment
    … …  
    117118  }
    118119  glEnd();
     120  glPopAttrib();
    119121  glPopMatrix();
    120122}

  • branches/gui/src/lib/graphics/text_engine/text.cc

    r7877 r7889  
    189189    return;
    190190  glPushMatrix();
     191  glPushAttrib(GL_ENABLE_BIT);
    191192  // transform for alignment.
    192193  if (this->getAlignment() == TEXT_ALIGN_RIGHT)
    … …  
    230231  }
    231232  glEnd();
     233  glPopAttrib();
    232234  glPopMatrix();
    233235}

  • branches/gui/src/lib/gui/gl_gui/glgui_pushbutton.cc

    r7888 r7889  
    9292    glBegin(GL_QUADS);
    9393
    94     glVertex2d(1, 1);
    95     glVertex2d(1, this->getSizeY2D() -1);
    96     glVertex2d(this->getSizeX2D() -1, this->getSizeY2D()-1);
    97     glVertex2d(this->getSizeX2D()-1,1);
     94    glTexCoord2i(0,0); glVertex2d(1, 1);
     95    glTexCoord2i(0,1); glVertex2d(1, this->getSizeY2D() - 1);
     96    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 1, this->getSizeY2D() -1);
     97    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 1, 1);
    9898
    9999    glEnd();

  • branches/gui/src/story_entities/movie_loader.cc

    r7868 r7889  
    115115  GraphicsEngine::enter2DMode();
    116116
     117  glPushAttrib(GL_ENABLE_BIT);
    117118  glEnable(GL_TEXTURE_2D);
    118119  glBindTexture(GL_TEXTURE_2D, movie_player->getTexture());

  • branches/gui/src/world_entities/planet.cc

    r7221 r7889  
    109109void Planet::draw() const
    110110{
    111   glMatrixMode(GL_MODELVIEW);
    112   glPushMatrix();
    113 
    114   glShadeModel(GL_SMOOTH);
    115 
    116   /* translate */
    117   glTranslatef (this->getAbsCoor ().x,
    118                 this->getAbsCoor ().y,
    119                 this->getAbsCoor ().z);
    120   Vector tmpRot = this->getAbsDir().getSpacialAxis();
    121   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
    122 
    123111  this->material.select();
    124112
    125 //   /WorldEntity::draw();
    126   this->getModel(0)->draw();
    127  // static_cast<VertexArrayModel*>(this->getModel(0))->debug();
    128 
    129   glPopMatrix();
     113  WorldEntity::draw();
    130114}
    131115
Note: See TracChangeset for help on using the changeset viewer.