Changeset 8269 in orxonox.OLD

Timestamp:

Jun 8, 2006, 4:42:16 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine:

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• lightening_effect.cc (modified) (1 diff)
• lightening_effect.h (modified) (2 diffs)

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

@@ -232 +232 @@
     this->billboard[3]->setAbsCoor(posX, this->mainPosY, posZ);
     this->flashFrequency = this->mainFrequency + this->seedTime * (float)rand()/(float)RAND_MAX;
-    
+    float w = this->width + this->seedWidth * (float)rand()/(float)RAND_MAX;
+    float h = this->height + this->seedHeight * (float)rand()/(float)RAND_MAX;
+    this->billboard[0]->setSize(w, h);
+    this->billboard[1]->setSize(w, h);
+    this->billboard[2]->setSize(w, h);
+    this->billboard[3]->setSize(w, h);
     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 mainFrequency) { this->mainFrequency = mainFrequency;
-                                                                                     this->flashFrequency = mainFrequency; }
+    inline void setFlashFrequency(float mainFrequency, float seedTime) { this->mainFrequency = mainFrequency;
+                                                                                                            this->flashFrequency = mainFrequency;
+                                                                                                            this->seedTime = seedTime; }
     inline void setFlashConstTime(float flashConstTime) { this->flashConstTime = flashConstTime; }
     inline void setFlashRisingTime(float flashRisingTime) { if(flashRisingTime > this->flashConstTime)
@@ -45 +46 @@
                                                                                       else
                                                                                         this->flashRisingTime = flashRisingTime; }
-    inline void setFlashSeed(float seedX, float seedZ, float seedTime) { this->seedX = seedX;
-                                                                                                         this->seedZ = seedZ;
-                                                                                                         this->seedTime = seedTime; }
+    inline void setFlashSeed(float seedX, float seedZ) { this->seedX = seedX;
+                                                                                  this->seedZ = seedZ; }
 
     void activateLightening() { this->activate(); }