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

Timestamp:

Apr 21, 2016, 4:02:06 PM (8 years ago)

Author:

plehmann

Message:

updated some files so NewScriptController lua binds are created. added DebugTask to cmake.

File:

• code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) (3 diffs)

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

@@ -30 +30 @@
 #define _NewScriptController_H__
 
+#include "DebugTask.h"
 #include "Task.h"
 #include "OrxonoxPrereqs.h"                 /* die ganzen tolua, kopiert aus Dock.h*/
@@ -55 +56 @@
 
             // LUA interface
-            // tolua_begin 
 
-            void debugOut();
+            void debugOut(float startTime);// tolua_export 
 
-            static NewScriptController* getNewScriptController();
+            static NewScriptController* getNewScriptController();// tolua_export 
 
-            int getID() { return ctrlid_; }
+            int getID() { return ctrlid_; }// tolua_export 
 
-            //tolua_end
 
             void createAndAddTask(Task newTask);
@@ -81 +80 @@
 
             // List of events to walk through 
-            std::queue<Task>* taskList_;
+            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_;