Changeset 8789 in orxonox.OLD for branches

Timestamp:

Jun 26, 2006, 2:45:28 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: activating rain effect changes the cloud- & skycolor

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (5 diffs)
• cloud_effect.h (modified) (1 diff)

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

@@ -31 +31 @@
 Vector  CloudEffect::cloudColor;
 Vector  CloudEffect::skyColor;
+Vector  CloudEffect::newCloudColor;
+Vector  CloudEffect::newSkyColor;
 
 using namespace std;
@@ -76 +78 @@
   this->skyColor = Vector(0.0f, 0.0f, 0.8f);
   this->cloudColor = Vector(0.8f, 0.8f, 0.8f);
+  this->newSkyColor = this->skyColor;
+  this->newCloudColor = this->cloudColor;
+  this->fadeTime = 3;
 
   this->noise3DTexSize = 128;
@@ -170 +175 @@
     this->shader->activateShader();
     this->offset->set(0.0f, 0.0f, offsetZ);
-    this->cloudcolor->set(this->cloudColor.x, this->cloudColor.y, this->cloudColor.z);
-    this->skycolor->set(this->skyColor.x, this->skyColor.y, this->skyColor.z);
+    
+    //if(cloudColor != newCloudColor)
+    //{
+      // TODO: fade from cloudColor to newCloudColor
+      cloudColor = newCloudColor;
+      this->cloudcolor->set(this->cloudColor.x, this->cloudColor.y, this->cloudColor.z);
+    //}
+    //if(cloudColor != newCloudColor)
+    //{
+      // TODO: fade from skyColor to newSkyColor
+      skyColor = newSkyColor;
+      this->skycolor->set(this->skyColor.x, this->skyColor.y, this->skyColor.z);
+    //}
+    
     this->shader->deactivateShader();
   }
@@ -179 +196 @@
 void CloudEffect::changeSkyColor(Vector color)
 {
-  skyColor = color;
+  newSkyColor = color;
 }
 
@@ -185 +202 @@
 void CloudEffect::changeCloudColor(Vector color)
 {
-  cloudColor = color;
+  newCloudColor = color;
 }
 

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

@@ -101 +101 @@
   bool             cloudActivate;
   float            animationSpeed;
+  float            fadeTime;
+  
+  static Vector           newSkyColor;
+  static Vector           newCloudColor;
 
   // Material                 cloudMaterial;