Changeset 8266 in orxonox.OLD

Timestamp:

Jun 8, 2006, 4:26:40 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: cool light effect for the lightening

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/effects/lightening_effect.cc (modified) (3 diffs)
• lib/graphics/effects/lightening_effect.h (modified) (2 diffs)
• world_entities/effects/billboard.cc (modified) (2 diffs)

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

@@ -71 +71 @@
   this->time = 0.0;
   this->flashFrequency = 1.4f;
+  this->mainFrequency = 1.4f;
   this->flashConstTime = 0.5f;
   this->flashRisingTime = 0.1f;
@@ -105 +106 @@
   this->billboard[3]->setTexture("maps/lightning_bolt4.png");
   this->billboard[3]->setSize(this->width, this->height);
-  this->billboard[3]->setAbsCoor(0.0f, 50.0f, 0.0f);
+  this->billboard[3]->setAbsCoor(3000,850,0);
   this->billboard[3]->setVisibiliy(false);
 /*
@@ -230 +231 @@
     this->billboard[2]->setAbsCoor(posX, this->mainPosY, posZ);
     this->billboard[3]->setAbsCoor(posX, this->mainPosY, posZ);
+    this->flashFrequency = this->mainFrequency + this->seedTime * (float)rand()/(float)RAND_MAX;
+    
     this->bNewCoordinate = false;
   }

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

@@ -38 +38 @@
     
     inline void setLighteningOption(const std::string& option) { if (option == "activate") this->lighteningActivate = true;}
-    inline void setFlashFrequency(float flashFrequency) { this->flashFrequency = flashFrequency; }
+    inline void setFlashFrequency(float mainFrequency) { this->mainFrequency = mainFrequency;
+                                                                                     this->flashFrequency = mainFrequency; }
     inline void setFlashConstTime(float flashConstTime) { this->flashConstTime = flashConstTime; }
     inline void setFlashRisingTime(float flashRisingTime) { if(flashRisingTime > this->flashConstTime)
@@ -56 +57 @@
 
     float flashFrequency;
+    float mainFrequency;
     float flashConstTime;
     float flashRisingTime;

branches/atmospheric_engine/src/world_entities/effects/billboard.cc

@@ -121 +121 @@
     return;
 
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_LIGHTING);
+  glDisable(GL_FOG);
+  
   glPushMatrix();
 
@@ -164 +168 @@
   
   glPopMatrix();
+  
+  glPopAttrib();
 }