Changeset 11309

Timestamp:

Nov 28, 2016, 4:04:45 PM (8 years ago)

Author:

ooguz

Message:

Distance Trigger base methods

Location:

code/branches/QuestGuide_HS16/src/modules/waypoints

Files:

• Waypoint.cc (modified) (1 diff)
• WaypointGroup.cc (modified) (2 diffs)
• Waypointarrow.cc (modified) (2 diffs)

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

@@ -26 +26 @@
         distancetrigger = new DistanceTrigger(this->getContext());   
         distancetrigger->setDistance(100);
+        distanceTrigger_->addTarget("Pawn");
+         this->addEventSource(distanceTrigger_, "explode");
+
         this->attach(distancetrigger);
     }

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

@@ -63 +63 @@
     Waypoint* WaypointGroup::getActive(){
           if (activeWaypoint == nullptr){
-                                    orxout() << "OOOOOOOOOO" << endl;
-
+            orxout() << "Null Pointer" << endl;
             activateNext();
 
-          }            
+          } 
+          //else if (activeWaypoint->)           
           return activeWaypoint;
     }
@@ -76 +76 @@
                 object->enable_waypoint();
                 activeWaypoint = object;
+                break;
             }
         }

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

@@ -61 +61 @@
 
         if (getWaypointgroup() == nullptr){
-                    orxout() << "Second" << endl;
+                  orxout() << "Second" << endl;
 
             return;
@@ -72 +72 @@
         Vector3 waypoint_position = waypoint->getWorldPosition();
 
-        Vector3 trial = waypoint_position - this->getWorldPosition();
 
         //orxout() << "dsfsf" << waypoint_position.x << endl;
-        orxout() << "waypoint " << waypoint_position.x <<  "waypoint " << waypoint_position.y << "waypoint " << waypoint_position.z << endl;
-        orxout() << "model " << this->model->getWorldPosition().x <<  "model " << this->model->getWorldPosition().y << "model " << this->model->getWorldPosition().z << endl;
-        orxout() << "this " << this->getWorldPosition().x <<  "this " << this->getWorldPosition().y << "this " << this->getWorldPosition().z << endl;
-        orxout() << "trial " << trial.x <<  "trial " << trial.y << "trial " << trial.z << endl;
+    //    orxout() << "waypoint " << waypoint_position.x <<  "waypoint " << waypoint_position.y << "waypoint " << waypoint_position.z << endl;
+      //  orxout() << "model " << this->model->getWorldPosition().x <<  "model " << this->model->getWorldPosition().y << "model " << this->model->getWorldPosition().z << endl;
+      //  orxout() << "this " << this->getWorldPosition().x <<  "this " << this->getWorldPosition().y << "this " << this->getWorldPosition().z << endl;
+       // orxout() << "trial " << trial.x <<  "trial " << trial.y << "trial " << trial.z << endl;
+
 
         Vector3 origin = model->getWorldPosition();;