[Orxonox-commit 6691] r11321 - code/branches/QuestGuide_HS16/src/modules/waypoints

[ooguz at orxonox.net]

Author: ooguz
Date: 2016-12-05 16:08:31 +0100 (Mon, 05 Dec 2016)
New Revision: 11321

Modified:
   code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc
   code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h
Log:
Distance Trigger works!

Modified: code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc
===================================================================
--- code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc	2016-12-05 15:07:35 UTC (rev 11320)
+++ code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc	2016-12-05 15:08:31 UTC (rev 11321)
@@ -71,7 +71,7 @@
     Waypoint* WaypointGroup::getActive(){
           if (activeWaypoint == nullptr){
             orxout() << "Null Pointer" << endl;
-            activeWaypoint = getFirst();
+            activateNext();
 
           }
           return activeWaypoint;
@@ -88,10 +88,10 @@
 //        return activeWaypoint;
 //    }
 
-    Waypoint* WaypointGroup::getFirst(){
-        std::set<Waypoint*>::iterator it = waypoints_.begin();
-        return *it;
-    }
+ //   Waypoint* WaypointGroup::getFirst(){
+ //       std::set<Waypoint*>::iterator it = waypoints_.begin();
+ //       return *it;
+ //   }
 
 
 

Modified: code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h
===================================================================
--- code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h	2016-12-05 15:07:35 UTC (rev 11320)
+++ code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.h	2016-12-05 15:08:31 UTC (rev 11321)
@@ -50,7 +50,7 @@
 
         void activateNext();
 
-        Waypoint* getFirst();
+        //Waypoint* getFirst();
 
 
 
@@ -63,7 +63,7 @@
 
         std::set<Waypoint*> waypoints_;
         Waypoint* activeWaypoint;
-        unsigned int current = 1;
+        unsigned int current = 0;
         //std::set<Waypoint*>::iterator it;
 
             // network callbacks