Changeset 11183 for code/branches

Timestamp:

May 12, 2016, 3:28:30 PM (9 years ago)

Author:

plehmann

Message:

moved the task classes to the scriptTasks folder. modified the NewScriptController to execute tasks when their time has come modified the tasks so that they tell the controller when they are done

Location:

code/branches/plehmannFS16

Files:

• data/gui/scripts/testscript.lua (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/DebugTask.cc (deleted)
• src/orxonox/controllers/DebugTask.h (deleted)
• src/orxonox/controllers/NewScriptController.cc (modified) (6 diffs)
• src/orxonox/controllers/NewScriptController.h (modified) (2 diffs)
• src/orxonox/controllers/Task.cc (deleted)
• src/orxonox/controllers/Task.h (deleted)
• src/orxonox/controllers/scriptTasks (added)
• src/orxonox/controllers/scriptTasks/CMakeLists.txt (added)
• src/orxonox/controllers/scriptTasks/DebugTask.cc (added)
• src/orxonox/controllers/scriptTasks/DebugTask.h (added)
• src/orxonox/controllers/scriptTasks/Task.cc (added)
• src/orxonox/controllers/scriptTasks/Task.h (added)
• src/orxonox/controllers/scriptTasks/stringOutTask.cc (added)
• src/orxonox/controllers/scriptTasks/stringOutTask.h (added)
• src/orxonox/controllers/stringOutTask.cc (deleted)
• src/orxonox/controllers/stringOutTask.h (deleted)

code/branches/plehmannFS16/data/gui/scripts/testscript.lua

@@ -23 +23 @@
 if ctrl ~= nil then
 
-    --ctrl:printDebug()
-  --ctrl:debugOut(1000)
-  --ctrl:stringOut(10000, "hello")
+  ctrl:printDebug()
+  ctrl:debugOut(5)
+  ctrl:stringOut(3, "hello")
   --ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 10)
   -- ctrl:eventScheduler("ral", xl, yl, zl, 3, 3000, 0, math.pi)

code/branches/plehmannFS16/src/orxonox/controllers/CMakeLists.txt

@@ -19 +19 @@
   MasterController.cc
   NewScriptController.cc
-  Task.cc
-  DebugTask.cc
-  stringOutTask.cc
 )
+ADD_SUBDIRECTORY(scriptTasks)

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

@@ -44 +44 @@
 #include "NewScriptController.h"
 
-#include "DebugTask.h"
-#include "stringOutTask.h"
-#include "Task.h"
+#include "scriptTasks/DebugTask.h"
+#include "scriptTasks/stringOutTask.h"
+#include "scriptTasks/Task.h"
 #include "infos/PlayerInfo.h"
 #include "core/CoreIncludes.h"
@@ -71 +71 @@
 
         this->context_ = context;
+
+        
     }
 
@@ -87 +89 @@
 
         this->ctrlid_ = ctrlid;
-        if (ctrlid_ == 0)
-        {
-          ctrlid_ = 1;
+        if (this->ctrlid_ == 0)
+        {
+          this->ctrlid_ = 1;
         }
          
@@ -128 +130 @@
         }*/
 
-        if(taskQueue_.front() != nullptr)
-        {
-          orxout() << taskQueue_.front() << endl;
-          //taskQueue_.front()->tick(dt);
-        }
+        if(this->taskList_.size() != 0)
+        {
+
+          orxout() << this->scTime_ << endl;
+
+          if(this->taskList_.front()->getStartTime() < this->scTime_)
+          {
+             activeTasks_.push_back(this->taskList_.front());
+             this->taskList_.pop_front();
+          }
+        }
+        else
+        {
+          //orxout() << "no tasks in taskList_" << endl;
+        }
+        
+        for (std::vector<Task*>::iterator it = activeTasks_.begin(); it != activeTasks_.end(); it++)
+        {
+          if( !((*it)->update(dt)) )
+          {
+            delete (*it); // delete the task that was created with new
+            activeTasks_.erase(it);
+            it--; // set back the iterator so we continue with the next element and not with the one after that
+          }
+        }
+
+
+        scTime_ += dt;
     }
 
@@ -145 +170 @@
       DebugTask* task = new DebugTask(context_);
       task->initialize(startTime);
-      taskQueue_.push(task);
+
+      if(taskList_.empty())
+      {
+        taskList_.push_front(task);
+      }
+
+      else
+      {
+        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        {
+          orxout() << taskList_.empty() << endl;
+
+          if(task->getStartTime() < (*it)->getStartTime() )
+          {
+            taskList_.insert(it, task);
+          }
+        }
+      }
     }
 
@@ -152 +194 @@
       stringOutTask* task = new stringOutTask(context_);
       task->initialize(startTime, output);
-      taskQueue_.push(task);
+
+      if(taskList_.empty())
+      {
+        taskList_.push_front(task);
+      }
+
+      else
+      {
+        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        {
+          orxout() << taskList_.empty() << endl;
+
+          if(task->getStartTime() < (*it)->getStartTime() )
+          {
+            taskList_.insert(it, task);
+          }
+        }
+      }
     }
 

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

@@ -30 +30 @@
 #define _NewScriptController_H__
 
-#include "DebugTask.h"
-#include "stringOutTask.h"
-#include "Task.h"
+#include "scriptTasks/DebugTask.h"
+#include "scriptTasks/stringOutTask.h"
+#include "scriptTasks/Task.h"
 #include "OrxonoxPrereqs.h"                 /* die ganzen tolua, kopiert aus Dock.h*/
 #include "ArtificialController.h"
@@ -84 +84 @@
             int ctrlid_;
 
-            // List of events to walk through 
-            std::queue<Task*> taskQueue_;
+            // List of events to walk through sorted by starting times
+            std::list<Task*> taskList_;