Changeset 10645 in orxonox.OLD for branches/vs-enhencements/src/world_entities/effects

Timestamp:

May 2, 2007, 11:48:16 PM (18 years ago)

Author:

nicolasc

Message:

minor cleanup

Location:

branches/vs-enhencements/src/world_entities/effects

Files:

• billboard.cc (modified) (2 diffs)
• billboard.h (modified) (2 diffs)

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

@@ -125 +125 @@
   if (this->angle > M_2_PI)
     this->angle -= M_2_PI;
+//   curMagnitude = updatePulse(this->angle);
 }
 
@@ -159 +160 @@
   float tmp = 1;
   if (this->bPulse)
-    tmp += this->pulseMagnitude * updatePulse(this->angle);
+    tmp += this->pulseMagnitude * sinf(this->angle); //updatePulse(this->angle);
 
   v *= sizeX * tmp;

branches/vs-enhencements/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; };
@@ -49 +50 @@
     bool bPulse;
     float pulseMagnitude;
+    float curMagnitude;
     float angle;
     float angularSpeed;