Changeset 9368 for code/branches/release2012/src/orxonox

Timestamp:

Sep 4, 2012, 10:47:49 AM (12 years ago)

Author:

jo

Message:

Trying to change the mouselook keybinding according to the suggestion in the forum. BUT the outcome stays the same.

Location:

code/branches/release2012/src/orxonox/controllers

Files:

• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (1 diff)
• NewHumanController.cc (modified) (1 diff)

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

@@ -57 +57 @@
     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();
@@ -249 +250 @@
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
             HumanController::localController_s->controllableEntity_->mouseLook();
+    }
+
+    void HumanController::mouseLookOFF()
+    {
+        HumanController::mouseLook();
     }
 

code/branches/release2012/src/orxonox/controllers/HumanController.h

@@ -79 +79 @@
             static void switchCamera();
             static void mouseLook();
+            static void mouseLookOFF();
             static void cycleNavigationFocus();
             static void releaseNavigationFocus();

code/branches/release2012/src/orxonox/controllers/NewHumanController.cc

@@ -51 +51 @@
 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);