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

Timestamp:

Apr 28, 2016, 4:08:07 PM (9 years ago)

Author:

plehmann

Message:

scriptcontroller task system doesnt work. it seems like queue is the wrong data structure

File:

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

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

@@ -45 +45 @@
 
 #include "DebugTask.h"
+#include "stringOutTask.h"
 #include "Task.h"
 #include "infos/PlayerInfo.h"
@@ -70 +71 @@
 
         this->context_ = context;
-
-        task_ = new DebugTask(context);
-
-        //taskQueue_->push(new DebugTask);
-
     }
 
@@ -119 +115 @@
         if( !(this->entity_) ) return;
 
-        taskQueue_->first()->tick();
+
+/*
+        if(taskQueue_.front()->getStartTime() <= scTime_)
+        {
+          activeTasks_.push_back(taskQueue_.front());
+          taskQueue_.pop();
+        }
+
+        for(Task* task : activeTasks_)
+        {
+          task->tick(dt);
+        }*/
+
+        if(taskQueue_.front() != nullptr)
+        {
+          orxout() << taskQueue_.front() << endl;
+          //taskQueue_.front()->tick(dt);
+        }
     }
 
@@ -125 +138 @@
     void NewScriptController::createAndAddTask(Task newTask)
     {
-      taskQueue_->push(newTask);
+      //taskQueue_->push(newTask);
     }
 
     void NewScriptController::debugOut(float startTime)
     {
-      DebugTask* task = new DebugTask(context);
-      task->initialize(10000);
-      taskQueue_->push(task);
+      DebugTask* task = new DebugTask(context_);
+      task->initialize(startTime);
+      taskQueue_.push(task);
+    }
+
+    void NewScriptController::stringOut(float startTime, std::string output)
+    {
+      stringOutTask* task = new stringOutTask(context_);
+      task->initialize(startTime, output);
+      taskQueue_.push(task);
     }