Changeset 8702 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc

Timestamp:

Jun 22, 2006, 11:12:05 AM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: cleanup

File:

• branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc (modified) (10 diffs)

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

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2004 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
 ### File Specific:
    main-programmer: hdavid, amaechler
@@ -35 +35 @@
 
 CREATE_FACTORY(LighteningEffect, CL_LIGHTENING_EFFECT);
-
-// TODO: FIx Lightening with Fog enabled
 
 LighteningEffect::LighteningEffect(const TiXmlElement* root)
@@ -80 +78 @@
   this->lighteningActivate = false;
 
-  this->time = 0.0;
-  this->flashFrequency = 4.0f;
-  this->mainFrequency = 4.0f;
-  this->flashConstTime = 0.1f;
+  this->flashFrequencyBase = 2.0f;
+  this->flashFrequencySeed = 4.0f;
+
+  this->flashHoldTime = 0.1f;
   this->flashRisingTime = 0.03f;
+
+  this->seedX = 500.f;
+  this->seedZ = 1000.0f;
 
   this->width = 700.0f;
@@ -90 +91 @@
   this->seedWidth = 50.0f;
   this->seedHeight = 50.0f;
-  this->bNewCoordinate = false;
+
   this->lighteningMove = false;
 
-  this->seedX = 500.f;
-  this->seedZ = 1000.0f;
-  this->seedTime = 2.0f;
-
-  this->mainPosX = 3000;
+  this->mainPosX = 2000;
   this->mainPosY = 900;
   this->mainPosZ = 0;
+
+  this->time = 0.0;
 
   // initialize lightening textures
@@ -142 +141 @@
   this->flashLight->setSpecularColor(0,0,0);
 
-  // this->soundSource = NULL;
-  // this->thunderBuffer = NULL;
-
-  // this->soundSource.setSourceNode(this);
-
   //load sound
   if (this->thunderBuffer != NULL)
     ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
+  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.ogg", OGG);
 
 }
@@ -252 +246 @@
     this->billboard[1]->setVisibiliy(false);
     this->billboard[2]->setVisibiliy(true);
-    
+
   }
   else if( this->billboard[2]->isVisible() && this->time > this->flashRisingTime)
@@ -260 +254 @@
   }
 
-  if( this->billboard[3]->isVisible() && this->time > this->flashConstTime)
+  if( this->billboard[3]->isVisible() && this->time > this->flashHoldTime)
   {
     this->billboard[3]->setVisibiliy(false);
@@ -266 +260 @@
     this->flashLight->setDiffuseColor(0,0,0);
     this->flashLight->setSpecularColor(0,0,0);
-    this->bNewCoordinate = true;
-  }
-
-  if( this->bNewCoordinate)
-  {
+
+    this->newCoordinates();
+  }
+}
+
+void LighteningEffect::newCoordinates() {
+
     float posX, posZ;
 
@@ -294 +290 @@
     this->billboard[3]->setAbsCoor(posX, this->mainPosY, posZ);
 
-    this->flashFrequency = this->mainFrequency + this->seedTime * (float)rand()/(float)RAND_MAX;
+    this->flashFrequency = this->flashFrequencyBase + this->flashFrequencySeed * (float)rand()/(float)RAND_MAX;
 
     float w = this->width + this->seedWidth * (float)rand()/(float)RAND_MAX;
@@ -303 +299 @@
     this->billboard[2]->setSize(w, h);
     this->billboard[3]->setSize(w, h);
-
-    this->bNewCoordinate = false;
-  }
-}
+}