Changeset 11190 for code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks

Timestamp:

May 19, 2016, 5:34:38 PM (9 years ago)

Author:

plehmann

Message:

modified newScriptController to prevent memory leacks caused by tasks

Location:

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks

Files:

• MoveToTask.cc (modified) (2 diffs)
• MoveToTask.h (modified) (1 diff)
• Task.cc (modified) (2 diffs)
• Task.h (modified) (2 diffs)

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc

@@ -49 +49 @@
         this->entity_ = this->player_->getControllableEntity();
         this->destination_ = destination;
+        this->velocity_ = velocity;
         this->entity->setVelocity( Vector3(0,0,0) )
     }
@@ -55 +56 @@
     {
 
+        float dl = this->velocity_ * dt;
 
+        
         /* Set the position to the correct place in the trajectory */
         this->entity_->setPosition( (1-dl)*startpos + dl * this->currentEvent.v1);

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h

@@ -62 +62 @@
             vector3 destination_;
 
+            float velocity_;
+
     };
 }

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

@@ -38 +38 @@
     RegisterClass(Task);
 
-    Task::Task(Context* context)
+    Task::Task(Context* context) : BaseObject(context)
     {
         RegisterObject(Task);
@@ -49 +49 @@
     }
 
-    bool Task::update(float dt)
-    {
-        SUPER(Task, tick, dt);
-    }
-
 }

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

@@ -32 +32 @@
 #include "infos/PlayerInfo.h"
 #include "tools/interfaces/Tickable.h"
-#include "core/class/OrxonoxClass.h"
+//#include "core/class/OrxonoxClass.h"
+#include "core/BaseObject.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Task : public OrxonoxClass {
+    class _OrxonoxExport Task : public BaseObject {
    
         public:
@@ -46 +47 @@
 
             //important return true while the task is running and false to stop it!!!
-            virtual bool update(float dt); 
+            virtual bool update(float dt) {return false;} 
 
             float getStartTime()