Changeset 9872 for code/branches

Timestamp:

Dec 5, 2013, 8:46:18 PM (11 years ago)

Author:

jo

Message:

Making the countdown speed configurable.

Location:

code/branches/levelMichael

Files:

• data/levels/Spacefight.oxw (modified) (1 diff)
• src/modules/overlays/hud/CountDown.cc (modified) (3 diffs)
• src/modules/overlays/hud/CountDown.h (modified) (2 diffs)

code/branches/levelMichael/data/levels/Spacefight.oxw

@@ -64 +64 @@
  <OverlayGroup name="spacefightHUD" scale = "1, 1">
  <CountDown
-     position  = "0.49, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "right"                  
-     counter   = "10.0"
-     active    = "false"
+     position    = "0.49, 0.05"
+     pickpoint   = "0.0, 0.0"
+     font        = "ShareTechMono"
+     textsize    = 0.06
+     colour      = "1.0, 1.0, 1.0, 1.0"
+     align       = "right"                  
+     counter     = "10.0"
+     speedfactor = "2.0"
+     active      = "false"
   >
       <events>

code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc

@@ -35 +35 @@
         <OverlayGroup name="spacefightHUD" scale = "1, 1">
           <CountDown
-              position  = "0.49, 0.05"
-              pickpoint = "0.0, 0.0"
-              font      = "ShareTechMono"
-              textsize  = 0.06
-              colour    = "1.0, 1.0, 1.0, 1.0"
-              align     = "right"                  
-              counter   = "10.0"
-              active    = "false"
+              position    = "0.49, 0.05"
+              pickpoint   = "0.0, 0.0"
+              font        = "ShareTechMono"
+              textsize    = 0.06
+              colour      = "1.0, 1.0, 1.0, 1.0"
+              align       = "right"                  
+              counter     = "10.0"
+              speedfactor = "1.0"
+              active      = "false"
            >
             <events>
@@ -82 +83 @@
         SUPER(CountDown, XMLPort, xmlelement, mode);
         XMLPortParam(CountDown, "counter", setCounter, getCounter, xmlelement, mode).defaultValues(10);
+        XMLPortParam(CountDown, "speedfactor", setSpeed, getSpeed, xmlelement, mode).defaultValues(1);
     }
     
@@ -97 +99 @@
             else
             {
-                this->counter_ -= dt;
+                this->counter_ -= dt*speed_;
                 this->setCaption(multi_cast<std::string>((int)this->counter_)); //TODO: evtl. initialize with +0.5f
             }

code/branches/levelMichael/src/modules/overlays/hud/CountDown.h

@@ -52 +52 @@
             inline float getCounter() const
                 { return this->counter_; }
+            inline void setSpeed(float value)
+                { this->speed_ = value; }
+            inline float getSpeed() const
+                { return this->speed_; }
+                
         protected:
 
@@ -57 +62 @@
             PlayerInfo* owner_;
             float counter_;
+            float speed_;
             bool hasStopped_;
     };