Changeset 3046 for code/branches/pickups2

Timestamp:

May 24, 2009, 11:53:09 PM (16 years ago)

Author:

bknecht

Message:

introducing the bouncing pickup

Location:

code/branches/pickups2/src/orxonox/objects/pickup

Files:

• PickupSpawner.cc (modified) (3 diffs)
• PickupSpawner.h (modified) (1 diff)

code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -44 +44 @@
 namespace orxonox
 {
+    const float PickupSpawner::bounceSpeed_s = 6.0f;
+    const float PickupSpawner::rotationSpeed_s = 1.0f;
+    const float PickupSpawner::bounceDistance_s = 4.0f;
+
     CreateFactory(PickupSpawner);
 
@@ -57 +61 @@
         this->triggerDistance_ = 20;
         this->respawnTime_ = 0.0f;
+        this->tickSum_ = 0.0f;
     }
     //! Deconstructor.
@@ -108 +113 @@
                     this->trigger(*it);
             }
+            this->yaw(Radian(rotationSpeed_s*dt));
+            this->tickSum_ += bounceSpeed_s*dt;
+            this->translate(Vector3(0,bounceDistance_s*dt*sin(this->tickSum_),0));
+            if (this->tickSum_ > 2*Ogre::Math::PI)
+                this->tickSum_ -= 2*Ogre::Math::PI;
         }
     }

code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h

@@ -109 +109 @@
         float triggerDistance_;                 //!< Distance in which this gets triggered.
 
+        /* Pickup animation */
+        float tickSum_;                         //!< Adds up tick to use in sine movement
+        static const float bounceSpeed_s;       //!< Speed of pickup to bounce up and down
+        static const float bounceDistance_s;    //!< Distance the pickup bounces up and down
+        static const float rotationSpeed_s;     //!< Rotation speed of pickup
+
         float respawnTime_;                     //!< Time after which this gets re-actived.
         Timer<PickupSpawner> respawnTimer_;     //!< Timer used for re-activating.