Changeset 11172

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.

Location:

code/branches/plehmannFS16/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• controllers/CMakeLists.txt (modified) (1 diff)
• controllers/ControllerDirector.cc (modified) (2 diffs)
• controllers/DebugTask.cc (modified) (1 diff)
• controllers/DebugTask.h (modified) (1 diff)
• controllers/NewScriptController.cc (modified) (4 diffs)
• controllers/NewScriptController.h (modified) (3 diffs)
• controllers/ScriptController.cc (modified) (1 diff)
• controllers/Task.cc (modified) (2 diffs)
• controllers/Task.h (modified) (3 diffs)

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

@@ -64 +64 @@
     infos/PlayerInfo.h
     sound/SoundManager.h
-    controllers/ScriptController.h
+    controllers/NewScriptController.h
   PCH_FILE
     OrxonoxPrecompiledHeaders.h

code/branches/plehmannFS16/src/orxonox/OrxonoxPrereqs.h

@@ -98 +98 @@
     class HumanController;
     class ScriptController;
+    class NewScriptController;
     class WaypointController;
     class WaypointPatrolController;

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

@@ -21 +21 @@
   NewScriptController.cc
   Task.cc
+  DebugTask.cc
 )

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

@@ -105 +105 @@
         * the next time it is triggered */
        ctrlid += 1;
+
+        orxout()<<"swag"<< endl;
     } 
 
@@ -121 +123 @@
 
             // Check if there actually was a player returned.
-            if( this->player_ == nullptr) return false;
+            if( this->player_ == nullptr) {
+            orxout()<<"swag control"<< endl;
+
+              return false;
+            }
         }
         else

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

@@ -39 +39 @@
     RegisterClass(DebugTask);
 
-    DebugTask::DebugTask(Context* context) : isRunning_(false)
+    DebugTask::DebugTask(Context* context): Task(context)
     {
         RegisterObject(DebugTask);
     }
 
-    DebugTask::Tick(float dt)
+    void DebugTask::tick(float dt)
     {
-
+        SUPER(DebugTask, tick, dt);
         orxout() << "*" << endl;
     }

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

@@ -33 +33 @@
 #include "controllers/ArtificialController.h"
 #include "tools/interfaces/Tickable.h"
+#include "Task.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Task : public Task
+    class _OrxonoxExport DebugTask : public Task
     {
         public:
             DebugTask(Context* context);
-            virtual ~Task();
+            virtual ~DebugTask(){}
 
-            //this function needs to be called otherwise the task is never carriedout
-            initialize()
+            void initialize(float startTime)
+                {this->startTime_ = startTime;}
 
             virtual void tick(float dt) override;

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 */

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

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

@@ -46 +46 @@
 #include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
-#include "core/LuaState.h"
 #include "core/LuaState.h"
 #include "util/Math.h"

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

@@ -31 +31 @@
 
 #include "infos/PlayerInfo.h"
-//#include "controllers/ArtificialController.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -44 +43 @@
         startTime_ = -1;
     }
-    Task::~Task()
-    {
 
-    }
-/*
-    Task::initialize(float startTime)
+    void Task::initialize(float startTime)
     {
         startTime_ = startTime;
     }
-*/
+
     void Task::tick(float dt)
     {
-
+        SUPER(Task, tick, dt);
     }
 

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

@@ -31 +31 @@
 
 #include "infos/PlayerInfo.h"
-//#include "controllers/ArtificialController.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -40 +39 @@
         public:
             Task(Context* context);
-            virtual ~Task();
+            virtual ~Task(){}
 
             //this function needs to be called otherwise the task is never carriedout
-            //initialize();
+            void initialize(float startTime);
 
             virtual void tick(float dt) override;
@@ -56 +55 @@
                 {return startTime_;}
 
-        private:
+       //private:
 
                 bool isRunning_;