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

Timestamp:

Apr 14, 2016, 4:03:16 PM (9 years ago)

Author:

plehmann

Message:

changed the NewScriptController and Task classes

File:

• code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (modified) (4 diffs)

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

@@ -61 +61 @@
 
 
-        /* Set default values for all variables */
-        /* - pointers to zero */
+        // Set default values for all variables 
+        // - pointers to zero 
         this->player_ = nullptr;
         this->entity_ = nullptr;
 
-        /* - times */
+        // - times
         this->scTime_ = 0.0f;
+
+        //taskList_->push(new DebugTask);
 
     }
 
+
+
     void NewScriptController::takeControl(int ctrlid)
     {
-        /* Output some debugging information */
+        // Output some debugging information 
         orxout(verbose) << "NewScriptController: Taking control" << endl;
         orxout(verbose) << "This-pointer: " << this << endl; 
 
 
-        /* Store the entity pointer in a private variable */
+        // Store the entity pointer in a private variable
         this->entity_ = this->player_->getControllableEntity();
         assert(this->entity_);
+
+        this->ctrlid_ = ctrlid;
+        if (ctrlid_ == 0)
+        {
+          ctrlid_ = 1;
+        }
          
-        /* Add the controller here to this entity. Apparently this still leaves
-         * any preexisting human controllers in place. 
-         */
+        // Add the controller here to this entity. Apparently this still leaves
+        // any preexisting human controllers in place. 
+         
         this->entity_->setDestroyWhenPlayerLeft(false);
         this->player_->stopTemporaryControl();
@@ -98 +108 @@
     void NewScriptController::tick(float dt)
     {
-        /* Call the tick function of the classes we derive from */
-        SUPER(ScriptController, tick, dt);
+        // Call the tick function of the classes we derive from 
+        SUPER(NewScriptController, tick, dt);
 
-        /* If this controller has no entity entry, do nothing */
+/*
+        // 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 */
+        // 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 */
+        { // Execute the next event on the list 
           activeTasks_->push_back(taskList_->front());
           taskList_->pop();
         }
 
-        /* Update the local timers in this object */
+        // Update the local timers in this object 
         scTime_ += dt;
 
-        /* tick active tasks and delete completed tasks */
+        // tick active tasks and delete completed tasks 
         for(std::vector<Task>::iterator it = activeTasks_->begin(); it != activeTasks_->end(); it++)
         {
@@ -125 +136 @@
 
         }
-
+*/
     }
 
@@ -134 +145 @@
     }
 
+    void NewScriptController::debugOut()
+    {
+      orxout() << "NewScriptController: Taking control" << endl;
+    }
+
+    NewScriptController* NewScriptController::getNewScriptController()
+    {
+      /* Output a message that confirms this function was called */
+      orxout() << "Great success!" << std::endl;
+
+      /* Debugging: print all the scriptcontroller object pointers */
+      for(NewScriptController* controller : ObjectList<NewScriptController>())
+      { orxout() << "Have object in list: " << controller << endl; }
+
+      /* Find the first one with a nonzero ID */
+      for(NewScriptController* controller : ObjectList<NewScriptController>())
+      { 
+        // TODO: do some selection here. Currently just returns the first one
+        if( controller->getID() > 0 )
+        { orxout() << "Controller to return: " << controller << endl;
+          return controller;
+        }
+      
+      }
+      return nullptr;
+    }
 
 }