Changeset 8716 in orxonox.OLD

Timestamp:

Jun 22, 2006, 1:57:16 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: FogFade finally fixed

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (5 diffs)
• lib/graphics/effects/fog_effect.h (modified) (1 diff)
• lib/graphics/effects/lightening_effect.cc (modified) (1 diff)
• lib/graphics/effects/rain_effect.cc (modified) (2 diffs)
• lib/graphics/effects/snow_effect.cc (modified) (1 diff)
• world_entities/effects/lightning_bolt.cc (modified) (1 diff)

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

@@ -78 +78 @@
     this->fogFadeOutDuration = 0;
     this->fogFadeDensity = 0;
+    this->fogFadeEnd = 0;
+
     this->localTimer = 0;
     this->fogActivate = false;
@@ -123 +125 @@
     // If Fog Fade
     if ( this->fogFadeInActivate || this->fogFadeOutActivate ) {
-      glDisable(GL_FOG);
-
-      GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
-      glFogi(GL_FOG_MODE, this->fogMode);
-      glFogfv(GL_FOG_COLOR, fogColor);
-      glHint(GL_FOG_HINT, GL_DONT_CARE);
-      glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
-      glFogf(GL_FOG_START, this->fogStart);
-      glFogf(GL_FOG_END, this->fogEnd);
-
-      glEnable(GL_FOG);
+        if ( this->fogMode == GL_LINEAR)
+            glFogf(GL_FOG_END, this->fogFadeEnd);
+        else
+            glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
     }
 }
@@ -144 +139 @@
     if ( this->fogFadeInActivate ) {
         this->localTimer += dt;
-        this->fogFadeDensity = ( this->localTimer / this->fogFadeInDuration ) * this->fogDensity;
-
-        if ( this->localTimer >= this->fogFadeOutDuration )
+
+        if ( this->fogMode == GL_LINEAR)
+          this->fogFadeEnd = 2000 * (1 - ( this->localTimer / this->fogFadeInDuration )) + this->fogEnd;
+        else
+            this->fogFadeDensity = ( this->localTimer / this->fogFadeInDuration ) * this->fogDensity;
+
+        if ( this->localTimer >= this->fogFadeInDuration )
             this->fogFadeInActivate = false;
     }
@@ -152 +151 @@
     if ( this->fogFadeOutActivate ) {
         this->localTimer += dt;
-        this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
+
+        if ( this->fogMode == GL_LINEAR)
+          this->fogFadeEnd = 2000 * ( this->localTimer / this->fogFadeInDuration ) + this->fogEnd;
+        else
+            this->fogFadeDensity = 1 - (( this->localTimer / this->fogFadeInDuration ) * this->fogDensity);
 
         if ( this->localTimer >= this->fogFadeOutDuration )
@@ -175 +178 @@
     this->localTimer = 0;
 
+    // Activate Fog
+    this->activate();
+
     // set FogFadeIn activate
     this->fogFadeInActivate = true;
-
-    // Activate Fog
-    this->activate();
 
 }

branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.h

@@ -89 +89 @@
     GLfloat       fogStart;
     GLfloat       fogEnd;
+    GLfloat       fogFadeEnd;
+
     Vector        colorVector;
 };

branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc

@@ -145 +145 @@
   if (this->thunderBuffer != NULL)
     ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.ogg", OGG);
+  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
 
 }

branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc

@@ -57 +57 @@
     if (this->rainBuffer != NULL)
         ResourceManager::getInstance()->unload(this->rainBuffer);
-    this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/rain.ogg", OGG);
+    this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/rain.wav", WAV);
 
     //load wind sound
@@ -63 +63 @@
         if (this->windBuffer != NULL)
             ResourceManager::getInstance()->unload(this->windBuffer);
-        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.ogg", OGG);
+        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
     }
 

branches/atmospheric_engine/src/lib/graphics/effects/snow_effect.cc

@@ -50 +50 @@
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.ogg", OGG);
+                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
         }
 

branches/atmospheric_engine/src/world_entities/effects/lightning_bolt.cc

@@ -64 +64 @@
   if (this->thunderBuffer != NULL)
     ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.ogg", OGG);
+  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
 }