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

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.cc (modified) (4 diffs)

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

@@ -44 +44 @@
 #include "NewScriptController.h"
 
+#include "DebugTask.h"
 #include "Task.h"
 #include "infos/PlayerInfo.h"
 #include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
-#include "core/LuaState.h"
 #include "core/LuaState.h"
 #include "util/Math.h"
@@ -69 +69 @@
         this->scTime_ = 0.0f;
 
-        //taskList_->push(new DebugTask);
+        this->context_ = context;
+
+        task_ = new DebugTask(context);
+
+        //taskQueue_->push(new DebugTask);
 
     }
@@ -111 +115 @@
         SUPER(NewScriptController, tick, dt);
 
-/*
+
         // If this controller has no entity entry, do nothing 
         if( !(this->entity_) ) return;
 
-        // See if time has come for the next event to be run 
-        if(this->taskList_->size() > 0 && this->taskList_->front().getStartTime() <= scTime_)
-        { // Execute the next event on the list 
-          activeTasks_->push_back(taskList_->front());
-          taskList_->pop();
-        }
-
-        // Update the local timers in this object 
-        scTime_ += dt;
-
-        // tick active tasks and delete completed tasks 
-        for(std::vector<Task>::iterator it = activeTasks_->begin(); it != activeTasks_->end(); it++)
-        {
-          it->tick(dt);
-          if ( !(it->getIsRunning()) )
-          {
-            activeTasks_->erase(it);
-            it--;
-          }
-
-        }
-*/
+        taskQueue_->first()->tick();
     }
 
@@ -142 +125 @@
     void NewScriptController::createAndAddTask(Task newTask)
     {
-      taskList_->push(newTask);
+      taskQueue_->push(newTask);
     }
 
-    void NewScriptController::debugOut()
+    void NewScriptController::debugOut(float startTime)
     {
-      orxout() << "NewScriptController: Taking control" << endl;
+      DebugTask* task = new DebugTask(context);
+      task->initialize(10000);
+      taskQueue_->push(task);
     }
 
-    NewScriptController* NewScriptController::getNewScriptController()
+    NewScriptController* NewScriptController::getNewScriptController() 
     {
       /* Output a message that confirms this function was called */