Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6780 in orxonox.OLD


Ignore:
Timestamp:
Jan 26, 2006, 6:47:32 PM (18 years ago)
Author:
bensch
Message:

trunk: war of the popers

Location:
trunk/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/coord/p_node.cc

    r6695 r6780  
    988988    glEnd();
    989989  }
    990 
    991990  glPopMatrix();
     991
    992992  if (depth >= 2 || depth == 0)
    993993  {

  • trunk/src/lib/graphics/graphics_engine.cc

    r6778 r6780  
    464464void GraphicsEngine::leave2DMode()
    465465{
     466
     467  glMatrixMode(GL_MODELVIEW);
     468  glPopMatrix();
     469
    466470  glMatrixMode(GL_PROJECTION);
    467   glPopMatrix();
    468 
    469   glMatrixMode(GL_MODELVIEW);
    470471  glPopMatrix();
    471472
    … …  
    578579void GraphicsEngine::draw() const
    579580{
     581
     582  LightManager::getInstance()->draw();
     583
    580584  GraphicsEngine::storeMatrices();
    581 
    582   LightManager::getInstance()->draw();
    583 
    584585  Shader::suspendShader();
    585586

  • trunk/src/lib/shell/shell.cc

    r6222 r6780  
    472472void Shell::draw() const
    473473{
    474   glPushMatrix();
    475474  // transform for alignment.
    476475  // setting the Blending effects

  • trunk/src/story_entities/game_world.cc

    r6710 r6780  
    393393  // clear buffer
    394394  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
    395   // set camera
    396   this->dataTank->localCamera->apply ();
    397395  // draw world
    398396  this->draw();
    … …  
    409407  GraphicsEngine* engine = GraphicsEngine::getInstance();
    410408
    411    /* to draw the bounding boxes of the objects at level 2 for debug purp */
    412 
    413   /* debug draw the PNodes */
     409  // set camera
     410  this->dataTank->localCamera->apply ();
    414411
    415412  /* draw all WorldEntiy groups */
    … …  
    422419  engine->draw(State::getObjectManager()->getObjectList(OM_GROUP_01_PROJ));
    423420
     421
    424422  if( unlikely( this->showBV))
    425423  {
    … …  
    436434    PNode::getNullParent()->debugDraw(0);
    437435
     436  engine->draw();
     437
    438438  /* final draw command */
    439   engine->draw();
    440439}
    441440

  • trunk/src/world_entities/camera.cc

    r6778 r6780  
    202202  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity()) / 25.0f;
    203203
    204   // Setting the Camera Eye, lookAt and up Vectors
     204
     205  glMatrixMode (GL_MODELVIEW);
     206  glLoadIdentity();
     207
     208 // Setting the Camera Eye, lookAt and up Vectors
    205209  gluLookAt(cameraPosition.x - delay.x, cameraPosition.y - delay.y, cameraPosition.z - delay.z,
    206210            targetPosition.x, targetPosition.y, targetPosition.z,
    207211            up.x, up.y, up.z);
    208 
    209 
    210   glMatrixMode (GL_MODELVIEW);
    211   glLoadIdentity();
    212 
    213 
    214 
    215212}
    216213

  • trunk/src/world_entities/environments/water.cc

    r6771 r6780  
    200200
    201201    SkyBox::disableCubeMap();
     202    glPopMatrix();
    202203  }
    203204}

  • trunk/src/world_entities/planet.cc

    r6696 r6780  
    130130  this->getModel(0)->draw();
    131131 // static_cast<VertexArrayModel*>(this->getModel(0))->debug();
     132
     133  glPopMatrix();
    132134}
    133135

  • trunk/src/world_entities/power_ups/laser_power_up.cc

    r6512 r6780  
    103103*/
    104104void LaserPowerUp::draw() const
    105 {  glMatrixMode(GL_MODELVIEW);
     105{
     106  glMatrixMode(GL_MODELVIEW);
    106107  glPushMatrix();
    107108  /* translate */

  • trunk/src/world_entities/power_ups/turret_power_up.cc

    r6695 r6780  
    104104*/
    105105void TurretPowerUp::draw() const
    106 {  glMatrixMode(GL_MODELVIEW);
     106{
     107  glMatrixMode(GL_MODELVIEW);
    107108  glPushMatrix();
    108109  /* translate */

  • trunk/src/world_entities/terrain.cc

    r6695 r6780  
    130130void Terrain::draw () const
    131131{
    132   glMatrixMode(GL_MODELVIEW);
    133132  glPushMatrix();
    134133
Note: See TracChangeset for help on using the changeset viewer.