Changeset 7220

Timestamp:

Aug 26, 2010, 12:29:33 AM (14 years ago)

Author:

landauf

Message:

found another old console command

Location:

code/branches/consolecommands3/src/libraries/core/input

Files:

• Mouse.cc (modified) (2 diffs)
• Mouse.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/input/Mouse.cc

@@ -41 +41 @@
 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)
@@ -48 +57 @@
 
 #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
     }

code/branches/consolecommands3/src/libraries/core/input/Mouse.h

@@ -64 +64 @@
         //! 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