Changeset 8781 in orxonox.OLD

Timestamp:

Jun 26, 2006, 1:33:56 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: cloud effect

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (6 diffs)
• cloud_effect.h (modified) (4 diffs)

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

@@ -71 +71 @@
   this->planetRadius = 1500;
   this->divs = 50;
+  
+  this->skyColor = Vector(0.0f, 0.0f, 0.8f);
+  this->cloudColor = Vector(0.8f, 0.8f, 0.8f);
 
   noise3DTexSize = 128;
@@ -90 +93 @@
                0, GL_RGBA, GL_UNSIGNED_BYTE, noise3DTexPtr);
   
-  skydome = new Skydome();
-  skydome->setTexture(noise3DTexName);
+  this->skydome = new Skydome();
+  this->skydome->setTexture(noise3DTexName);
   
   shader = new Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",
@@ -99 +102 @@
 
   Shader::Uniform(shader, "Noise").set(0);
-  //Shader::Uniform(shader, "SkyColor").set(0.0f, 0.0f, 0.8f);
-  Shader::Uniform(shader, "CloudColor").set(0.8f, 0.8f, 0.8f);
   
   offset = new Shader::Uniform(shader, "Offset");
   skycolor = new Shader::Uniform(shader, "SkyColor");
-  skycolor->set(0.0f, 0.0f, 0.0f);
+  cloudcolor = new Shader::Uniform(shader, "CloudColor");
 
   this->shader->deactivateShader();
   
-  skydome->setShader(shader);
+  this->skydome->setShader(shader);
 }
 
@@ -118 +119 @@
   LoadParam(root, "speed", this, CloudEffect, setAnimationSpeed);
   LoadParam(root, "scale", this, CloudEffect, setCloudScale);
+  LoadParam(root, "cloudcolor", this, CloudEffect, setCloudColor);
+  LoadParam(root, "skycolor", this, CloudEffect, setSkyColor);
   
   LoadParam(root, "planetRadius", this, CloudEffect, setPlanetRadius);
@@ -138 +141 @@
   this->shader->activateShader();
   Shader::Uniform(shader, "Scale").set(this->scale);
+  this->skycolor->set(skyColor.x, skyColor.y, skyColor.z);
+  this->cloudcolor->set(cloudColor.x, cloudColor.y, cloudColor.z);
   this->shader->deactivateShader();
   
@@ -164 +169 @@
     this->shader->activateShader();
     offset->set(0.0f, 0.0f, offsetZ);
-    skycolor->set(offsetZ/10, 0.0f, 0.0f);
     this->shader->deactivateShader();
   }

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

@@ -64 +64 @@
   { this->scale = scale; }
   
+  inline void setCloudColor(float colorX, float colorY, float colorZ)
+  { this->cloudColor = Vector(colorX, colorY, colorZ); }
+  
+  inline void setSkyColor(float colorX, float colorY, float colorZ)
+  { this->skyColor = Vector(colorX, colorY, colorZ); }
+  
   inline void setPlanetRadius(float planetRadius)
   { this->planetRadius = planetRadius; }
@@ -75 +81 @@
   virtual void draw() const;
   virtual void tick(float dt);
+  
+  
 
   void make3DNoiseTexture();
@@ -89 +97 @@
   bool             cloudActivate;
   float            animationSpeed;
+  Vector           cloudColor;
+  Vector           skyColor;
 
   // Material                 cloudMaterial;
@@ -97 +107 @@
   Shader::Uniform* offset;
   Shader::Uniform* skycolor;
+  Shader::Uniform* cloudcolor;
   float            offsetZ;
   float            scale;