[Orxonox-commit 6703] r11332 - code/branches/QuestGuide_HS16/src/modules/waypoints

[ooguz at orxonox.net]

Author: ooguz
Date: 2016-12-12 15:17:21 +0100 (Mon, 12 Dec 2016)
New Revision: 11332

Modified:
   code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc
   code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc
   code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h
Log:
Last Commit (waypointscale ist 0)

Modified: code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc
===================================================================
--- code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc	2016-12-12 14:16:38 UTC (rev 11331)
+++ code/branches/QuestGuide_HS16/src/modules/waypoints/Waypoint.cc	2016-12-12 14:17:21 UTC (rev 11332)
@@ -20,11 +20,11 @@
         model = new Model(this->getContext());
         model->setMeshSource("cube.mesh");  // Name of the arrow file for now bottle
         this->attach(model);
-        model->setScale(3);
+        model->setScale(0);
         //model->setOrientation(Vector3(0,0,-1));
         model->setPosition(Vector3(0.0,0.0,0.0));        // this is wrong, it has to be triggered
         waypoint_actived = false;
-        distancetrigger = new DistanceTrigger(this->getContext());   
+        distancetrigger = new DistanceTrigger(this->getContext());
         distancetrigger->setDistance(100);
         distancetrigger->addTarget("Pawn");
         distancetrigger->setStayActive(false);
@@ -38,7 +38,7 @@
 
 
     void Waypoint::activate(){
-        orxout() << "activate function" << endl; 
+        orxout() << "activate function" << endl;
         ///++order;
         waypointgroup->activateNext();
     }
@@ -47,8 +47,8 @@
      //WorldEntity::setDirection
      //WorldEntity::getPosition()
      //setOrientation()
- 
 
+
     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);

Modified: code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc
===================================================================
--- code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc	2016-12-12 14:16:38 UTC (rev 11331)
+++ code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.cc	2016-12-12 14:17:21 UTC (rev 11332)
@@ -1,14 +1,20 @@
 #include "Waypointarrow.h"
 
+#include "util/Convert.h"
+
 #include <OgreSceneNode.h>
 #include <BulletDynamics/Dynamics/btRigidBody.h>
 #include "util/OrxAssert.h"
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
+
 namespace orxonox
 {
     RegisterClass(Waypointarrow);
+    // SetConsoleCommand("Waypointarrow", "toggleArrow", &Waypointarrow::toggleArrow);
 
+
     Waypointarrow::Waypointarrow(Context* context) : StaticEntity(context)
     {
         RegisterObject(Waypointarrow);
@@ -41,6 +47,13 @@
 
 */
 
+ /*   void Waypointarrow::toggleArrow(){
+        if(model->getScale() == 3)
+            model->setScale(0);
+        else
+            model->setScale(3);
+    }
+*/
 
     WaypointGroup* Waypointarrow::getWaypointgroup()
     {
@@ -70,7 +83,7 @@
         Vector3 waypoint_position = waypoint->getWorldPosition();
 
 
-        //orxout() << "dsfsf" << waypoint_position.x << endl;
+        // orxout() << model->scale_ << 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;

Modified: code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h
===================================================================
--- code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h	2016-12-12 14:16:38 UTC (rev 11331)
+++ code/branches/QuestGuide_HS16/src/modules/waypoints/Waypointarrow.h	2016-12-12 14:17:21 UTC (rev 11332)
@@ -42,8 +42,10 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             virtual void tick(float dt);
+            //static void toogleArrow();
 
 
+
         private:
     
             //virtual bool isCollisionTypeLegal(CollisionType type) const override;