Changeset 9028 in orxonox.OLD

Timestamp:

Jul 3, 2006, 11:48:53 AM (18 years ago)

Author:

amaechler

Message:

…

Location:

branches/mountain_lake/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (5 diffs)
• cloud_effect.h (modified) (2 diffs)
• lightning_effect.cc (modified) (2 diffs)

branches/mountain_lake/src/lib/graphics/effects/cloud_effect.cc

@@ -39 +39 @@
 bool      CloudEffect::fadeCloud;
 float     CloudEffect::fadeTime;
-bool      CloudEffect::flashSkyActivate;
-float     CloudEffect::localTimer;
-float     CloudEffect::flashTime;
 
 using namespace std;
@@ -53 +50 @@
 CREATE_SCRIPTABLE_CLASS(CloudEffect, CL_CLOUD_EFFECT,
                         addMethod("skyColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellSkyColor))
-                      ->addMethod("cloudColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellCloudColor))
+                        ->addMethod("cloudColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellCloudColor))
                        );
 
@@ -94 +91 @@
     fadeCloud = false;
 
-    flashSkyActivate = false;
-    localTimer = 0;
-    flashTime = 0;
 
     skyColor = Vector(0.0f, 0.0f, 0.8f);
@@ -192 +186 @@
     if (this->cloudActivate) {
 
-        localTimer += dt;
-
         this->offsetZ += 0.05 * dt * this->animationSpeed;
 
         this->shader->activateShader();
-        this->offset->set(0.0f, 0.0f, offsetZ);
-
-        if (flashSkyActivate) {
-
-            this->skycolor->set(1, 1, 1);
-            PRINTF(0)("SkyColor set to white\n");
-
-            if (localTimer > flashTime) {
-                flashSkyActivate = false;
-                this->skycolor->set(this->skyColor.x, this->skyColor.y, this->skyColor.z);
-                PRINTF(0)("SkyColor reset\n");
+        this->offset->set
+        (0.0f, 0.0f, offsetZ);
+
+        if(cloudColor != newCloudColor) {
+
+            if(fadeCloud) {
+
+                this->cloudColorFadeX = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudX);
+                this->cloudColorFadeX->setInfinity(ANIM_INF_CONSTANT);
+                this->cloudColorFadeY = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudY);
+                this->cloudColorFadeY->setInfinity(ANIM_INF_CONSTANT);
+                this->cloudColorFadeZ = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudZ);
+                this->cloudColorFadeZ->setInfinity(ANIM_INF_CONSTANT);
+
+                this->cloudColorFadeX->addKeyFrame(cloudColor.x, fadeTime, ANIM_LINEAR);
+                this->cloudColorFadeX->addKeyFrame(newCloudColor.x, 0, ANIM_LINEAR);
+
+                this->cloudColorFadeY->addKeyFrame(cloudColor.y, fadeTime, ANIM_LINEAR);
+                this->cloudColorFadeY->addKeyFrame(newCloudColor.y, 0, ANIM_LINEAR);
+
+                this->cloudColorFadeZ->addKeyFrame(cloudColor.z, fadeTime, ANIM_LINEAR);
+                this->cloudColorFadeZ->addKeyFrame(newCloudColor.z, 0, ANIM_LINEAR);
+
+                fadeCloud = false;
+
+                this->cloudColorFadeX->replay();
+                this->cloudColorFadeY->replay();
+                this->cloudColorFadeZ->replay();
             }
 
-        } else {
-
-            if(cloudColor != newCloudColor) {
-
-                if(fadeCloud) {
-
-                    this->cloudColorFadeX = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudX);
-                    this->cloudColorFadeX->setInfinity(ANIM_INF_CONSTANT);
-                    this->cloudColorFadeY = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudY);
-                    this->cloudColorFadeY->setInfinity(ANIM_INF_CONSTANT);
-                    this->cloudColorFadeZ = new tAnimation<CloudEffect>(this, &CloudEffect::setColorCloudZ);
-                    this->cloudColorFadeZ->setInfinity(ANIM_INF_CONSTANT);
-
-                    this->cloudColorFadeX->addKeyFrame(cloudColor.x, fadeTime, ANIM_LINEAR);
-                    this->cloudColorFadeX->addKeyFrame(newCloudColor.x, 0, ANIM_LINEAR);
-
-                    this->cloudColorFadeY->addKeyFrame(cloudColor.y, fadeTime, ANIM_LINEAR);
-                    this->cloudColorFadeY->addKeyFrame(newCloudColor.y, 0, ANIM_LINEAR);
-
-                    this->cloudColorFadeZ->addKeyFrame(cloudColor.z, fadeTime, ANIM_LINEAR);
-                    this->cloudColorFadeZ->addKeyFrame(newCloudColor.z, 0, ANIM_LINEAR);
-
-                    fadeCloud = false;
-
-                    this->cloudColorFadeX->replay();
-                    this->cloudColorFadeY->replay();
-                    this->cloudColorFadeZ->replay();
-                }
-
-                this->cloudcolor->set(this->cloudColor.x, this->cloudColor.y, this->cloudColor.z);
+            this->cloudcolor->set
+            (this->cloudColor.x, this->cloudColor.y, this->cloudColor.z);
+        }
+
+        if(skyColor != newSkyColor) {
+
+            if(fadeSky) {
+
+                this->skyColorFadeX = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyX);
+                this->skyColorFadeX->setInfinity(ANIM_INF_CONSTANT);
+                this->skyColorFadeY = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyY);
+                this->skyColorFadeY->setInfinity(ANIM_INF_CONSTANT);
+                this->skyColorFadeZ = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyZ);
+                this->skyColorFadeZ->setInfinity(ANIM_INF_CONSTANT);
+
+                this->skyColorFadeX->addKeyFrame(skyColor.x, fadeTime, ANIM_LINEAR);
+                this->skyColorFadeX->addKeyFrame(newSkyColor.x, 0, ANIM_LINEAR);
+
+                this->skyColorFadeY->addKeyFrame(skyColor.y, fadeTime, ANIM_LINEAR);
+                this->skyColorFadeY->addKeyFrame(newSkyColor.y, 0, ANIM_LINEAR);
+
+                this->skyColorFadeZ->addKeyFrame(skyColor.z, fadeTime, ANIM_LINEAR);
+                this->skyColorFadeZ->addKeyFrame(newSkyColor.z, 0, ANIM_LINEAR);
+
+                fadeSky = false;
+
+                this->skyColorFadeX->replay();
+                this->skyColorFadeY->replay();
+                this->skyColorFadeZ->replay();
             }
 
