Changeset 11332

Timestamp:

Dec 12, 2016, 3:17:21 PM (8 years ago)

Author:

ooguz

Message:

Last Commit (waypointscale ist 0)

Location:

code/branches/QuestGuide_HS16/src/modules/waypoints

Files:

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

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

@@ -21 +21 @@
         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");
@@ -39 +39 @@
 
     void Waypoint::activate(){
-        orxout() << "activate function" << endl; 
+        orxout() << "activate function" << endl;
         ///++order;
         waypointgroup->activateNext();
@@ -48 +48 @@
      //WorldEntity::getPosition()
      //setOrientation()
- 
+
 
     void Waypoint::XMLEventPort(Element& xmlelement, XMLPort::Mode mode){

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

@@ -1 +1 @@
 #include "Waypointarrow.h"
+
+#include "util/Convert.h"
 
 #include <OgreSceneNode.h>
@@ -5 +7 @@
 #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)
@@ -42 +48 @@
 */
 
+ /*   void Waypointarrow::toggleArrow(){
+        if(model->getScale() == 3)
+            model->setScale(0);
+        else
+            model->setScale(3);
+    }
+*/
 
     WaypointGroup* Waypointarrow::getWaypointgroup()
@@ -71 +84 @@
 
 
-        //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;

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

@@ -43 +43 @@
 
             virtual void tick(float dt);
+            //static void toogleArrow();
+