Changeset 2970 for code

Timestamp:

May 11, 2009, 5:00:55 PM (16 years ago)

Author:

Aurelian

Message:

Added timer in class gametype, timer working in asteroids, modified checkpoint with firstCheckPoint… working! yeepa

Location:

code/branches/gametypes/src/orxonox

Files:

• objects/gametypes/Asteroids.cc (modified) (1 diff)
• objects/gametypes/Asteroids.h (modified) (1 diff)
• objects/gametypes/Gametype.cc (modified) (3 diffs)
• objects/gametypes/Gametype.h (modified) (2 diffs)
• objects/worldentities/triggers/CheckPoint.cc (modified) (2 diffs)
• objects/worldentities/triggers/CheckPoint.h (modified) (1 diff)
• overlays/hud/CMakeLists.txt (modified) (1 diff)
• overlays/hud/HUDTimer.cc (added)
• overlays/hud/HUDTimer.h (added)

code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc

@@ -43 +43 @@
     {
         RegisterObject(Asteroids);
+        this->firstCheckpointReached_ = false;
+        this->timeLimit_ = 30;
     }
+
+    void Asteroids::tick(float dt)
+    {
+        SUPER(Asteroids, tick, dt);
+ 
+        if (firstCheckpointReached_)
+        {
+            this->timeLimit_ = this->time_;
+            this->startTimer();
+        }
+
+        if (this->time_ < 0 && !this->hasEnded())
+        {
+            this->end();
+        }
+        
+    }
+
 
     void Asteroids::start()

code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h

@@ -42 +42 @@
             virtual ~Asteroids() {}
 
+            virtual void tick(float dt);
+
             virtual void start();
             virtual void end();
+           
+            inline void firstCheckpointReached(bool reached)
+              { this->firstCheckpointReached_ = reached; }
+
+        private:
+            bool firstCheckpointReached_;
+            bool gameEnded_;
+
     };
 }

code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.cc

@@ -60 +60 @@
         this->numberOfBots_ = 0;
 
+        this->timeLimit_ = 0;
+        this->time_ = 0;
+        this->timerIsActive_ = false;
+
         this->initialStartCountdown_ = 3;
 
@@ -87 +91 @@
     {
         SUPER(Gametype, tick, dt);
+
+        //count timer
+        if (timerIsActive_)
+        {
+            if (this->timeLimit_ == 0)
+                this->time_ += dt;
+            else
+                this->time_ -= dt;
+        }
 
         if (this->gtinfo_.bStartCountdownRunning_ && !this->gtinfo_.bStarted_)
@@ -393 +406 @@
         }
     }
+
+    void Gametype::addTime(float t)
+    { 
+        if (this->timeLimit_ == 0)
+          this->time_ -= t;
+        else
+          this->time_ += t;
+    }
+
+    void Gametype::removeTime(float t)
+    { 
+        if (this->timeLimit_ == 0)
+          this->time_ += t;
+        else
+          this->time_ -= t;
+    }
+
+    void Gametype::resetTimer()
+    { 
+        this->resetTimer(timeLimit_);
+    }
+
+    void Gametype::resetTimer(float t)
+    { 
+        this->timeLimit_ = t;
+        this->time_ = t;
+    }
 }

code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h

@@ -126 +126 @@
                 { return this->players_.size(); }
 
+            virtual void addTime(float t);
+            virtual void removeTime(float t);
+
+            inline  void startTimer()
+              { this->timerIsActive_ = true; }
+
+            inline void stopTimer()
+              { this->timerIsActive_ = false; }
+
+            inline float getTime()
+              { return this->time_; }
+
+            inline bool getTimerIsActive()
+              { return timerIsActive_; }
+
+            virtual void resetTimer();
+            virtual void resetTimer(float t);
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
@@ -140 +158 @@
             bool bAutoStart_;
             bool bForceSpawn_;
+
+            float time_;
+            float timeLimit_;
+            bool timerIsActive_;
 
             float initialStartCountdown_;

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -47 +47 @@
 
     this->setStayActive(true);
-    this->setDistance(20);
-    bIsDestination_ = false;
+    this->setDistance(50);
+    this->bIsFirst_ = false;
+    this->bIsDestination_ = false;
     this->setVisible(true);
   }
@@ -60 +61 @@
     SUPER(CheckPoint, XMLPort, xmlelement, mode);
 
+    XMLPortParam(CheckPoint, "isfirst", setFirst, getFirst, xmlelement, mode).defaultValues(false);
     XMLPortParam(CheckPoint, "isdestination", setDestination, getDestination, xmlelement, mode).defaultValues(false);
+    XMLPortParam(CheckPoint, "addtime", setAddTime, getAddTime, xmlelement, mode).defaultValues(30);
   }
   
-  void CheckPoint::setDestination(bool isDestination)
-  {
-    bIsDestination_ = isDestination;
-  }
-
-  bool CheckPoint::getDestination()
-  {
-    return bIsDestination_;
-  }
-
-
   void CheckPoint::triggered(bool bIsTriggered)
   {
     DistanceTrigger::triggered(bIsTriggered);
 
-    if (bIsTriggered && bIsDestination_)
-    {
-      Asteroids* gametype = dynamic_cast<Asteroids*>(this->getGametype());
-      if (gametype)
-      {
-        gametype->end();
-      }
-    }
+    Asteroids* gametype = dynamic_cast<Asteroids*>(this->getGametype());
+    if (gametype)
+    { 
+        gametype->addTime(addTime_);
+
+        if (bIsTriggered && bIsFirst_)
+        {
+            gametype->firstCheckpointReached(true);
+        }
+     
+        if (bIsTriggered && bIsDestination_)
+        {
+            gametype->end();
+        }
+     }
   }
 }

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h

@@ -57 +57 @@
     private:
       virtual void triggered(bool bIsTriggered); 
-      virtual void setDestination(bool isDestination);
-      virtual bool getDestination();    
+
+      inline void setDestination(bool isDestination)
+        { bIsDestination_ = isDestination; }
+
+      inline bool getDestination()
+        { return bIsDestination_; }     
+   
+      inline void setFirst(bool isFirst)
+        { this->bIsFirst_ = isFirst; }
+
+      inline bool getFirst()
+        { return this->bIsFirst_; }
+
+      inline void setAddTime(float time)
+        { this->addTime_ = time; }
+
+      inline bool getAddTime()
+        { return this->addTime_; }
       
+      bool bIsFirst_;
       bool bIsDestination_;
+      float addTime_;
   };
 }

code/branches/gametypes/src/orxonox/overlays/hud/CMakeLists.txt

@@ -5 +5 @@
   HUDSpeedBar.cc
   HUDHealthBar.cc
+  HUDTimer.cc
   ChatOverlay.cc
   GametypeStatus.cc