Changeset 8326 in orxonox.OLD

Timestamp:

Jun 12, 2006, 3:50:16 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• lightening_effect.cc (modified) (8 diffs)
• lightening_effect.h (modified) (3 diffs)

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

@@ -56 +56 @@
   
   LoadParam(root, "coord", this, LighteningEffect, coord);
-  LoadParam(root, "option", this, LighteningEffect, setLighteningOption);
   LoadParam(root, "frequency", this, LighteningEffect, setFlashFrequency);
   LoadParam(root, "const-time", this, LighteningEffect, setFlashConstTime);
@@ -62 +61 @@
   LoadParam(root, "size", this, LighteningEffect, setFlashSize);
   LoadParam(root, "seed", this, LighteningEffect, setFlashSeed);
+  
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    LoadParam_CYCLE(element, "option", this, LighteningEffect, setLighteningOption);
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -88 +93 @@
   this->billboard[0]->setTexture("maps/lightning_bolt1.png");
   this->billboard[0]->setSize(this->width, this->height);
-  this->billboard[0]->setAbsCoor(3000,850,0);
   this->billboard[0]->setVisibiliy(false);
 
@@ -94 +98 @@
   this->billboard[1]->setTexture("maps/lightning_bolt2.png");
   this->billboard[1]->setSize(this->width, this->height);
-  this->billboard[1]->setAbsCoor(3000,850,0);
   this->billboard[1]->setVisibiliy(false);
 
@@ -100 +103 @@
   this->billboard[2]->setTexture("maps/lightning_bolt3.png");
   this->billboard[2]->setSize(this->width, this->height);
-  this->billboard[2]->setAbsCoor(3000,850,0);
   this->billboard[2]->setVisibiliy(false);
 
@@ -106 +108 @@
   this->billboard[3]->setTexture("maps/lightning_bolt4.png");
   this->billboard[3]->setSize(this->width, this->height);
-  this->billboard[3]->setAbsCoor(3000,850,0);
   this->billboard[3]->setVisibiliy(false);
+  
+  if (this->lighteningMove)
+  {
+    this->cameraCoor = State::getCameraNode()->getAbsCoor();
+    this->billboard[0]->setAbsCoor(this->cameraCoor.x+3000,850,this->cameraCoor.z+0);
+    this->billboard[1]->setAbsCoor(this->cameraCoor.x+3000,850,this->cameraCoor.z+0);
+    this->billboard[2]->setAbsCoor(this->cameraCoor.x+3000,850,this->cameraCoor.z+0);
+    this->billboard[3]->setAbsCoor(this->cameraCoor.x+3000,850,this->cameraCoor.z+0);
+  }
+  else
+  {
+    this->billboard[0]->setAbsCoor(3000,850,0);
+    this->billboard[1]->setAbsCoor(3000,850,0);
+    this->billboard[2]->setAbsCoor(3000,850,0);
+    this->billboard[3]->setAbsCoor(3000,850,0);
+  }
   
   this->flashLight = new Light();
@@ -127 +144 @@
 void LighteningEffect::coord(float x, float y, float z)
 {
-  this->billboard[0]->setAbsCoor(x, y, z);
-  this->billboard[1]->setAbsCoor(x, y, z);
-  this->billboard[2]->setAbsCoor(x, y, z);
-  this->billboard[3]->setAbsCoor(x, y, z);
+  if (this->lighteningMove)
+  {
+    this->cameraCoor = State::getCameraNode()->getAbsCoor();
+    this->billboard[0]->setAbsCoor(this->cameraCoor.x+x, y, this->cameraCoor.z+z);
+    this->billboard[1]->setAbsCoor(this->cameraCoor.x+x, y, this->cameraCoor.z+z);
+    this->billboard[2]->setAbsCoor(this->cameraCoor.x+x, y, this->cameraCoor.z+z);
+    this->billboard[3]->setAbsCoor(this->cameraCoor.x+x, y, this->cameraCoor.z+z);
+  }
+  else
+  {
+    this->billboard[0]->setAbsCoor(x, y, z);
+    this->billboard[1]->setAbsCoor(x, y, z);
+    this->billboard[2]->setAbsCoor(x, y, z);
+    this->billboard[3]->setAbsCoor(x, y, z);
+  }
   this->mainPosX = x;
   this->mainPosY = y;
@@ -219 +247 @@
   if( this->bNewCoordinate)
   {
-    float posX = this->mainPosX - this->seedX * (float)rand()/(float)RAND_MAX;
-    float posZ = this->mainPosZ + this->seedZ * (float)rand()/(float)RAND_MAX;
+    float posX, posZ;
+    if(this->lighteningMove)
+    {
+    this->cameraCoor = State::getCameraNode()->getAbsCoor();
+    posX = this->mainPosX - this->seedX * (float)rand()/(float)RAND_MAX + this->cameraCoor.x;
+    posZ = this->mainPosZ + this->seedZ * (float)rand()/(float)RAND_MAX + this->cameraCoor.z;
+    }
+    else
+    {
+      posX = this->mainPosX - this->seedX * (float)rand()/(float)RAND_MAX;
+      posZ = this->mainPosZ + this->seedZ * (float)rand()/(float)RAND_MAX;
+    }
+    
     this->billboard[0]->setAbsCoor(posX, this->mainPosY, posZ);
     this->billboard[1]->setAbsCoor(posX, this->mainPosY, posZ);

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

@@ -37 +37 @@
     void setFlashSize(float width, float height, float seedWidth, float seedHeight);
     
-    inline void setLighteningOption(const std::string& option) { if (option == "activate") this->lighteningActivate = true;}
+    inline void setLighteningOption(const std::string& option) { if (option == "activate") this->lighteningActivate = true;
+                                                                                         if (option == "movelightening") this->lighteningMove = true;}
     inline void setFlashFrequency(float mainFrequency, float seedTime) { this->mainFrequency = mainFrequency;
                                                                                                             this->flashFrequency = mainFrequency;
@@ -55 +56 @@
     Billboard* billboard[4];
     bool lighteningActivate;
+    bool lighteningMove;
 
     float flashFrequency;
@@ -76 +78 @@
     float mainPosY;
     float mainPosZ;
+    
+    Vector cameraCoor;
 
     Light* flashLight;