Changeset 8837 in orxonox.OLD for branches/mountain_lake/src/lib/graphics/effects/cloud_effect.cc

Timestamp:

Jun 27, 2006, 5:26:04 PM (19 years ago)

Author:

hdavid

Message:

branches/mountain_lake: fading sky/cloud colors works, RainEffect::stopRaining is a bit buggy

File:

• branches/mountain_lake/src/lib/graphics/effects/cloud_effect.cc (modified) (7 diffs)

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

@@ -26 +26 @@
 #include "shader.h"
 #include "shell_command.h"
+#include "t_animation.h"
 
 #include "parser/tinyxml/tinyxml.h"
@@ -34 +35 @@
 Vector  CloudEffect::newSkyColor;
 
+bool CloudEffect::fadeSky;
+bool CloudEffect::fadeCloud;
+float CloudEffect::fadeTime;
+
 using namespace std;
 
@@ -68 +73 @@
 {
   PRINTF(0)("Initializing CloudEffect\n");
-
+  
   this->offsetZ = 0;
   this->animationSpeed = 2;
@@ -75 +80 @@
   this->planetRadius = 1500;
   this->divs = 50;
+  fadeSky = false;
+  fadeCloud = false;
 
   skyColor = Vector(0.0f, 0.0f, 0.8f);
@@ -80 +87 @@
   newSkyColor = skyColor;
   newCloudColor = cloudColor;
-  this->fadeTime = 3;
 
   this->noise3DTexSize = 128;
@@ -176 +182 @@
     this->offset->set(0.0f, 0.0f, offsetZ);
     
-    //if(cloudColor != newCloudColor)
-    //{
-      // TODO: fade from cloudColor to newCloudColor
-      cloudColor = newCloudColor;
+    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);
-    //}
-    //if(cloudColor != newCloudColor)
-    //{
-      // TODO: fade from skyColor to newSkyColor
-      skyColor = newSkyColor;
+    }
+
+    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->shader->deactivateShader();
@@ -194 +247 @@
 
 
-void CloudEffect::changeSkyColor(Vector color)
+void CloudEffect::setColorSkyX(float color)
+{
+  skyColor.x = color;
+}
+void CloudEffect::setColorSkyY(float color)
+{
+  skyColor.y = color;
+}
+void CloudEffect::setColorSkyZ(float color)
+{
+  skyColor.z = color;
+}
+void CloudEffect::setColorCloudX(float color)
+{
+  cloudColor.x = color;
+}
+void CloudEffect::setColorCloudY(float color)
+{
+  cloudColor.y = color;
+}
+void CloudEffect::setColorCloudZ(float color)
+{
+  cloudColor.z = color;
+}
+
+void CloudEffect::changeSkyColor(Vector color, float time)
 {
   newSkyColor = color;
-}
-
-
-void CloudEffect::changeCloudColor(Vector color)
+  fadeSky = true;
+  fadeTime = time;
+}
+
+
+void CloudEffect::changeCloudColor(Vector color, float time)
 {
   newCloudColor = color;
+  fadeCloud = true;
+  fadeTime = time;
 }