Skip to content

D
deprecated-irrlicht-mac
Commit 24ffdaf2 authored by hybrid's avatar hybrid
Browse files
Options

Move joystick stuff into separate class 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3704 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 44c9d539
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 134 deletions
source/Irrlicht/CIrrDeviceWin32.cpp
View file @ 24ffdaf2
This diff is collapsed.
source/Irrlicht/CIrrDeviceWin32.h
View file @ 24ffdaf2
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
namespace irr namespace irr
{ {
struct SJoystickWin32Control;
class CIrrDeviceWin32 : public CIrrDeviceStub, video::IImagePresenter class CIrrDeviceWin32 : public CIrrDeviceStub, video::IImagePresenter
{ {
public: public:
...@@ -383,8 +385,6 @@ namespace irr ...@@ -383,8 +385,6 @@ namespace irr
void resizeIfNecessary(); void resizeIfNecessary();
void pollJoysticks();
HWND HWnd; HWND HWnd;
bool ChangedToFullScreen; bool ChangedToFullScreen;
...@@ -393,14 +393,7 @@ namespace irr ...@@ -393,14 +393,7 @@ namespace irr
bool ExternalWindow; bool ExternalWindow;
CCursorControl* Win32CursorControl; CCursorControl* Win32CursorControl;
#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) SJoystickWin32Control* JoyControl;
struct JoystickInfo
{
u32 Index;
JOYCAPS Caps;
};
core::array<JoystickInfo> ActiveJoysticks;
#endif
}; };
} // end namespace irr } // end namespace irr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment