Changeset 8934 for code/branches

Timestamp:

Nov 16, 2011, 2:07:17 PM (13 years ago)

Author:

eceline

Message:

spaceracemanager

Location:

code/branches/spaceraceTwo/src/modules/gametypes

Files:

• RaceCheckPoint.cc (modified) (5 diffs)
• RaceCheckPoint.h (modified) (2 diffs)
• SpaceRace.cc (modified) (2 diffs)
• SpaceRace.h (modified) (3 diffs)
• SpaceRaceManager.cc (modified) (2 diffs)

code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc

@@ -36 +36 @@
 #include "SpaceRace.h"
 
-
 namespace orxonox
 {
@@ -48 +47 @@
         this->bIsLast_ = false;
         this->bTimeLimit_ = 0;
+        this->isVisible_=false;
 
         this->setRadarObjectColour(ColourValue::Blue);
@@ -70 +70 @@
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
         assert(gametype);
-        this->setRadarVisibility(false);
+        if(this->isVisible_){this->setRadarVisibility(true);}
+        else{this->setRadarVisibility(false);}
+        /*this->setRadarVisibility(false);
         Vector3 v =Vector3(0,0,0);
         int j=0;
@@ -81 +83 @@
                 if (this->getCheckpointIndex() == v[i])
                  this->setRadarVisibility(true);
-                 }
-        }     
+                 }*/
+        //}     
     }
 
@@ -95 +97 @@
     }
 
-
-
-    void RaceCheckPoint::triggered(bool bIsTriggered, PlayerInfo* player)
+        void RaceCheckPoint::triggered(bool bIsTriggered, PlayerInfo* player)
     {
         DistanceTrigger::triggered(bIsTriggered);

code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h

@@ -61 +61 @@
            inline const Vector3& getNextcheckpoint() const
                 {return this->nextcheckpoints_;}
+
+        inline void setVisibility(bool b)
+                {this->isVisible_ = b;}
         protected:
             virtual void triggered(bool bIsTriggered, PlayerInfo* player);
@@ -84 +87 @@
         
         Vector3 nextcheckpoints_; //the indexes of the next check points
+
+        bool isVisible_;
       
     };

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

@@ -45 +45 @@
     {
         RegisterObject(SpaceRace);
-        //this->checkpointsReached_ = 0;
+        this->checkpointReached_ = 0;
         this->bTimeIsUp_ = false;
         this->numberOfBots_ = 0;
@@ -139 +139 @@
         
 
-    void SpaceRace::newCheckpointReached(RaceCheckPoint* p)
+    void SpaceRace::newCheckpointReached(SpaceRaceManager* p, int index)
     {
-        this->checkpointReached_=p->getCheckpointIndex();
+        this->checkpointReached_=index;
         this->clock_.capture();
         int s = this->clock_.getSeconds();
         int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
-        const std::string& message = "Checkpoint " + multi_cast<std::string>(p)
+        const std::string& message = "Checkpoint " + multi_cast<std::string>(index)
+                        + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
+                        + " seconds.";
+        const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
+        ChatManager::message(message);
+        
+       
+    }
+    
+     void SpaceRace::newCheckpointReached(RaceCheckPoint* p)
+    {   int index = p->getCheckpointIndex();
+        this->checkpointReached_=index;
+        this->clock_.capture();
+        int s = this->clock_.getSeconds();
+        int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
+        const std::string& message = "Checkpoint " + multi_cast<std::string>(index)
                         + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
                         + " seconds.";

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

@@ -40 +40 @@
 #include "gametypes/Gametype.h"
 
-#include "RaceCheckPoint.h"
+
+
+#include "SpaceRaceManager.h"
 
 namespace orxonox
@@ -51 +53 @@
     {
         friend class RaceCheckPoint;
+        friend class SpaceRaceManager;
 
         public:
@@ -59 +62 @@
             virtual void end();
                 
-            virtual void newCheckpointReached(RaceCheckPoint* p);
+            virtual void newCheckpointReached(SpaceRaceManager* p, int index);
+                virtual void newCheckpointReached(RaceCheckPoint* p);
 
             inline void setCheckpointReached(int n)

code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc

@@ -28 +28 @@
 
 #include "SpaceRaceManager.h"
-
+#include "SpaceRace.h"
 
 #include "core/XMLPort.h"
@@ -80 +80 @@
     {
     SUPER(SpaceRaceManager,tick,dt);
-            
+     SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
+           Vector3 v =Vector3(0,0,0);
+        int j=0;
+        for (std::map<PlayerInfo*, Player>::iterator it = gametype->players_.begin(); it != gametype->players_.end(); ++it)
+        {
+                j=gametype->getCheckpointReached(it->first);
+                RaceCheckPoint* r=this->getCheckpoint(j);
+                v=r->getNextcheckpoint();
+                for(int i=1;i<4;i++){
+                 RaceCheckPoint* n=this->getCheckpoint(i);
+                 n->setVisibility(true);
+                 }
+        }
+     
     }
-     
-    
-    
-    
-   
-    
-    }
+}