Changeset 11841 for code/branches

Timestamp:

Mar 29, 2018, 4:02:41 PM (7 years ago)

Author:

andera

Message:

added countdown

Location:

code/branches/RacingBots_FS18/src

Files:

• libraries/tools/Timer.cc (modified) (1 diff)
• libraries/tools/Timer.h (modified) (1 diff)
• modules/gametypes/SpaceRace.cc (modified) (3 diffs)
• modules/gametypes/SpaceRace.h (modified) (2 diffs)

code/branches/RacingBots_FS18/src/libraries/tools/Timer.cc

@@ -200 +200 @@
     }
 
-    /*void Timer::setTimer(float interval, bool bKillAfterCall)
-    {
-         this->setInterval(interval);
-         this->bActive_ = true;
-         this->time_ = this->interval_;
-        this->bKillAfterCall_ = bKillAfterCall;
-    }
-    */
 
     /**

code/branches/RacingBots_FS18/src/libraries/tools/Timer.h

@@ -113 +113 @@
             void run();
 
+
             /// Re-starts the timer: The executor will be called after @a interval seconds.
             inline void startTimer()

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc

@@ -70 +70 @@
 #include "items/Engine.h"
 #include <vector>
+#include <iostream>
+#include <string>
+
 
 namespace orxonox
@@ -100 +103 @@
         startpos[4] =-40;
         startpos[5] =100;
-        
+         
         startpos[6] =100;
         startpos[7] =-40;
@@ -137 +140 @@
         }
 
-
-        std::string message("Use headphones to hear the countdown!");
+        std::string message("Use headphones to hear the countdown! It is useful to start with a boost!");
+
         this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
-
+        
+        
+        /*for(int i=10; i>0;i=i-1){
+            startmessage(i);
+        }*/
 
 
         //after 11 seconds , countdownFinished function is called to activate bots` engines
-        Timer* countdownTimer = new Timer();
-        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
-        
-    }
-
+        //Timer* countdownTimer = new Timer();
+        //countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
+
+        /*
+        while(countdownTimer->getRemainingTime()!=0){
+            if(countdownTimer->getRemainingTime()==1){
+                startmessage(1);
+            }
+        }*/
+        
+
+
+
+        
+
+        
+        /*unsigned long long float time_notification=countdownTimer.getRealMicroSeconds();
+        while(this->bTimeIsUp_==false){
+
+        std::ostream stream;
+        stream<<time_notification;
+        std::string chat_notification(stream.str());
+        this->getGametypeInfo()->sendAnnounceMessage(chat_notification);
+        ChatManager::message(chat_notification);
+
+        }*/
+
+        
+    }
+
+    
+
+    void SpaceRace::tick(float dt) {
+        SUPER(SpaceRace, tick, dt);
+        this->time_passed -= dt;
+
+        if (countdown_mode) {
+
+            //orxout() << "time: " <<(int) time_passed << "s" << endl;
+            std::string message=std::to_string((int)time_passed);
+            this->getGametypeInfo()->sendAnnounceMessage(message);
+            if (time_passed <= 1) {
+                this->countdownFinished();
+                this->countdown_mode = false;
+            }
+        }
+
+    }
+        
+    void SpaceRace::startmessage(int second){
+
+        std::string message=std::to_string(second);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+        
+        
+
+    }
 
 

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h

@@ -62 +62 @@
             
             virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
+            virtual void tick(float dt) override;
+            virtual void startmessage(int second);
 
 
@@ -84 +86 @@
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
+            bool countdown_mode = true;
+            float time_passed = 11.0f;
 
         private: