Changeset 11204 for code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc

Timestamp:

May 26, 2016, 3:54:24 PM (8 years ago)

Author:

plehmann

Message:

implemented the update function of MoveToTask. but it does not yet work right. it might be more a problem of the controllerDirector than the task.

File:

• code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) (4 diffs)

code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc

@@ -46 +46 @@
 #include "scriptTasks/DebugTask.h"
 #include "scriptTasks/stringOutTask.h"
+#include "scriptTasks/MoveToTask.h"
 #include "scriptTasks/Task.h"
 #include "infos/PlayerInfo.h"
@@ -102 +103 @@
         this->setControllableEntity(this->entity_);
         this->entity_->mouseLook();
-        this->entity_->setVisible(false);
+        this->entity_->setVisible(true);
         
         // TODO take the human Controllers control  dont forget to give it back in the destructor
@@ -116 +117 @@
         // If this controller has no entity entry, do nothing 
         if( !(this->entity_) ) return;
-
-
-/*
-        if(taskQueue_.front()->getStartTime() <= scTime_)
-        {
-          activeTasks_.push_back(taskQueue_.front());
-          taskQueue_.pop();
-        }
-
-        for(Task* task : activeTasks_)
-        {
-          task->tick(dt);
-        }*/
 
         if(!this->taskList_.empty())
@@ -211 +199 @@
 
       task->initialize(startTime, output);
+
+      bool inserted = false;
+
+      if(taskList_.empty())
+      {
+        taskList_.push_front(task);
+        inserted = true;
+      }
+
+      else
+      {
+        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        {
+          orxout() << "stringOutTask" << endl;
+
+          if(task->getStartTime() < (*it)->getStartTime() )
+          {
+            taskList_.insert(it, task);
+            inserted = true;
+            break;
+          }
+        }
+      }
+
+      if (!inserted)
+      {
+        taskList_.push_back(task);
+      }
+
+    }
+
+    void NewScriptController::moveTo(float startTime, float x, float y, float z, float velocity)
+    {
+
+      MoveToTask* task = new MoveToTask(context_);
+
+      Vector3 destination = Vector3(x,y,z);
+
+      task->initialize(startTime, player_, destination, velocity);
 
       bool inserted = false;