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

Timestamp:

Apr 19, 2007, 1:13:11 PM (18 years ago)

Author:

nicolasc

Message:

pulse grid update, drawing corrections

Location:

branches/vs-enhencements/src/world_entities/effects

Files:

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

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

@@ -11 +11 @@
 ### File Specific:
    main-programmer: David Hasenfratz
+   co-programmer: Nicolas Schlumberger
 */
 
@@ -73 +74 @@
   this->bPulse = false;
 
-  this->angularSpeed = M_PI; //180;
+  this->angularSpeed = M_2_PI; //360;
   this->angle = 0;
 
@@ -122 +123 @@
 {
   this->angle += dt * this->angularSpeed;
-  if (this->angle > 2 * M_PI)
-    this->angle -= 2 * M_PI;
+  if (this->angle > M_2_PI)
+    this->angle -= M_2_PI;
 }
 
@@ -158 +159 @@
   float tmp = 1;
   if (this->bPulse)
-    tmp = 1 + this->pulseMagnitude * updatePulse(this->angle);
+    tmp += this->pulseMagnitude * updatePulse(this->angle);
 
   v *= sizeX * tmp;

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

@@ -31 +31 @@
     inline float getPulse () { return this->bPulse; };
 
+    inline void setPulseMagnitude(float mag) {this->pulseMagnitude = mag; };
+
     virtual void tick(float dt);
     virtual void draw() const;