Changeset 10698 in orxonox.OLD for trunk/src/world_entities/effects

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/world_entities/effects

Files:

• billboard.cc (modified) (4 diffs)
• billboard.h (modified) (1 diff)
• blink.cc (modified) (1 diff)
• explosion.h (modified) (1 diff)
• wobblegrid.cc (modified) (1 diff)

trunk/src/world_entities/effects/billboard.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: David Hasenfratz
+   co-programmer: Nicolas Schlumberger
 */
 
@@ -69 +70 @@
 
   this->texColor = NULL;
+
+  this->pulseMagnitude = .5;
+  this->bPulse = false;
+
+  this->angularSpeed = M_2_PI; //360;
+  this->angle = 0;
+
+  this->setUpdateFunction((*sinf));
 }
 
@@ -113 +122 @@
 void Billboard::tick(float dt)
 {
+  this->angle += dt * this->angularSpeed;
+  if (this->angle > M_2_PI)
+    this->angle -= M_2_PI;
+//   curMagnitude = updatePulse(this->angle);
 }
 
@@ -145 +158 @@
   v.normalize();
 
-  v *= sizeX;
-  h *= sizeY;
+  float tmp = 1;
+  if (this->bPulse)
+    tmp += this->pulseMagnitude * sinf(this->angle); //updatePulse(this->angle);
+
+  v *= sizeX * tmp;
+  h *= sizeY * tmp;
 
 //v += this->getAbsCoor();

trunk/src/world_entities/effects/billboard.h

@@ -26 +26 @@
     void colorTexture(const Color col);
 
+    //!< Pulsing Capability, changes size of the grid
+    inline void togglePluse () {this->bPulse = !bPulse; };
+    inline void setPulse () { this->bPulse = true; };
+    inline void setPulse ( bool state ) {this->bPulse = state; };
+    inline float getPulse () { return this->bPulse; };
+
+    inline void setPulseMagnitude(float mag) {this->pulseMagnitude = mag; };
+
     virtual void tick(float dt);
     virtual void draw() const;
 
+    inline void setUpdateFunction(float (*updateFct)(float value)) { if( updateFct)  this->updatePulse = updateFct;};
+
   private:
+
+    float (*updatePulse)(float value);
+
     Material*        material;
     Color*           texColor;
     float sizeX;
     float sizeY;
+
+    bool bPulse;
+    float pulseMagnitude;
+    float curMagnitude;
+    float angle;
+    float angularSpeed;
 };
 

trunk/src/world_entities/effects/blink.cc

@@ -67 +67 @@
   this->bBoard->setTexture("textures/light/blink.png");
 
-  /// Standard values
+  //!< Standard values
   this->bBoard->setAbsCoor(0, 0, 0);
   // default position if not set in xml

trunk/src/world_entities/effects/explosion.h

@@ -32 +32 @@
     virtual void tick (float time);
 
-  private:
+    void setLifeTime( float lifeTime ){ this->lifeTime = lifeTime; }
+
+  protected:
     static FastFactory*        fastFactory;
 

trunk/src/world_entities/effects/wobblegrid.cc

@@ -10 +10 @@
 
 ### File Specific:
-   main-programmer: David Hasenfratz
+   main-programmer: Marc Schärer
 */