Changeset 3014 for code/branches/netp3/src

Timestamp:

May 22, 2009, 9:15:59 AM (16 years ago)

Author:

scheusso

Message:

console command grabMouse / ungrabMouse now working (used for a presentation hack)

Location:

code/branches/netp3/src/core/input

Files:

• InputManager.cc (modified) (5 diffs)
• InputManager.h (modified) (1 diff)

code/branches/netp3/src/core/input/InputManager.cc

@@ -41 +41 @@
 #include "ois/OISException.h"
 #include "ois/OISInputManager.h"
+#include "core/ConsoleCommand.h"
 
 // HACK
@@ -52 +53 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/CommandExecutor.h"
-#include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
 #include "util/Debug.h"
@@ -69 +69 @@
     SetConsoleCommand(InputManager, calibrate, true);
     SetConsoleCommand(InputManager, reload, false);
+    SetConsoleCommand(InputManager, grabMouse, true);
+    SetConsoleCommand(InputManager, ungrabMouse, true);
     SetCommandLineSwitch(keyboard_no_grab);
 
@@ -1484 +1486 @@
     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);
@@ -1491 +1493 @@
     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);

code/branches/netp3/src/core/input/InputManager.h

@@ -140 +140 @@
 #ifdef ORXONOX_PLATFORM_LINUX
         // HACK!
-        void grabMouse();
-        void ungrabMouse();
+        static void grabMouse();
+        static void ungrabMouse();
 #endif