[Orxonox-commit 433] r3014 - branches/netp3/src/core/input

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-05-22 09:15:59 +0200 (Fri, 22 May 2009)
New Revision: 3014

Modified:
   branches/netp3/src/core/input/InputManager.cc
   branches/netp3/src/core/input/InputManager.h
Log:
console command grabMouse / ungrabMouse now working (used for a presentation hack)


Modified: branches/netp3/src/core/input/InputManager.cc
===================================================================
--- branches/netp3/src/core/input/InputManager.cc	2009-05-21 19:25:16 UTC (rev 3013)
+++ branches/netp3/src/core/input/InputManager.cc	2009-05-22 07:15:59 UTC (rev 3014)
@@ -40,6 +40,7 @@
 
 #include "ois/OISException.h"
 #include "ois/OISInputManager.h"
+#include "core/ConsoleCommand.h"
 
 // HACK
 #ifdef ORXONOX_PLATFORM_LINUX
@@ -51,7 +52,6 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CommandExecutor.h"
-#include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
 #include "util/Debug.h"
 
@@ -68,6 +68,8 @@
 {
     SetConsoleCommand(InputManager, calibrate, true);
     SetConsoleCommand(InputManager, reload, false);
+    SetConsoleCommand(InputManager, grabMouse, true);
+    SetConsoleCommand(InputManager, ungrabMouse, true);
     SetCommandLineSwitch(keyboard_no_grab);
 
     EmptyHandler InputManager::EMPTY_HANDLER;
@@ -1483,14 +1485,14 @@
 #ifdef ORXONOX_PLATFORM_LINUX
     void InputManager::grabMouse()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(this->mouse_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(singletonRef_s->mouse_);
         assert(linuxMouse);
         linuxMouse->grab(true);
     }
 
     void InputManager::ungrabMouse()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(this->mouse_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(singletonRef_s->mouse_);
         assert(linuxMouse);
         linuxMouse->grab(false);
     }

Modified: branches/netp3/src/core/input/InputManager.h
===================================================================
--- branches/netp3/src/core/input/InputManager.h	2009-05-21 19:25:16 UTC (rev 3013)
+++ branches/netp3/src/core/input/InputManager.h	2009-05-22 07:15:59 UTC (rev 3014)
@@ -139,8 +139,8 @@
 
 #ifdef ORXONOX_PLATFORM_LINUX
         // HACK!
-        void grabMouse();
-        void ungrabMouse();
+        static void grabMouse();
+        static void ungrabMouse();
 #endif
 
         void update(const Clock& time);