Changeset 3033 for code/trunk/src/orxonox/objects/gametypes

Timestamp:

May 23, 2009, 9:57:52 PM (15 years ago)

Author:

landauf

Message:

merged gametypes branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/gametypes/Asteroids.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc)
• src/orxonox/objects/gametypes/Asteroids.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h)
• src/orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (7 diffs)
• src/orxonox/objects/gametypes/Gametype.h (modified) (3 diffs)
• src/orxonox/objects/gametypes/TeamBaseMatch.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc) (2 diffs)
• src/orxonox/objects/gametypes/TeamBaseMatch.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h)
• src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (2 diffs)
• src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) (1 diff)
• src/orxonox/objects/gametypes/UnderAttack.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc)
• src/orxonox/objects/gametypes/UnderAttack.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h)

code/trunk/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -3 +3 @@
   Deathmatch.cc
   TeamDeathmatch.cc
+  TeamBaseMatch.cc
   Pong.cc
+  UnderAttack.cc
+  Asteroids.cc
 )

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

@@ -60 +60 @@
         this->numberOfBots_ = 0;
 
+        this->timeLimit_ = 0;
+        this->time_ = 0;
+        this->timerIsActive_ = false;
+
         this->initialStartCountdown_ = 3;
 
@@ -88 +92 @@
         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_)
             this->gtinfo_.startCountdown_ -= dt;
@@ -93 +106 @@
         if (!this->gtinfo_.bStarted_)
             this->checkStart();
-        else
+        else if (!this->gtinfo_.bEnded_)
             this->spawnDeadPlayersIfRequested();
 
@@ -111 +124 @@
     {
         this->gtinfo_.bEnded_ = true;
+
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        {
+            if (it->first->getControllableEntity())
+            {
+                ControllableEntity* oldentity = it->first->getControllableEntity();
+        
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getCreator());
+                if (oldentity->getCamera())
+                {
+                    entity->setPosition(oldentity->getCamera()->getWorldPosition());
+                    entity->setOrientation(oldentity->getCamera()->getWorldOrientation());
+                }
+                else
+                {
+                    entity->setPosition(oldentity->getWorldPosition());
+                    entity->setOrientation(oldentity->getWorldOrientation());
+                }
+
+                it->first->stopControl(oldentity, true);
+                it->first->startControl(entity);
+            }
+            else
+                this->spawnPlayerAsDefaultPawn(it->first);
+        }
     }
 
@@ -267 +305 @@
                 if (!it->first->isReadyToSpawn() || !this->gtinfo_.bStarted_)
                 {
-                    SpawnPoint* spawn = this->getBestSpawnPoint(it->first);
-                    if (spawn)
-                    {
-                        // force spawn at spawnpoint with default pawn
-                        ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
-                        spawn->spawn(entity);
-                        it->first->startControl(entity);
-                        it->second.state_ = PlayerState::Dead;
-                    }
-                    else
-                    {
-                        COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
-                        abort();
-                    }
+                    this->spawnPlayerAsDefaultPawn(it->first);
+                    it->second.state_ = PlayerState::Dead;
                 }
             }
@@ -358 +384 @@
     }
 
+    void Gametype::spawnPlayerAsDefaultPawn(PlayerInfo* player)
+    {
+        SpawnPoint* spawn = this->getBestSpawnPoint(player);
+        if (spawn)
+        {
+            // force spawn at spawnpoint with default pawn
+            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
+            spawn->spawn(entity);
+            player->startControl(entity);
+        }
+        else
+        {
+            COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
+            abort();
+        }
+    }
+
     void Gametype::addBots(unsigned int amount)
     {
@@ -376 +419 @@
         }
     }
+
+    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/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -128 +128 @@
                 { return this->players_.size(); }
 
+            virtual void addTime(float t);
+            virtual void removeTime(float t);
+
+            inline  void startTimer()
+            { 
+                this->time_ = this->timeLimit_;
+                this->timerIsActive_ = true;
+            }
+
+            inline void stopTimer()
+              { this->timerIsActive_ = false; }
+
+            inline float getTime()
+              { return this->time_; }
+
+            inline bool getTimerIsActive()
+              { return timerIsActive_; }
+
+            inline void setTimeLimit(float t)
+              { this->timeLimit_ = t; }
+
+            virtual void resetTimer();
+            virtual void resetTimer(float t);
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
@@ -134 +158 @@
             virtual void checkStart();
             virtual void spawnPlayer(PlayerInfo* player);
+            virtual void spawnPlayerAsDefaultPawn(PlayerInfo* player);
             virtual void spawnPlayersIfRequested();
             virtual void spawnDeadPlayersIfRequested();
@@ -141 +166 @@
             bool bAutoStart_;
             bool bForceSpawn_;
+
+            float time_;
+            float timeLimit_;
+            bool timerIsActive_;
 
             float initialStartCountdown_;

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -125 +125 @@
     void TeamBaseMatch::showPoints()
     {
-
-        COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
-        if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
-        if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
+        COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
+        if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
+        if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
     }
 
@@ -135 +134 @@
     void TeamBaseMatch::winPoints()
     {
-        int amountControlled = 0;
-        int amountControlled2 = 0;
+        int amountControlled = 0;
+        int amountControlled2 = 0;
 
         for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
         {
-            if((*it)->getState() == BaseState::controlTeam1)
-            {
-                amountControlled++;
-            }
-            if((*it)->getState() == BaseState::controlTeam2)
-            {
-                amountControlled2++;
-            }
+            if((*it)->getState() == BaseState::controlTeam1)
+            {
+                amountControlled++;
+            }
+            if((*it)->getState() == BaseState::controlTeam2)
+            {
+                amountControlled2++;
+            }
         }
 

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -127 +127 @@
             {
                 TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it);
-                if (tsp && tsp->getTeamNumber() != desiredTeamNr)
+                if (tsp && (int)tsp->getTeamNumber() != desiredTeamNr)
                 {
                     teamSpawnPoints.erase(it++);
@@ -189 +189 @@
         return false;
     }
+
+    int TeamDeathmatch::getTeam(PlayerInfo* player)
+    {
+        std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
+        if (it_player != this->teamnumbers_.end())
+            return it_player->second;
+        else
+            return -1;
+    }
 }

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -55 +55 @@
             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
 
+            inline const ColourValue& getTeamColour(int teamnr) const
+                { return this->teamcolours_[teamnr]; }
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
+            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;