Changeset 8267 in orxonox.OLD

Timestamp:

Jun 8, 2006, 4:28:24 PM (18 years ago)

Author:

amaechler

Message:

raise the number:)

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (7 diffs)
• lib/graphics/effects/fog_effect.h (modified) (2 diffs)
• lib/graphics/effects/rain_effect.cc (modified) (7 diffs)
• lib/graphics/effects/rain_effect.h (modified) (3 diffs)
• lib/graphics/graphics_engine.cc (modified) (6 diffs)
• world_entities/space_ships/helicopter.cc (modified) (1 diff)

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

@@ -58 +58 @@
         LoadParam(root, "range", this, FogEffect, setFogRange);
         LoadParam(root, "color", this, FogEffect, setFogColor);
+        LoadParam(root, "fadeinduration", this, FogEffect, setFogFadeIn);
+        LoadParam(root, "fadeoutduration", this, FogEffect, setFogFadeOut);
 
         LOAD_PARAM_START_CYCLE(root, element);
@@ -70 +72 @@
         //default values
         this->fogActivate = false;
-        this->fogFadeDuration = 0;
+        this->fogFadeInDuration = 0;
+        this->fogFadeOutDuration = 0;
         this->localTimer = 0;
         
@@ -79 +82 @@
         this->colorVector = Vector(0.7, 0.7, 0.7);
 
+        return 0;
 }
 
@@ -98 +102 @@
         glEnable(GL_FOG);
         // glClearColor(0.5, 0.5, 0.5, 1.0);
+
+        return 0;
 }
 
@@ -108 +114 @@
         
         glDisable(GL_FOG);
+
+        return 0;
 }
 
 void FogEffect::draw() const {
 
-        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration)
+        if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration)
                 glFogf(GL_FOG_DENSITY, this->fogFadeDensity);
         //else
@@ -124 +132 @@
                 
 
-        if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {
+        if (this->fogFadeInDuration > 0 && this->localTimer < this->fogFadeInDuration) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->fogFadeDuration;
+                float progress = this->localTimer / this->fogFadeInDuration;
                 this->fogFadeDensity = progress * this->fogDensity;
         }
@@ -136 +144 @@
                 this->deactivate();
 
-        this->fogFadeDuration = 10;
+        if (!this->fogFadeInDuration > 0)
+                this->fogFadeInDuration = 20;
+
         this->localTimer = 0;
         this->activate();

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

@@ -33 +33 @@
                 inline void setFogRange(float start, float end) { this->fogStart = start; this->fogEnd = end; }
                 inline void setFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); }
+                inline void setFogFadeIn(float fadein) { this->fogFadeInDuration = fadein; }
+                inline void setFogFadeOut(float fadeout) { this->fogFadeOutDuration = fadeout; }
+
                 inline void setFogOption(const std::string& option) { if (option == "activate") this->fogActivate = true; }
 
@@ -41 +44 @@
 
                 bool                            fogActivate;
-                GLfloat                         fogFadeDuration;
+                GLfloat                         fogFadeInDuration;
+                GLfloat                         fogFadeOutDuration;
+
                 float                           localTimer;
                 

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

@@ -86 +86 @@
         LoadParam(root, "life", this, RainEffect, setRainLife);
         LoadParam(root, "wind", this, RainEffect, setRainWind);
-        LoadParam(root, "startraining", this, RainEffect, setRainStart);
+        LoadParam(root, "fadeinduration", this, RainEffect, setRainFadeIn);
+        LoadParam(root, "fadeoutduration", this, RainEffect, setRainFadeOut);
 
         LOAD_PARAM_START_CYCLE(root, element);
@@ -109 +110 @@
         this->rainMaxParticles = this->rainRate * this->rainLife;
         this->rainWindForce  = 0;
-        this->rainStartDuration = 0;
+        this->rainFadeInDuration = 0;
+        this->rainFadeOutDuration = 0;
         this->localTimer = 0;
         this->soundRainVolume = 0.8f;
@@ -117 +119 @@
         lightMan = LightManager::getInstance();
         this->rainAmbient = lightMan->getAmbientColor();
+
+        return 0;
 }
 
@@ -155 +159 @@
 
         lightMan->setAmbientColor(.1,.1,.1);
+
+        return 0;
 }
 
@@ -170 +176 @@
         // Restore Light Ambient
         lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
+
+        return 0;
 }
 
@@ -182 +190 @@
         }
 
-        if (this->rainStartDuration != 0 && this->localTimer < this->rainStartDuration) {
+        if (this->rainFadeInDuration != 0 && this->localTimer < this->rainFadeInDuration) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->rainStartDuration;
+                float progress = this->localTimer / this->rainFadeInDuration;
 
                 // Dim Light
@@ -210 +218 @@
                 this->deactivate();
 
-        this->rainStartDuration = 10;
+        if (!this->rainFadeInDuration > 0)
+                this->rainFadeInDuration = 20;
+
         this->localTimer = 0;
         this->activate();

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

@@ -47 +47 @@
                 inline void setRainLife(float life) { this->rainLife = life; }
                 inline void setRainWind(int force) { this->rainWindForce = force; }
-                inline void setRainStart(float duration) { this->rainStartDuration = duration; }
+                inline void setRainStart(float duration) { this->rainFadeInDuration = duration; }
+
+                inline void setRainFadeIn(float fadein) { this->rainFadeInDuration = fadein; }
+                inline void setRainFadeOut(float fadeout) { this->rainFadeOutDuration = fadeout; }
+
 
                 inline void setRainOption(const std::string& option) {
@@ -59 +63 @@
                 ParticleEmitter*                        emitter;
 
+                GLfloat                                 rainFadeInDuration;
+                GLfloat                                 rainFadeOutDuration;
                 float                                   localTimer;
 
@@ -68 +74 @@
                 GLfloat                                 rainMaxParticles;
                 int                                     rainWindForce;
-                GLfloat                                 rainStartDuration;
                 bool                                    rainMove;
                 bool                                    rainActivate;

branches/atmospheric_engine/src/lib/graphics/graphics_engine.cc

@@ -145 +145 @@
     return -1;
   this->initVideo(640, 480, 16);
+
+  return 0;
 }
 
@@ -186 +188 @@
 
   //ge->activate();
+
+  return 0;
 }
 
@@ -238 +242 @@
 
   this->isInit = true;
+
+  return 0;
 }
 
@@ -289 +295 @@
   glEnable(GL_CULL_FACE);
   glCullFace(GL_FRONT);
+
+  return 0;
 }
 
@@ -379 +387 @@
   }
 #endif /* __WIN32__ */
+
+  return 0;
 }
 
@@ -413 +423 @@
 {
   this->setResolution(resizeInfo.w, resizeInfo.h, this->bitsPerPixel);
+
+  return 0;
 }
 

branches/atmospheric_engine/src/world_entities/space_ships/helicopter.cc

@@ -104 +104 @@
   if (this->chopperBuffer != NULL)
     ResourceManager::getInstance()->unload(this->chopperBuffer);
-  this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/chopper.wav", WAV);
+  this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/chopper.wav", WAV);
 
 }