[Orxonox-commit 4697] r9368 - code/branches/release2012/src/orxonox/controllers

[jo at orxonox.net]

Author: jo
Date: 2012-09-04 10:47:49 +0200 (Tue, 04 Sep 2012)
New Revision: 9368

Modified:
   code/branches/release2012/src/orxonox/controllers/HumanController.cc
   code/branches/release2012/src/orxonox/controllers/HumanController.h
   code/branches/release2012/src/orxonox/controllers/NewHumanController.cc
Log:
Trying to change the mouselook keybinding according to the suggestion in the forum. BUT the outcome stays the same.

Modified: code/branches/release2012/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/release2012/src/orxonox/controllers/HumanController.cc	2012-09-04 07:39:04 UTC (rev 9367)
+++ code/branches/release2012/src/orxonox/controllers/HumanController.cc	2012-09-04 08:47:49 UTC (rev 9368)
@@ -56,7 +56,8 @@
     SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::keepBoost     ).addShortcut().keybindMode(KeybindMode::OnHold);
     SetConsoleCommand("HumanController", "greet",                  &HumanController::greet         ).addShortcut();
     SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
-    SetConsoleCommand("HumanController", "mouseLook",              &HumanController::mouseLook     ).addShortcut();
+    SetConsoleCommand("HumanController", "mouseLook",              &HumanController::mouseLook     ).addShortcut().keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand("HumanController", "mouseLookOFF",           &HumanController::mouseLookOFF  ).addShortcut().keybindMode(KeybindMode::OnRelease);
     SetConsoleCommand("HumanController", __CC_suicide_name,        &HumanController::suicide       ).addShortcut();
     SetConsoleCommand("HumanController", "toggleGodMode",          &HumanController::toggleGodMode ).addShortcut();
     SetConsoleCommand("HumanController", "addBots",                &HumanController::addBots       ).addShortcut().defaultValues(1);
@@ -250,6 +251,11 @@
             HumanController::localController_s->controllableEntity_->mouseLook();
     }
 
+    void HumanController::mouseLookOFF()
+    {
+        HumanController::mouseLook();
+    }
+
     void HumanController::suicide()
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)

Modified: code/branches/release2012/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/release2012/src/orxonox/controllers/HumanController.h	2012-09-04 07:39:04 UTC (rev 9367)
+++ code/branches/release2012/src/orxonox/controllers/HumanController.h	2012-09-04 08:47:49 UTC (rev 9368)
@@ -78,6 +78,7 @@
             static void greet();
             static void switchCamera();
             static void mouseLook();
+            static void mouseLookOFF();
             static void cycleNavigationFocus();
             static void releaseNavigationFocus();
 

Modified: code/branches/release2012/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/release2012/src/orxonox/controllers/NewHumanController.cc	2012-09-04 07:39:04 UTC (rev 9367)
+++ code/branches/release2012/src/orxonox/controllers/NewHumanController.cc	2012-09-04 08:47:49 UTC (rev 9368)
@@ -50,7 +50,7 @@
 
 namespace orxonox
 {
-    SetConsoleCommand("NewHumanController", "changeMode", &NewHumanController::changeMode).keybindMode(KeybindMode::OnPress); //disabling free aiming
+    SetConsoleCommand("NewHumanController", "changeMode", &NewHumanController::changeMode).keybindMode(KeybindMode::OnPress); //disabled
     SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();