Changeset 8943

Timestamp:

Nov 23, 2011, 2:13:52 PM (12 years ago)

Author:

willis

Message:

Added Keybinding for toggleFormationFlight

Location:

code/branches/formation

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (3 diffs)
• src/orxonox/controllers/Masterable.cc (modified) (2 diffs)

code/branches/formation/data/defaultConfig/keybindings.ini

@@ -71 +71 @@
 KeyNumLock=
 KeyNumRow0=
-KeyNumRow1=
+KeyNumRow1="toggleFormationFlight"
 KeyNumRow2=
 KeyNumRow3=

code/branches/formation/src/orxonox/controllers/HumanController.cc

@@ -50 +50 @@
     SetConsoleCommand("HumanController", "rotatePitch",            &HumanController::rotatePitch   ).addShortcut().setAsInputCommand();
     SetConsoleCommand("HumanController", "rotateRoll",             &HumanController::rotateRoll    ).addShortcut().setAsInputCommand();
-    SetConsoleCommand("HumanController", "toggleFormationFlight",  &HumanController::toggleFormationFlight).addShortcut().setAsInputCommand();
+    SetConsoleCommand("HumanController", "toggleFormationFlight",  &HumanController::toggleFormationFlight).addShortcut().keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("HumanController", __CC_fire_name,           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
     SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
@@ -88 +88 @@
         HumanController::localController_s = 0;
         if (this->state_==MASTER)
-            freeSlaves();
+            removeFromFormation();
     }
 
@@ -283 +283 @@
             {
                 HumanController::localController_s->takeLeadOfFormation();
-                //HumanController::localController_s->state_=MASTER;
             }
         }

code/branches/formation/src/orxonox/controllers/Masterable.cc

@@ -581 +581 @@
     void Masterable::takeLeadOfFormation()
     {
+        if (!this->getControllableEntity())
+            return;
+
         if (this->state_==MASTER) return;
         //search new Master, then take lead
@@ -664 +667 @@
         //debug
         if (this->state_==SLAVE)
-              {orxout(debug_output) << this << " is slave "<< endl;}
-           else if (this->state_==MASTER)
-              {orxout(debug_output) << this << " is now a master of "<<this->slaves_.size()<<" slaves."<< endl;}
-           if (this->state_==FREE)
-              {orxout(debug_output) << this << " is free "<< endl;}
+           {orxout(debug_output) << this << " is slave "<< endl;}
+        else if (this->state_==MASTER)
+           {orxout(debug_output) << this << " is now a master of "<<this->slaves_.size()<<" slaves."<< endl;}
+        if (this->state_==FREE)
+           {orxout(debug_output) << this << " is free "<< endl;}
     }