Changeset 11318 for code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc

Timestamp:

Dec 5, 2016, 3:59:38 PM (7 years ago)

Author:

ooguz

Message:

Distance Trigger Added

File:

• code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc (modified) (4 diffs)

code/branches/QuestGuide_HS16/src/modules/waypoints/WaypointGroup.cc

@@ -17 +17 @@
         RegisterObject(WaypointGroup);
         activeWaypoint = nullptr;
+        current = 0;
 
         //model = new Model(this->getContext());
@@ -25 +26 @@
         //model->setPosition(Vector3(0.0,0.0,0.0));        // this is wrong, it has to be triggered
         //waypoint_active = false;
-        //distancetrigger = new DistanceTrigger(this->getContext());   
+        //distancetrigger = new DistanceTrigger(this->getContext());
         //distancetrigger->setDistance(100);
         //this->attach(distancetrigger);
-        
+
     }
 
@@ -40 +41 @@
      //setOrientation()
 
-  
+
 
 
@@ -57 +58 @@
     void WaypointGroup::setWaypoint(Waypoint* object)
     {
+        object->setWaypointGroup(this);
         this->waypoints_.insert(object);
     }
 
+    void WaypointGroup::activateNext(){
+        if (std::next(waypoints_.begin(), current) != std::next(waypoints_.end(), 0)){
+          activeWaypoint = *std::next(waypoints_.begin(), current);
+          ++current;
+        }
+    }
 
     Waypoint* WaypointGroup::getActive(){
           if (activeWaypoint == nullptr){
             orxout() << "Null Pointer" << endl;
-            activateNext();
+            activeWaypoint = getFirst();
 
-          } 
-          //else if (activeWaypoint->)           
+          }
           return activeWaypoint;
     }
 
-    Waypoint* WaypointGroup::activateNext(){
-        for (Waypoint* object : this->waypoints_){
-            if(!(object->waypoint_actived)){
-                object->enable_waypoint();
-                activeWaypoint = object;
-                break;
-            }
-        }
-        return activeWaypoint;
+//    Waypoint* WaypointGroup::activateNext(){
+//        for (Waypoint* object : this->waypoints_){
+//            if(!(object->waypoint_actived)){
+//                //object->enable_waypoint();
+//                activeWaypoint = object;
+//                break;
+//            }
+//        }
+//        return activeWaypoint;
+//    }
+
+    Waypoint* WaypointGroup::getFirst(){
+        std::set<Waypoint*>::iterator it = waypoints_.begin();
+        return *it;
     }
 
 
-    
 
     void WaypointGroup::XMLPort(Element& xmlelement, XMLPort::Mode mode){