Changeset 11318 for code/branches/QuestGuide_HS16/src/modules

Timestamp:

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

Author:

ooguz

Message:

Distance Trigger Added

Location:

code/branches/QuestGuide_HS16/src/modules/waypoints

Files:

• Waypoint.cc (modified) (4 diffs)
• Waypoint.h (modified) (5 diffs)
• WaypointGroup.cc (modified) (4 diffs)
• WaypointGroup.h (modified) (3 diffs)
• Waypointarrow.cc (modified) (3 diffs)
• Waypointprereqs.h (added)

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

@@ -1 +1 @@
 #include "Waypoint.h"
-
 #include <OgreSceneNode.h>
 #include <BulletDynamics/Dynamics/btRigidBody.h>
@@ -6 +5 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "WaypointGroup.h"
+#include "core/EventIncludes.h"
 
 
@@ -26 +27 @@
         distancetrigger = new DistanceTrigger(this->getContext());   
         distancetrigger->setDistance(100);
-        distanceTrigger_->addTarget("Pawn");
-         this->addEventSource(distanceTrigger_, "explode");
-
+        distancetrigger->addTarget("Pawn");
+        distancetrigger->setStayActive(false);
+        this->addEventSource(distancetrigger, "activate");
         this->attach(distancetrigger);
     }
@@ -37 +38 @@
 
 
+    void Waypoint::activate(){
+        orxout() << "activate function" << endl; 
+        ///++order;
+        waypointgroup->activateNext();
+    }
+
+
      //WorldEntity::setDirection
      //WorldEntity::getPosition()
      //setOrientation()
+ 
 
-
-    void Waypoint::XMLPort(Element& xmlelement, XMLPort::Mode mode){
-        SUPER(Waypoint, XMLPort, xmlelement, mode); // From the SpaceShip.cc file
-        
-        XMLPortParam(Waypoint, "order", setOrder, getOrder, xmlelement, mode);
+    void Waypoint::XMLEventPort(Element& xmlelement, XMLPort::Mode mode){
+        SUPER(Waypoint, XMLEventPort, xmlelement, mode); // From the SpaceShip.cc file
+        //XMLPortParam(Waypoint, "order", setOrder, getOrder, xmlelement, mode);
+        XMLPortEventState(Waypoint, BaseObject, "activate", activate, xmlelement, mode);
 
     }

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

@@ -5 +5 @@
 
 #include "OrxonoxPrereqs.h"
+#include "Waypointprereqs.h"
 #include "worldentities/StaticEntity.h"
 #include "graphics/Model.h"
@@ -14 +15 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
+#include "WaypointGroup.h"
+
 
 namespace orxonox
@@ -37 +40 @@
 
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void enable_waypoint(){
@@ -51 +54 @@
             }
 
+            inline void setWaypointGroup(WaypointGroup* waypointgroup_){
+                this->waypointgroup = waypointgroup_;
+            }
+
+            void activate();
+
             
             bool waypoint_actived;
@@ -59 +68 @@
             Model* model;
             DistanceTrigger* distancetrigger;
-            int order;
-            
+            unsigned int order = 0;
+            WaypointGroup* waypointgroup;
+
             // network callbacks
     };

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){

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

@@ -5 +5 @@
 
 #include "OrxonoxPrereqs.h"
+#include "Waypointprereqs.h"
 #include "worldentities/StaticEntity.h"
 #include "graphics/Model.h"
@@ -31 +32 @@
 
     class _OrxonoxExport WaypointGroup : public StaticEntity {
-        
+
         public:
 
@@ -46 +47 @@
 
         Waypoint* getActive();
-          
 
-        Waypoint* activateNext();
 
-           
+        void activateNext();
 
-            
+        Waypoint* getFirst();
+
+
+
+
 
 
         private:
-    
+
             //virtual bool isCollisionTypeLegal(CollisionType type) const override;
-         
+
         std::set<Waypoint*> waypoints_;
         Waypoint* activeWaypoint;
+        unsigned int current = 1;
+        //std::set<Waypoint*>::iterator it;
 
             // network callbacks

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

@@ -61 +61 @@
 
         if (getWaypointgroup() == nullptr){
-                  orxout() << "Second" << endl;
+                //orxout() << "Second" << endl;
 
             return;
@@ -67 +67 @@
 
         waypoints_ = getWaypointgroup();
-
         waypoint = waypoints_->getActive();
-
         Vector3 waypoint_position = waypoint->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;
 
 
@@ -88 +86 @@
     void Waypointarrow::XMLPort(Element& xmlelement, XMLPort::Mode mode){
         SUPER(Waypointarrow, XMLPort, xmlelement, mode); // From the SpaceShip.cc file
-
         //XMLPortParamTemplate(WorldEntity, "orientation", setOrientation, getOrientation, xmlelement, mode, Vector3)
-
         //XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode); // TRY ADDING THE WAYPOINT ARROW LIKE AN ENGINE