-            if(skyColor != newSkyColor) {
-
-                if(fadeSky) {
-
-                    this->skyColorFadeX = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyX);
-                    this->skyColorFadeX->setInfinity(ANIM_INF_CONSTANT);
-                    this->skyColorFadeY = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyY);
-                    this->skyColorFadeY->setInfinity(ANIM_INF_CONSTANT);
-                    this->skyColorFadeZ = new tAnimation<CloudEffect>(this, &CloudEffect::setColorSkyZ);
-                    this->skyColorFadeZ->setInfinity(ANIM_INF_CONSTANT);
-
-                    this->skyColorFadeX->addKeyFrame(skyColor.x, fadeTime, ANIM_LINEAR);
-                    this->skyColorFadeX->addKeyFrame(newSkyColor.x, 0, ANIM_LINEAR);
-
-                    this->skyColorFadeY->addKeyFrame(skyColor.y, fadeTime, ANIM_LINEAR);
-                    this->skyColorFadeY->addKeyFrame(newSkyColor.y, 0, ANIM_LINEAR);
-
-                    this->skyColorFadeZ->addKeyFrame(skyColor.z, fadeTime, ANIM_LINEAR);
-                    this->skyColorFadeZ->addKeyFrame(newSkyColor.z, 0, ANIM_LINEAR);
-
-                    fadeSky = false;
-
-                    this->skyColorFadeX->replay();
-                    this->skyColorFadeY->replay();
-                    this->skyColorFadeZ->replay();
-                }
-
-                this->skycolor->set(this->skyColor.x, this->skyColor.y, this->skyColor.z);
-            }
+            this->skycolor->set
+            (this->skyColor.x, this->skyColor.y, this->skyColor.z);
         }
 
@@ -316 +297 @@
 void CloudEffect::shellCloudColor(float colorX, float colorY, float colorZ, float time) {
     changeCloudColor( Vector(colorX, colorY, colorZ), time);
-}
-
-void CloudEffect::flashSky( float time ) {
-
-  flashSkyActivate = true;
-  localTimer = 0;
-  flashTime = time;
-
 }
 

branches/mountain_lake/src/lib/graphics/effects/cloud_effect.h

@@ -119 +119 @@
     void shellCloudColor(float colorX, float colorY, float colorZ, float time);
 
-    static void flashSky(float time);
 
 private:
@@ -167 +166 @@
     int              BM;
 
-    static bool      flashSkyActivate;
-    static float     localTimer;
-    static float     flashTime;
 
 };

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

@@ -199 +199 @@
         this->flashLight->setSpecularColor(1,1,1);
 
-        CloudEffect::flashSky(0.02);
 
         // Play thunder sound
@@ -223 +222 @@
         this->flashLight->setDiffuseColor(0,0,0);
         this->flashLight->setSpecularColor(0,0,0);
-        CloudEffect::changeSkyColor(Vector(0,0,1), 0.02);
 
         this->newCoordinates();