Changeset 6643 for code/branches

Timestamp:

Mar 29, 2010, 4:39:25 PM (15 years ago)

Author:

ebeier

Message:

engine stripes now working correctly

Location:

code/branches/ppspickups1

Files:

• data/levels/templates/pickup_representation_templates_speed.oxt (modified) (2 diffs)
• src/modules/pickup/Pickup.cc (modified) (1 diff)
• src/modules/pickup/items/SpeedPickup.cc (modified) (1 diff)
• src/orxonox/interfaces/PickupCarrier.h (modified) (1 diff)
• src/orxonox/items/Engine.h (modified) (1 diff)
• src/orxonox/items/MultiStateEngine.cc (modified) (1 diff)

code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt

@@ -4 +4 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,0,0" colour="1.0,0.0,0.0" material="Sphere2" scale=0.1>
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
                         <attached>
-                            <Billboard position="0,0,0" colour="1.0,1.0,0.0" material="Cross" scale=0.7 />
+                            <Billboard position="0,0,0" colour="0.90,0.90,0.10" material="3arrowsup" scale=0.7 />
                         </attached>
                     </Billboard>
@@ -18 +18 @@
   <SpeedPickup
     duration = 10.0
-    speedAdd = 0
+    speedAdd = 100
     SpeedMultiply = 10
     activationType = "immediate"

code/branches/ppspickups1/src/modules/pickup/Pickup.cc

@@ -245 +245 @@
             return false;
         }
-        if (false) /* How to check if Timer already running? */
+        if (false) /* TODO: Check if Timer is already running */
         {
             COUT(1) << "Pickup durationTimer already in use." << std::endl;

code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc

@@ -251 +251 @@
 
     void SpeedPickup::PickupTimerCallBack(void) {
-        COUT(2) << "Timer ended!" << std::endl;
+        /* Reset values */
     }
 }

code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h

@@ -47 +47 @@
 namespace orxonox
 {
+    class Pickupable;
+    class Pickup;
+    class HealthPickup;
+    class MetaPickup;
+    class SpeedPickup;
 
     /**

code/branches/ppspickups1/src/orxonox/items/Engine.h

@@ -115 +115 @@
             virtual const Vector3& getCarrierPosition(void);
 
-            /* not in protected ?? */
+            /* Should not be here */
             inline void setSpeedAdd(float speedAdd)
                 { this->speedAdd_=speedAdd; }

code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc

@@ -129 +129 @@
                 else
                     this->state_ = Idle;
+
+                if (this->state_ = Idle && this->getSpeedAdd()>0)
+                    this->state_ = Normal;
             }