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

Timestamp:

Apr 28, 2016, 4:08:07 PM (8 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.h (modified) (3 diffs)

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

@@ -31 +31 @@
 
 #include "DebugTask.h"
+#include "stringOutTask.h"
 #include "Task.h"
 #include "OrxonoxPrereqs.h"                 /* die ganzen tolua, kopiert aus Dock.h*/
@@ -57 +58 @@
             // LUA interface
 
-            void debugOut(float startTime);// tolua_export 
+            void debugOut(float startTime);// tolua_export
+
+            void stringOut(float startTime, std::string output);// tolua_export
 
             static NewScriptController* getNewScriptController();// tolua_export 
 
             int getID() { return ctrlid_; }// tolua_export 
+
+            void printDebug() {orxout() << "fffff" << endl;} // tolua_export
 
 
@@ -80 +85 @@
 
             // List of events to walk through 
-            std::queue<Task*>* taskQueue_;
+            std::queue<Task*> taskQueue_;
 
 
             //List of Tasks currently active 
-            std::vector<Task*>* activeTasks_;
+            std::vector<Task*> activeTasks_;
 
             // Time since the creation of this ScriptController object
             float scTime_;  
 
-            DebugTask* task_;
 
-            context* context_;
+            // context of the Controller to create the tasks
+            Context* context_;