Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9182 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 5, 2006, 3:19:43 AM (18 years ago)
Author:
amaechler
Message:

fixes

Location:
branches/presentation/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/lib/graphics/effects/fog_effect.cc

    r9112 r9182  
    184184
    185185        if ( this->fogMode == GL_LINEAR)
    186           this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeInDuration ) + this->fogEnd;
     186          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeOutDuration ) + this->fogEnd;
    187187        else
    188             this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
     188            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeOutDuration ) * this->fogDensity);
    189189
    190190        if ( this->localTimer >= this->fogFadeOutDuration )
  • branches/presentation/src/lib/graphics/effects/lightning_effect.cc

    r9112 r9182  
    112112    }
    113113
     114    //should load both texture
    114115    this->thunderTextureA = true;
    115116    this->setTexture();
     117    this->switchTexture();
    116118
    117119    if (this->lightningMove) {
  • branches/presentation/src/lib/particles/particle_system.cc

    r7334 r9182  
    460460    int i = 1;
    461461    Particle* tmpPart = this->deadList;
    462     while (tmpPart = tmpPart->next) ++i;
     462    while (tmpPart = tmpPart->next) { ++i; }
    463463    PRINT(0)("count: %d\n", i);
    464464  }
  • branches/presentation/src/world_entities/skydome.cc

    r9154 r9182  
    9999  glDisable(GL_LIGHTING);
    100100  glDisable(GL_BLEND);
     101  glDisable(GL_FOG);
    101102
    102103  glEnable(GL_TEXTURE_3D);
     
    108109  glTranslatef(0.0f,pRadius,0.0f);
    109110
    110 
    111111  glBegin(GL_TRIANGLES);
    112 
    113112  for (int i=0; i < numIndices; i++)
    114113  {
     
    118117    glVertex3f(planeVertices[indices[i]].x, planeVertices[indices[i]].y, planeVertices[indices[i]].z);
    119118  }
    120 
    121119  glEnd();
     120
     121  WorldEntity::draw();
    122122
    123123  glPopMatrix();
Note: See TracChangeset for help on using the changeset viewer.