Changeset 10968 for code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc

Timestamp:

Dec 11, 2015, 3:16:48 PM (8 years ago)

Author:

gania

Message:

a little clean up

File:

• code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) (9 diffs)

code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc

@@ -38 +38 @@
     {
         RegisterObject(MasterController);
-        // orxout(internal_error) << "MasterController was created" << endl;
-
         this->controllers_.clear();
         this->numberOfTicksPassedSinceLastActionCall_ = 0;
@@ -50 +48 @@
         this->controllers_.clear();
     } 
+    /*HACK*/
+    //the whole idea is a hack
     void MasterController::tick(float dt)
     {   
@@ -55 +55 @@
             return;  
         ++this->ticks_;
-        //orxout(internal_error) << "Tick = " << this->ticks_ << endl;
         if (this->ticks_ == 1)
         {
@@ -66 +65 @@
                 this->controllers_.push_back(*it);
             }
-            //orxout(internal_error) << "I got " << this->controllers_.size() << " controllers" << endl;
         }
         else
         {
-
             if (this->controllers_.empty())
                 return;
@@ -87 +84 @@
             if (this->numberOfTicksPassedSinceLastActionCall_ > 0)
             {
-                //call maneuver for current index
                 if (this->numberOfTicksPassedSinceLastActionCall_ == 3)
                 {
+                    //check if 0ptr
                     if (!this->controllers_.at(this->indexOfCurrentController_))
                     {
@@ -95 +92 @@
                         return;
                     }
-                    //orxout (internal_error) << "Executing maneuver of Controller # " << this->indexOfCurrentController_ << endl;
+                    //call maneuver for current index
                     this->controllers_.at(this->indexOfCurrentController_)->maneuver();
                 }
                 else if (this->numberOfTicksPassedSinceLastActionCall_ == 6)
                 {
-                    //call canFire for current index
+                    //check if 0ptr
                     if (!this->controllers_.at(this->indexOfCurrentController_))
                     {
@@ -106 +103 @@
                         return;
                     }
-                    //orxout (internal_error) << "Executing maneuver of Controller # " << this->indexOfCurrentController_ << endl;
+                    //call canFire for current index
                     this->controllers_.at(this->indexOfCurrentController_)->bShooting_ = this->controllers_.at(this->indexOfCurrentController_)->canFire();   
                 }
@@ -113 +110 @@
             else
             {
-                //call action for current index
+                //check if 0ptr
                 if (!this->controllers_.at(this->indexOfCurrentController_))
                 {
@@ -119 +116 @@
                     return;
                 }
-                //orxout (internal_error) << "Executing action of Controller # " << this->indexOfCurrentController_ << endl;
-                this->controllers_.at(this->indexOfCurrentController_)->action();    
+                //call action for current index
+                this->controllers_.at(this->indexOfCurrentController_)->action();   
+                 
                 //bCopyOrientation makes ship oscillate like crazy if set to true all the time.s
                 this->controllers_.at(this->indexOfCurrentController_)->bCopyOrientation_ = this->ticks_ % 3 == 0;