Changeset 8521 in orxonox.OLD

Timestamp:

Jun 16, 2006, 10:34:43 AM (18 years ago)

Author:

amaechler

Message:

…

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• fog_effect.cc (modified) (4 diffs)
• fog_effect.h (modified) (1 diff)
• rain_effect.cc (modified) (4 diffs)
• rain_effect.h (modified) (3 diffs)
• sun_effect.cc (modified) (1 diff)
• sun_effect.h (modified) (2 diffs)

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

@@ -87 +87 @@
 
 void FogEffect::activate() {
-    PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z);
+    PRINTF(0)( "Activating FogEffect\n");
 
-    this->fogActivate = true;
-
+    // init fogGL
     GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
     glFogi(GL_FOG_MODE, this->fogMode);
@@ -98 +97 @@
     glFogf(GL_FOG_START, this->fogStart);
     glFogf(GL_FOG_END, this->fogEnd);
+
+    this->fogActivate = true;
 
     glEnable(GL_FOG);
@@ -127 +128 @@
 
 void FogEffect::tick(float dt) {
+
     if (!this->fogActivate)
         return;
@@ -193 +195 @@
 }
 
-
-GLint FogEffect::stringToFogMode(const std::string& mode) {
-    if(mode == "GL_LINEAR")
-        return GL_LINEAR;
-    else if(mode == "GL_EXP")
-        return GL_EXP;
-    else if(mode == "GL_EXP2" )
-        return GL_EXP2;
-    else
-        return -1;
-}
-
-

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

@@ -63 +63 @@
 
 private:
-    GLint stringToFogMode(const std::string& mode);
+    inline GLint stringToFogMode(const std::string& mode) {
+        if(mode == "GL_LINEAR")
+            return GL_LINEAR;
+        else if(mode == "GL_EXP")
+            return GL_EXP;
+        else if(mode == "GL_EXP2" )
+            return GL_EXP2;
+        else
+            return -1;
+    }
 
     bool          fogActivate;

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

@@ -39 +39 @@
 
 /* TODO:
-  - test multiple rain emitters
+  - test multiple rain emitters <-- doesn't work
   - Think about what happens with building poss. to hang movewithcam off
   - Possible to activate lightening
@@ -207 +207 @@
         // increase sound volume
         // this->soundSource.fadein(this->rainBuffer, 10);
+
     } else if ( this->rainFadeOutDuration != 0 ) {
         if ( this->localTimer < this->rainFadeOutDuration ) {
@@ -227 +228 @@
             // decrease sound volume
             // this->soundSource.fadeout(this->rainBuffer, 10);
+
         } else
             this->deactivate();
@@ -258 +260 @@
 
 }
+
+void RainEffect::hideRain() {
+
+  RainEffect::rainParticles->setColor(0, 0,0,0, 0);
+  RainEffect::rainParticles->setColor(0, 0,0,0, 0);
+
+}

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

@@ -37 +37 @@
         this->activate();
     }
+
     inline void deactivateRain() {
         this->deactivate();
@@ -45 +46 @@
     void startRaining();
     void stopRaining();
+
+    void hideRain();
 
     inline void setRainCoord(float x, float y, float z) {
@@ -84 +87 @@
     ParticleEmitter*            emitter;
 
-    GLfloat         rainFadeInDuration;
-    GLfloat         rainFadeOutDuration;
-    float           localTimer;
+    GLfloat                     rainFadeInDuration;
+    GLfloat                     rainFadeOutDuration;
+    float                       localTimer;
 
-    Vector          rainCoord;
-    Vector2D        rainSize;
-    GLfloat         rainRate;
-    GLfloat         rainVelocity;
-    GLfloat         rainLife;
-    GLfloat         rainMaxParticles;
-    int             rainWindForce;
-    bool            rainMove;
-    bool            rainActivate;
+    Vector                      rainCoord;
+    Vector2D                    rainSize;
+    GLfloat                     rainRate;
+    GLfloat                     rainVelocity;
+    GLfloat                     rainLife;
+    GLfloat                     rainMaxParticles;
+    int                         rainWindForce;
+    bool                        rainMove;
+    bool                        rainActivate;
 
-    OrxSound::SoundSource     soundSource;
+    OrxSound::SoundSource       soundSource;
     OrxSound::SoundBuffer*      rainBuffer;
     OrxSound::SoundBuffer*      windBuffer;
 
-    float         soundRainVolume;
+    float                       soundRainVolume;
 
-    LightManager*       lightMan;
-    GLfloat         rainAmbient;
+    LightManager*               lightMan;
+    GLfloat                     rainAmbient;
 
 };

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

@@ -56 +56 @@
  *  initializes the graphics effect
  */
-bool SunEffect::init()
+void SunEffect::init()
 {}
 

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

@@ -1 +1 @@
 /*!
  * @file sun_effect.h
- *  
+ *
  */
 
@@ -20 +20 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    virtual bool init();
+    virtual void init();
 
-    virtual bool activate() = 0;
-    virtual bool deactivate() = 0;
+    virtual void activate() = 0;
+    virtual void deactivate() = 0;
 
     virtual void draw() const;