Changeset 8663 in orxonox.OLD

Timestamp:

Jun 21, 2006, 9:00:01 AM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: cloud animation works

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (11 diffs)
• cloud_effect.h (modified) (2 diffs)

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

@@ -22 +22 @@
 
 #include "material.h"
-#include <math.h>
 #include "state.h"
 #include "p_node.h"
@@ -41 +40 @@
 {
   this->setClassID(CL_CLOUD_EFFECT, "CloudEffect");
-  //  this->toList(OM_ENVIRON);
 
   this->init();
@@ -48 +46 @@
     this->loadParams(root);
 
-  //if(cloudActivate)
-  this->activate();
+  if(cloudActivate)
+    this->activate();
 }
 
@@ -61 +59 @@
 {
   PRINTF(0)("Initializing CloudEffect\n");
+  
+  this->offsetZ = 0;
+  this->animationSpeed = 2;
 
   noise3DTexSize = 64;
@@ -79 +80 @@
                noise3DTexSize, noise3DTexSize, noise3DTexSize,
                0, GL_RGBA, GL_UNSIGNED_BYTE, noise3DTexPtr);
-
-
-  //cloudMaterial.setDiffuseMap("pictures/sky/cloud1.jpg", GL_TEXTURE_2D, 0);
-
-  coor = 0;
   
   shader = new Shader(ResourceManager::getInstance()->getDataDir() + "/shaders/cloud.vert",
@@ -106 +102 @@
   WeatherEffect::loadParams(root);
 
-  // LoadParam(root, "speed", this, CloudEffect, setCloudAnimation);
-  // LoadParam(root, "texture", this, CloudEffect, setCloudTexture);
-  /*
+  LoadParam(root, "speed", this, CloudEffect, setAnimationSpeed);
+  
   LOAD_PARAM_START_CYCLE(root, element);
   {
-  LoadParam_CYCLE(element, "option", this, CloudEffect, setCloudOption);
-  }
-  LOAD_PARAM_END_CYCLE(element);*/
+    LoadParam_CYCLE(element, "option", this, CloudEffect, setCloudOption);
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -121 +116 @@
   PRINTF(0)( "Activating\n");
 
-  //  this->cloudActivate = true;
+  this->cloudActivate = true;
 }
 
@@ -128 +123 @@
   PRINTF(0)("Deactivating CloudEffect\n");
 
-  //  this->cloudActivate = false;
+  this->cloudActivate = false;
 }
 
 void CloudEffect::draw() const
 {
-  //if (!this->cloudActivate)
-  //  return;
+  if (!this->cloudActivate)
+    return;
+  
   glPushAttrib(GL_ENABLE_BIT);
 
@@ -143 +139 @@
   glBindTexture(GL_TEXTURE_3D, noise3DTexName);
 
-
-  //this->shader->activateShader();
-
-  //glMatrixMode(GL_MODELVIEW);
-  //glColor4f(1,1,1,1);
   glPushMatrix();
-  //glTranslatef(0,this->waterHeight,0);
-
-  //cloudMaterial.unselect();
-  //cloudMaterial.select();
 
   this->shader->activateShader();
-  //PRINTF(0)("coor: %f\n", coor);
-  offset->set(coor, coor, coor);
-
-  //glutSolidTeapot(1);
+  offset->set(0.0f, 0.0f, offsetZ);
 
 
@@ -173 +157 @@
   this->shader->deactivateShader();
 
-  //cloudMaterial.unselect();
-
   glPopMatrix();
-
   glPopAttrib();
 
@@ -183 +164 @@
 void CloudEffect::tick (float dt)
 {
-  //if (!this->cloudActivate)
-  //  return;
-  coor += 10;
+  if (!this->cloudActivate)
+    return;
+  this->offsetZ += 0.05 * dt * this->animationSpeed;
 }
 

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

@@ -52 +52 @@
     this->deactivate();
   }
+  inline void setCloudOption(const std::string& option)
+  {
+    if (option == "activate")
+      this->cloudActivate = true;
+  }
+  inline void setAnimationSpeed(float speed)
+  {
+    this->animationSpeed = speed;
+  }
 
   virtual void draw() const;
@@ -63 +72 @@
   void normalize3(double v[3]);
 
-  /*inline void setCloudOption(const std::string& option) {
-      if (option == "activate")
-  this->cloudActivate = true;
-  }*/
+private:
 
-
-private:
-  //void initialize(char* fileName);
-
-  //bool        cloudActivate;
+  bool        cloudActivate;
+  float       animationSpeed;
 
   // Material                 cloudMaterial;
   Shader*                 shader;
   Shader::Uniform*        offset;
-  
-  float coor;
+
+  float offsetZ;
 
   int noise3DTexSize;