Changeset 9182 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 3:19:43 AM (18 years ago)

Author:

amaechler

Message:

fixes

Location:

branches/presentation/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (1 diff)
• lib/graphics/effects/lightning_effect.cc (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (1 diff)
• world_entities/skydome.cc (modified) (3 diffs)

branches/presentation/src/lib/graphics/effects/fog_effect.cc

@@ -184 +184 @@
 
         if ( this->fogMode == GL_LINEAR)
-          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeInDuration ) + this->fogEnd;
+          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeOutDuration ) + this->fogEnd;
         else
-            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
+            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeOutDuration ) * this->fogDensity);
 
         if ( this->localTimer >= this->fogFadeOutDuration )

branches/presentation/src/lib/graphics/effects/lightning_effect.cc

@@ -112 +112 @@
     }
 
+    //should load both texture
     this->thunderTextureA = true;
     this->setTexture();
+    this->switchTexture();
 
     if (this->lightningMove) {

branches/presentation/src/lib/particles/particle_system.cc

@@ -460 +460 @@
     int i = 1;
     Particle* tmpPart = this->deadList;
-    while (tmpPart = tmpPart->next) ++i;
+    while (tmpPart = tmpPart->next) { ++i; }
     PRINT(0)("count: %d\n", i);
   }

branches/presentation/src/world_entities/skydome.cc

@@ -99 +99 @@
   glDisable(GL_LIGHTING);
   glDisable(GL_BLEND);
+  glDisable(GL_FOG);
 
   glEnable(GL_TEXTURE_3D);
@@ -108 +109 @@
   glTranslatef(0.0f,pRadius,0.0f);
 
-
   glBegin(GL_TRIANGLES);
-
   for (int i=0; i < numIndices; i++)
   {
@@ -118 +117 @@
     glVertex3f(planeVertices[indices[i]].x, planeVertices[indices[i]].y, planeVertices[indices[i]].z);
   }
-
   glEnd();
+
+  WorldEntity::draw(); 
 
   glPopMatrix();