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

Timestamp:

Nov 14, 2016, 3:57:03 PM (7 years ago)

Author:

ooguz

Message:

Bugs fixed

File:

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

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

@@ -4 +4 @@
 #include <BulletDynamics/Dynamics/btRigidBody.h>
 #include "util/OrxAssert.h"
+#include "WaypointGroup.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
 
 namespace orxonox
@@ -12 +15 @@
     WaypointGroup::WaypointGroup(Context* context) : StaticEntity(context)
     {
-        /*RegisterObject(Waypoint);
-        model = new Model(this->getContext());
-        model->setMeshSource("cube.mesh");  // Name of the arrow file for now bottle
-        this->attach(model);
-        model->setScale(3);
+        RegisterObject(WaypointGroup);
+        //model = new Model(this->getContext());
+        //model->setMeshSource("cube.mesh");  // Name of the arrow file for now bottle
+        //is->attach(model);
+        //model->setScale(3);
         //model->setOrientation(Vector3(0,0,-1));
-        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->setDistance(100);
-        this->attach(distancetrigger);
-        */
+        //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->setDistance(100);
+        //this->attach(distancetrigger);
+        
     }
 
@@ -35 +38 @@
      //setOrientation()
 
-    Waypoint* WaypointGroup::getWaypoint(){
-        for (Waypoint* waypoint : this->waypoints_){
-            if(!(waypoint->waypoint_actived)){
-                waypoint->enable_waypoint();
-                return waypoint;
+  
+
+
+    Waypoint* WaypointGroup::getWaypoint(unsigned int index)
+    {
+        unsigned int i = 0;
+        for (Waypoint* child : this->waypoints_)
+        {
+            if (i == index)
+                return child;
+            ++i;
+        }
+        return nullptr;
+    }
+
+    void WaypointGroup::setWaypoint(Waypoint* object)
+    {
+        this->waypoints_.insert(object);
+    }
+
+
+    Waypoint* WaypointGroup::getActive(){
+          for (Waypoint* object : this->waypoints_){
+            if(!(object->waypoint_actived)){
+                object->enable_waypoint();
+                return object;
             }
         }
@@ -45 +69 @@
 
 
-    Waypoint* WaypointGroup::getWaypoint(unsigned int index)
-    {
-        unsigned int i = 0;
-        for (Waypoint* waypoint : this->waypoints_)
-        {
-   
-            if (i == index)
-                return waypoint;
-            ++i;
-        }
-        return nullptr;
-    }
 
-    void WaypointGroup::addWaypoint(Waypoint* object)
-    {
-        this->waypoints_.insert(object);
+    
+
+    void WaypointGroup::XMLPort(Element& xmlelement, XMLPort::Mode mode){
+        SUPER(WaypointGroup, XMLPort, xmlelement, mode); // From the SpaceShip.cc file
+        XMLPortObject(WaypointGroup, Waypoint, "waypoints", setWaypoint, getWaypoint, xmlelement, mode);
+
     }
 
 
 
-    void Waypoint::XMLPort(Element& xmlelement, XMLPort::Mode mode){
-        SUPER(Waypoint, XMLPort, xmlelement, mode); // From the SpaceShip.cc file
-        XMLPortObject(WaypointGroup, Waypoint, "waypoints", addWaypoint, getWaypoint, xmlelement, mode);
-
-    }
-
-
 }