Changeset 8968 for code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc

Timestamp:

Dec 8, 2011, 6:07:32 PM (13 years ago)

Author:

eceline

Message:

added waypoint patrol controller to level, RaceCheckPoint::fire works now

File:

• code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) (8 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *     Mauro Salomon
+ *     Celine Eggenberger
  *   Co-authors:
  *      ...
@@ -38 +38 @@
 #include "util/Math.h"
 
+
+
 namespace orxonox
 {
@@ -46 +48 @@
         RegisterObject(SpaceRaceManager);
          
-         for (size_t i = 0; i < this->checkpoints_.size(); ++i)
-                this->setNext(this->checkpoints_[i]);
-          
+        this->firstcheckpointvisible_=false;
+         
     }
 
@@ -95 +96 @@
     {
     SUPER(SpaceRaceManager,tick,dt);
-     SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
-     gametype->setV(this);
-         
+     
+     if(this->checkpoints_[0] != NULL && !this->firstcheckpointvisible_)
+         {this->checkpoints_[0]->setRadarVisibility(true);this->firstcheckpointvisible_=false;}
          
          for (size_t i = 0; i < this->checkpoints_.size(); ++i){
@@ -111 +112 @@
         assert(gametype);
         
-        //if(gametype->getCheckpointReached(player)==-1) {orxout()<<"index -1"<<endl;}
+       
    
                  bool b =false; 
-                //DistanceMultiTrigger::fire(bIsTriggered,player);
+                
                 int index=gametype->getCheckpointReached(player);
+                Vector3 v=Vector3 (-1,-1,-1);
                 if (index>-1){
                 RaceCheckPoint* tmp= this->getCheckpoint(index);
-                Vector3 v= tmp->getNextcheckpoint();
+                v= tmp->getNextcheckpoint();
        
-       // orxout()<<"index not -1"<<endl;
+       
         if (this->getCheckpoint(v.x)==check){
                 b=true;
@@ -137 +139 @@
             gametype->clock_.capture();
             float time = gametype->clock_.getSecondsPrecise();
-            if (check->bTimeLimit_!=0 && time > check->bTimeLimit_)
+            if (check->getTimeLimit()!=0 && time > check->getTimeLimit())
             {
                 gametype->timeIsUp();
@@ -146 +148 @@
             else
             {
+                if (index > -1)this->setRadVis(player,false);
                 gametype->newCheckpointReached(check,player);
                 check->setRadarObjectColour(ColourValue::Green); //sets the radar colour of the checkpoint to green if it is reached, else it is red.
+                
+                
+                
+                this->setRadVis(player, true);
+               
             }
         }
@@ -153 +161 @@
     }
     
+    void SpaceRaceManager::setRadVis(PlayerInfo* player, bool b){
+        SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
+        assert(gametype);
+        int index=gametype->getCheckpointReached(player);
+        Vector3 v=Vector3(-1,-1,-1);
+        RaceCheckPoint* tmp= this->getCheckpoint(index);
+                v= tmp->getNextcheckpoint();
     
     
-    void SpaceRaceManager::setNext(RaceCheckPoint* check){
-        
-        Vector3 v=check->getNextcheckpoint();
-                check->setNext(0,this->getCheckpoint(v.x));
-        check->setNext(1,this->getCheckpoint(v.y));
-        check->setNext(2,this->getCheckpoint(v.z));
-        }
+         if(v.x > -1){this->getCheckpoint(v.x)->setRadarVisibility(b);
+                this->getCheckpoint(v.x)->settingsChanged();}
+                if(v.y > -1){this->getCheckpoint(v.y)->setRadarVisibility(b);
+                this->getCheckpoint(v.y)->settingsChanged();}
+                if(v.z > -1){this->getCheckpoint(v.z)->setRadarVisibility(b);
+                this->getCheckpoint(v.z)->settingsChanged();}
+    
+    }
+    
+