[Orxonox-commit 2513] r7220 - code/branches/consolecommands3/src/libraries/core/input

[landauf at orxonox.net]

Author: landauf
Date: 2010-08-26 00:29:33 +0200 (Thu, 26 Aug 2010)
New Revision: 7220

Modified:
   code/branches/consolecommands3/src/libraries/core/input/Mouse.cc
   code/branches/consolecommands3/src/libraries/core/input/Mouse.h
Log:
found another old console command

Modified: code/branches/consolecommands3/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Mouse.cc	2010-08-25 22:09:12 UTC (rev 7219)
+++ code/branches/consolecommands3/src/libraries/core/input/Mouse.cc	2010-08-25 22:29:33 UTC (rev 7220)
@@ -40,6 +40,15 @@
 
 namespace orxonox
 {
+#ifdef ORXONOX_PLATFORM_LINUX
+    static const std::string __CC_Mouse_name = "Mouse";
+    static const std::string __CC_grab_name = "grab";
+    static const std::string __CC_ungrab_name = "ungrab";
+
+    _SetConsoleCommand(__CC_Mouse_name, __CC_grab_name,   &Mouse::grab);
+    _SetConsoleCommand(__CC_Mouse_name, __CC_ungrab_name, &Mouse::ungrab);
+#endif
+
     Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)
         : super(id, oisInputManager)
     {
@@ -47,13 +56,19 @@
         this->windowResized(this->getWindowWidth(), this->getWindowHeight());
 
 #ifdef ORXONOX_PLATFORM_LINUX
-        // Mouse grab console command
-        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&Mouse::grab, this), "grab"), false);
-        // Mouse ungrab console command
-        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&Mouse::ungrab, this), "ungrab"), false);
+        _ModifyConsoleCommand(__CC_Mouse_name, __CC_grab_name).setObject(this);
+        _ModifyConsoleCommand(__CC_Mouse_name, __CC_ungrab_name).setObject(this);
 #endif
     }
 
+    Mouse::~Mouse()
+    {
+#ifdef ORXONOX_PLATFORM_LINUX
+        _ModifyConsoleCommand(__CC_Mouse_name, __CC_grab_name).setObject(0);
+        _ModifyConsoleCommand(__CC_Mouse_name, __CC_ungrab_name).setObject(0);
+#endif
+    }
+
     //! OIS event handler
     bool Mouse::mouseMoved(const OIS::MouseEvent &e)
     {

Modified: code/branches/consolecommands3/src/libraries/core/input/Mouse.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Mouse.h	2010-08-25 22:09:12 UTC (rev 7219)
+++ code/branches/consolecommands3/src/libraries/core/input/Mouse.h	2010-08-25 22:29:33 UTC (rev 7220)
@@ -63,7 +63,7 @@
     public:
         //! Only sets the clipping size. Initialising is done in the base class.
         Mouse(unsigned int id, OIS::InputManager* oisInputManager);
-        ~Mouse() { }
+        ~Mouse();
 
 #ifdef ORXONOX_PLATFORM_LINUX
         // TODO: Make this a feature rather than a hack