Changeset 8793 in orxonox.OLD for trunk/src/lib/graphics/effects/lightening_effect.h

Timestamp:

Jun 26, 2006, 3:36:16 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the weather engine branche to the trunk

File:

• trunk/src/lib/graphics/effects/lightening_effect.h (modified) (3 diffs)

trunk/src/lib/graphics/effects/lightening_effect.h

@@ -33 +33 @@
                 inline  void deactivateLightening() { this->deactivate(); }
 
-                virtual void draw() const;
                 virtual void tick(float dt);
-                
+
                 void coord(float x, float y, float z);
                 void setFlashSize(float width, float height, float seedWidth, float seedHeight);
-                
+
                 inline void setLighteningOption(const std::string& option) {
                         if (option == "activate") this->lighteningActivate = true;
@@ -44 +43 @@
                 }
 
-                inline void setFlashFrequency(float mainFrequency, float seedTime) {
-                        this->mainFrequency = mainFrequency;
-                        this->flashFrequency = mainFrequency;
-                        this->seedTime = seedTime;
+                inline void setFlashFrequency(float baseFrequency, float seedTime) {
+                        this->flashFrequencyBase = baseFrequency;
+                        this->flashFrequency = baseFrequency;
+                        this->flashFrequencySeed = seedTime;
                 }
-                
-                inline void setFlashConstTime(float flashConstTime) { this->flashConstTime = flashConstTime; }
+
+                inline void setFlashConstTime(float holdTime) { this->flashHoldTime = holdTime; }
 
                 inline void setFlashRisingTime(float flashRisingTime) {
-                        if(flashRisingTime > this->flashConstTime)
-                                this->flashRisingTime = this->flashConstTime/2;
+                        if(flashRisingTime > this->flashHoldTime)
+                                this->flashRisingTime = this->flashHoldTime * 0.5;
                         else
                                 this->flashRisingTime = flashRisingTime;
                 }
-                
+
                 inline void setFlashSeed(float seedX, float seedZ) {
                         this->seedX = seedX;
                         this->seedZ = seedZ;
                 }
-                
+
 
         private:
@@ -69 +68 @@
                 bool lighteningActivate;
                 bool lighteningMove;
-                
+
                 float flashFrequency;
-                float mainFrequency;
-                float flashConstTime;
+                float flashFrequencyBase;
+                float flashHoldTime;
                 float flashRisingTime;
-                
+
                 float time;
-                
-                bool  bNewCoordinate;
+
                 float width;
                 float height;
                 float seedWidth;
                 float seedHeight;
-                
+
                 float seedX;
                 float seedZ;
-                float seedTime;
-                
+                float flashFrequencySeed;
+
                 float mainPosX;
                 float mainPosY;
                 float mainPosZ;
-                
+
+    void newCoordinates();
+
                 Vector cameraCoor;
-                
+
                 Light* flashLight;
-                
-                //OrxSound::SoundSource    soundSource;
-                //OrxSound::SoundBuffer*   thunderBuffer;
+
+                OrxSound::SoundSource    soundSource;
+                OrxSound::SoundBuffer*   thunderBuffer;
 
 };