Changeset 11258

Timestamp:

Oct 31, 2016, 4:06:17 PM (7 years ago)

Author:

ooguz

Message:

einige Anderungen

Location:

code/branches/QuestGuide_HS16/src/orxonox/worldentities

Files:

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

code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.cc

@@ -15 +15 @@
         model = new Model(this->getContext());
         model->setMeshSource("cube.mesh");  // Name of the arrow file for now bottle
+        this->attach(model);
         model->setScale(3);
         //model->setOrientation(Vector3(0,0,-1));
-        model->setPosition(this->getPosition());        // this is wrong, it has to be triggered
+        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);
     }
 
@@ -25 +30 @@
 
 
-     WorldEntity::setDirection
-     WorldEntity::getPosition()
-     setOrientation()
+     //WorldEntity::setDirection
+     //WorldEntity::getPosition()
+     //setOrientation()
 
 
     void Waypoint::XMLPort(Element& xmlelement, XMLPort::Mode mode){
         SUPER(Waypoint, XMLPort, xmlelement, mode); // From the SpaceShip.cc file
-        //XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode); // TRY ADDING THE WAYPOINT ARROW LIKE AN ENGINE
- 
+        XMLPortParam(Waypoint, "order", getOrder, setOrder, xmlelement, mode);
 
     }

code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.h

@@ -7 +7 @@
 #include "StaticEntity.h"
 #include "graphics/Model.h"
+#include "modules/objects/triggers/DistanceTrigger.h"
 
 #include <map>
@@ -38 +39 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
+            inline void enable_waypoint(){
+                this->waypoint_active = true;
+            }
+
+            inline void disable_waypoint(){
+                this->waypoint_active = false;
+            }
+
+            inline int getOrder(){
+                return order;
+            }
+
+            
 
 
@@ -44 +58 @@
             //virtual bool isCollisionTypeLegal(CollisionType type) const override;
             Model* model;
+            DistanceTrigger* distancetrigger;
+            bool waypoint_active;
+            int order;
             
             // network callbacks

code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypointarrow.cc

@@ -1 @@
-#include "Waypoint.h"
+#include "Waypointarrow.h"
 
 #include <OgreSceneNode.h>
@@ -14 +14 @@
         RegisterObject(Waypointarrow);
         model = new Model(this->getContext());
-        model->setMeshSource("axes.mesh");  // Name of the arrow file for now bottle
+        model->setMeshSource("cokebottle.mesh");  // Name of the arrow file for now bottle
         this->attach(model);
         model->setScale(3);

code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypointarrow.h

@@ -29 +29 @@
     */
 
-    class _OrxonoxExport Waypoint : public StaticEntity {
+    class _OrxonoxExport Waypointarrow : public StaticEntity {
         
         public: