Changeset 11178 for code/branches/plehmannFS16

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

Location:

code/branches/plehmannFS16

Files:

• data/gui/scripts/testscript.lua (modified) (1 diff)
• data/levels/scriptController.oxw (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/controllers/DebugTask.cc (modified) (1 diff)
• src/orxonox/controllers/NewScriptController.cc (modified) (4 diffs)
• src/orxonox/controllers/NewScriptController.h (modified) (3 diffs)
• src/orxonox/controllers/Task.h (modified) (2 diffs)

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

@@ -23 +23 @@
 if ctrl ~= nil then
 
-
-    ctrl:debugOut()
+    --ctrl:printDebug()
+  --ctrl:debugOut(1000)
+  --ctrl:stringOut(10000, "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/data/levels/scriptController.oxw

@@ -39 +39 @@
     <Billboard position="2500,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=10 />
     <DistanceTrigger position="2500,0,0" distance="200" target="Pawn"
-      beaconMode="exclude" targetname="bcnDestroyer" name="takeControl"
+      beaconMode="exclude" targetname="bcnDestroyer" name="takeControl" stayActive="true"
     />
 

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

@@ -5 +5 @@
   ArtificialController.cc
   AIController.cc
-  
   WaypointController.cc
   WaypointPatrolController.cc
@@ -22 +21 @@
   Task.cc
   DebugTask.cc
+  stringOutTask.cc
 )

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

@@ -46 +46 @@
     void DebugTask::tick(float dt)
     {
-        SUPER(DebugTask, tick, dt);
         orxout() << "*" << endl;
     }

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);
     }
 

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_;
 
 

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

@@ -32 +32 @@
 #include "infos/PlayerInfo.h"
 #include "tools/interfaces/Tickable.h"
+#include "core/class/OrxonoxClass.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Task : public Tickable
-    {
+    class _OrxonoxExport Task : public OrxonoxClass {
+   
         public:
             Task(Context* context);
@@ -44 +45 @@
             void initialize(float startTime);
 
-            virtual void tick(float dt) override;
+            virtual void tick(float dt);
 
             void setIsRunning(bool shouldBeRunning)