Changeset 7066 for code/branches/presentation3/src/orxonox/controllers/AIController.cc

Timestamp:

May 31, 2010, 6:18:50 PM (14 years ago)

Author:

solex

Message:

formationflight final commit before presentation (probably…)

File:

• code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified) (3 diffs)

code/branches/presentation3/src/orxonox/controllers/AIController.cc

@@ -127 +127 @@
 
             if  (this->specificMasterAction_ != NONE) 
-            {
                     this->specificMasterActionHold();
-
-//                 if (this->specificMasterAction_  == TURN180)
-//                     this->turn180Init();
-
-//                 if (this->specificMasterAction_ == SPIN)
-//                     this->spinInit();
-
-//                 if (this->specificMasterAction_ == FOLLOWHUMAN)
-//                     this->followHuman(this->HumanToFollow_, false);
-            }
 
             else {
@@ -151 +140 @@
                 if (random < 5)
                    this->spinInit();
+
+                // follow a randomly chosen human - a specific Master Action
+                random = rnd(1000.0f);
+                if (random < 1)
+                   this->followRandomHumanInit();
 
                  // lose master status (only if less than 4 slaves in formation)
@@ -230 +224 @@
             if (this->specificMasterAction_ == SPIN)
                     this->spin();
-            if (this->specificMasterAction_ == FOLLOWHUMAN)
+            if (this->specificMasterAction_ == FOLLOW)
                     this->follow();
         }