Changeset 8713 in orxonox.OLD

Timestamp:

Jun 22, 2006, 1:11:41 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (7 diffs)
• cloud_effect.h (modified) (2 diffs)
• lightening_effect.cc (modified) (3 diffs)

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

@@ -64 +64 @@
   this->offsetZ = 0;
   this->animationSpeed = 2;
-  this->lightPos = Vector(0,0,0);
-  this->scale = 0.0008f;
+  this->scale = 0.0004f;
   this->atmosphericRadius = 4000;
   this->planetRadius = 1500;
@@ -108 +107 @@
 
   LoadParam(root, "speed", this, CloudEffect, setAnimationSpeed);
-  LoadParam(root, "lightPos", this, CloudEffect, setLightPosition);
   LoadParam(root, "scale", this, CloudEffect, setCloudScale);
   
@@ -130 +128 @@
   this->shader->activateShader();
   Shader::Uniform(shader, "Scale").set(this->scale);
-  Shader::Uniform(shader, "LightPos").set(lightPos.x, lightPos.y, lightPos.z);
   this->shader->deactivateShader();
   
@@ -157 +154 @@
   glEnable(GL_TEXTURE_3D);
   glBindTexture(GL_TEXTURE_3D, noise3DTexName);
-
-  //glPushMatrix();
 
   this->shader->activateShader();
@@ -177 +172 @@
   glTranslatef(0.0f,pRadius,0.0f);
   //glRotatef(timeGetTime()/2000.0f,0.0f, 1.0f, 0.0f);
-  //glTranslatef(0.0f,0.0f,0.0f);
 
   glBegin(GL_TRIANGLES);
@@ -195 +189 @@
   this->shader->deactivateShader();
 
-  //glPopMatrix();
   glPopAttrib();
 
@@ -202 +195 @@
 void CloudEffect::tick (float dt)
 {
-  if (!this->cloudActivate)
-    return;
-  this->offsetZ += 0.05 * dt * this->animationSpeed;
+  if (this->cloudActivate)
+    this->offsetZ += 0.05 * dt * this->animationSpeed;
 }
 

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

@@ -69 +69 @@
   inline void setAnimationSpeed(float speed)
   { this->animationSpeed = speed; }
-  
-  inline void setLightPosition(float x, float y, float z)
-  { this->lightPos = Vector(x,y,z); }
 
   inline void setCloudScale(float scale)
@@ -108 +105 @@
   Shader::Uniform* offset;
   float            offsetZ;
-  Vector           lightPos;
   float            scale;
   float            planetRadius;

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

@@ -78 +78 @@
   this->lighteningActivate = false;
 
-  this->flashFrequencyBase = 2.0f;
-  this->flashFrequencySeed = 4.0f;
+  this->flashFrequency = 4.0f;
+  this->flashFrequencyBase = 4.0f;
+  this->flashFrequencySeed = 2.0f;
 
   this->flashHoldTime = 0.1f;
@@ -94 +95 @@
   this->lighteningMove = false;
 
-  this->mainPosX = 2000;
+  this->mainPosX = 1200;
   this->mainPosY = 900;
   this->mainPosZ = 0;
@@ -124 +125 @@
   {
     this->cameraCoor = State::getCameraNode()->getAbsCoor();
-    this->billboard[0]->setAbsCoor(this->cameraCoor.x+3000,900,this->cameraCoor.z+0);
-    this->billboard[1]->setAbsCoor(this->cameraCoor.x+3000,900,this->cameraCoor.z+0);
-    this->billboard[2]->setAbsCoor(this->cameraCoor.x+3000,900,this->cameraCoor.z+0);
-    this->billboard[3]->setAbsCoor(this->cameraCoor.x+3000,900,this->cameraCoor.z+0);
+    this->billboard[0]->setAbsCoor(this->cameraCoor.x+1200,900,this->cameraCoor.z+0);
+    this->billboard[1]->setAbsCoor(this->cameraCoor.x+1200,900,this->cameraCoor.z+0);
+    this->billboard[2]->setAbsCoor(this->cameraCoor.x+1200,900,this->cameraCoor.z+0);
+    this->billboard[3]->setAbsCoor(this->cameraCoor.x+1200,900,this->cameraCoor.z+0);
   }
   else
   {
-    this->billboard[0]->setAbsCoor(3000,900,0);
-    this->billboard[1]->setAbsCoor(3000,900,0);
-    this->billboard[2]->setAbsCoor(3000,900,0);
-    this->billboard[3]->setAbsCoor(3000,900,0);
+    this->billboard[0]->setAbsCoor(1200,900,0);
+    this->billboard[1]->setAbsCoor(1200,900,0);
+    this->billboard[2]->setAbsCoor(1200,900,0);
+    this->billboard[3]->setAbsCoor(1200,900,0);
   }