Changeset 3293 for code/branches/core4/src/core

Timestamp:

Jul 14, 2009, 2:19:57 PM (15 years ago)

Author:

rgrieder

Message:

Linux and GCC build fixes.

Location:

code/branches/core4/src/core

Files:

• OrxonoxClass.h (modified) (1 diff)
• input/JoyStickQuantityListener.h (modified) (1 diff)
• input/Mouse.cc (modified) (1 diff)
• input/Mouse.h (modified) (1 diff)

code/branches/core4/src/core/OrxonoxClass.h

@@ -39 +39 @@
 
 #include "CorePrereqs.h"
+
 #include <set>
 #include <vector>

code/branches/core4/src/core/input/JoyStickQuantityListener.h

@@ -43 +43 @@
     class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
     {
-        friend InputManager;
+        friend class InputManager;
     protected:
         JoyStickQuantityListener();

code/branches/core4/src/core/input/Mouse.cc

@@ -93 +93 @@
 
 #ifdef ORXONOX_PLATFORM_LINUX
-    void Mouse::grabMouse()
+    void Mouse::grab()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
         assert(linuxMouse);
         linuxMouse->grab(true);
     }
 
-    void Mouse::ungrabMouse()
+    void Mouse::ungrab()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
         assert(linuxMouse);
         linuxMouse->grab(false);

code/branches/core4/src/core/input/Mouse.h

@@ -68 +68 @@
 #ifdef ORXONOX_PLATFORM_LINUX
         // TODO: Make this a feature rather than a hack
-        void grabMouse();
-        void ungrabMouse();
+        void grab();
+        void ungrab();
 #endif