Changeset 11187 for code/branches

Timestamp:

May 12, 2016, 4:08:32 PM (9 years ago)

Author:

plehmann

Message:

added a MoveToTask TODO implement the update function

Location:

code/branches/plehmannFS16/src/orxonox/controllers

Files:

• NewScriptController.cc (modified) (6 diffs)
• NewScriptController.h (modified) (1 diff)
• scriptTasks/MoveToTask.cc (added)
• scriptTasks/MoveToTask.h (added)

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

@@ -135 +135 @@
           orxout() << this->scTime_ << endl;
 
-          if(this->taskList_.front()->getStartTime() < this->scTime_)
+          if(this->taskList_.front().getStartTime() < this->scTime_)
           {
              activeTasks_.push_back(this->taskList_.front());
@@ -146 +146 @@
         }
         
-        for (std::vector<Task*>::iterator it = activeTasks_.begin(); it != activeTasks_.end(); it++)
-        {
-          if( !((*it)->update(dt)) )
-          {
-            delete (*it); // delete the task that was created with new
+        for (std::vector<Task>::iterator it = activeTasks_.begin(); it != activeTasks_.end(); it++)
+        {
+          if( !(it->update(dt)) )
+          {
             activeTasks_.erase(it);
             it--; // set back the iterator so we continue with the next element and not with the one after that
@@ -168 +167 @@
     void NewScriptController::debugOut(float startTime)
     {
-      DebugTask* task = new DebugTask(context_);
-      task->initialize(startTime);
+      DebugTask task = DebugTask(context_);
+      task.initialize(startTime);
 
       if(taskList_.empty())
@@ -178 +177 @@
       else
       {
-        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        for (std::list<Task>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
         {
           orxout() << taskList_.empty() << endl;
 
-          if(task->getStartTime() < (*it)->getStartTime() )
+          if(task.getStartTime() < it->getStartTime() )
           {
             taskList_.insert(it, task);
@@ -192 +191 @@
     void NewScriptController::stringOut(float startTime, std::string output)
     {
-      stringOutTask* task = new stringOutTask(context_);
-      task->initialize(startTime, output);
+      stringOutTask task = stringOutTask(context_);
+      task.initialize(startTime, output);
 
       if(taskList_.empty())
@@ -202 +201 @@
       else
       {
-        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        for (std::list<Task>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
         {
           orxout() << taskList_.empty() << endl;
 
-          if(task->getStartTime() < (*it)->getStartTime() )
+          if(task.getStartTime() < it->getStartTime() )
           {
             taskList_.insert(it, task);

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

@@ -85 +85 @@
 
             // List of events to walk through sorted by starting times
-            std::list<Task*> taskList_;
+            std::list<Task> taskList_;
 
 
             //List of Tasks currently active 
-            std::vector<Task*> activeTasks_;
+            std::vector<Task> activeTasks_;
 
             // Time since the creation of this ScriptController object