Changeset 10633 in orxonox.OLD for branches/vs-enhencements

Timestamp:

Apr 19, 2007, 9:03:23 AM (18 years ago)

Author:

nicolasc

Message:

added a pulsing capability for the billboard ( I need it for the Plasma Projectile)

Location:

branches/vs-enhencements/src/world_entities/effects

Files:

• billboard.cc (modified) (3 diffs)
• billboard.h (modified) (1 diff)
• wobblegrid.cc (modified) (1 diff)

branches/vs-enhencements/src/world_entities/effects/billboard.cc

@@ -69 +69 @@
 
   this->texColor = NULL;
+
+  this->pulseMagnitude = .5;
+  this->bPulse = false;
+
+  this->angularSpeed = M_PI; //180;
+  this->angle = 0;
+
+  this->setUpdateFunction((*sinf));
 }
 
@@ -113 +121 @@
 void Billboard::tick(float dt)
 {
+  this->angle += dt * this->angularSpeed;
+  if (this->angle > 2 * M_PI)
+    this->angle -= 2 * M_PI;
 }
 
@@ -145 +156 @@
   v.normalize();
 
-  v *= sizeX;
-  h *= sizeY;
+  float tmp = 1;
+  if (this->bPulse)
+    tmp = 1 + this->pulseMagnitude * updatePulse(this->angle);
+
+  v *= sizeX * tmp;
+  h *= sizeY * tmp;
 
 //v += this->getAbsCoor();

branches/vs-enhencements/src/world_entities/effects/billboard.h

@@ -26 +26 @@
     void colorTexture(const Color col);
 
+    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; };
+
     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 angle;
+    float angularSpeed;
 };
 

branches/vs-enhencements/src/world_entities/effects/wobblegrid.cc

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