diff options
author | chai <chaifix@163.com> | 2018-09-02 19:26:41 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-09-02 19:26:41 +0800 |
commit | 05d1cfb909390de4843ac6932be14520b80c1bcd (patch) | |
tree | d6d2e73b079caad3f18952c964d151388952cb9c /src/libjin/Input | |
parent | 4f147c08fc5498af393729c5e4a3d91894c97467 (diff) |
*update
Diffstat (limited to 'src/libjin/Input')
-rw-r--r-- | src/libjin/Input/Event.cpp | 2 | ||||
-rw-r--r-- | src/libjin/Input/Joypad.h | 4 | ||||
-rw-r--r-- | src/libjin/Input/Keyboard.h | 6 | ||||
-rw-r--r-- | src/libjin/Input/Mouse.cpp | 6 | ||||
-rw-r--r-- | src/libjin/Input/Mouse.h | 11 |
5 files changed, 16 insertions, 13 deletions
diff --git a/src/libjin/Input/Event.cpp b/src/libjin/Input/Event.cpp index 8eb45e6..3edff01 100644 --- a/src/libjin/Input/Event.cpp +++ b/src/libjin/Input/Event.cpp @@ -4,4 +4,4 @@ namespace jin { -}
\ No newline at end of file +} // jin
\ No newline at end of file diff --git a/src/libjin/Input/Joypad.h b/src/libjin/Input/Joypad.h index e8d309b..62ce076 100644 --- a/src/libjin/Input/Joypad.h +++ b/src/libjin/Input/Joypad.h @@ -8,7 +8,7 @@ namespace input -} -} +} // input +} // jin #endif
\ No newline at end of file diff --git a/src/libjin/Input/Keyboard.h b/src/libjin/Input/Keyboard.h index 3e78ab1..49ee90f 100644 --- a/src/libjin/Input/Keyboard.h +++ b/src/libjin/Input/Keyboard.h @@ -5,11 +5,13 @@ namespace jin { namespace input { + class Keyboard { }; -} -} + +} // input +} // jin #endif // __JIN_KEYBOARD_H
\ No newline at end of file diff --git a/src/libjin/Input/Mouse.cpp b/src/libjin/Input/Mouse.cpp index 98c4a39..a3c8e27 100644 --- a/src/libjin/Input/Mouse.cpp +++ b/src/libjin/Input/Mouse.cpp @@ -11,12 +11,12 @@ namespace input void Mouse::getState(int* x, int* y) { -#ifdef JIN_INPUT_SDL + #ifdef JIN_INPUT_SDL SDL_GetMouseState(x, y); -#endif // JIN_INPUT_SDL + #endif // JIN_INPUT_SDL } } // input } // jin -#endif // JIN_MODULES_INPUT
\ No newline at end of file +#endif // JIN_MODULES_INPUT
\ No newline at end of file diff --git a/src/libjin/Input/Mouse.h b/src/libjin/Input/Mouse.h index 5fc6b47..584c516 100644 --- a/src/libjin/Input/Mouse.h +++ b/src/libjin/Input/Mouse.h @@ -9,21 +9,22 @@ namespace jin { namespace input { + class Mouse : public Singleton<Mouse> { public: - - // void getState(int* x, int* y); private: + SINGLETON(Mouse); + Mouse() {}; ~Mouse() {}; - SINGLETON(Mouse); }; -} -} + +} // input +} // jin #endif // JIN_MODULES_INPUT #endif // __JIN_MOUSE_H
\ No newline at end of file |