From 05d1cfb909390de4843ac6932be14520b80c1bcd Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 2 Sep 2018 19:26:41 +0800 Subject: *update --- src/libjin/input/event.cpp | 2 +- src/libjin/input/joypad.h | 4 ++-- src/libjin/input/keyboard.h | 6 ++++-- src/libjin/input/mouse.cpp | 6 +++--- src/libjin/input/mouse.h | 11 ++++++----- 5 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src/libjin/input') 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 { 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 -- cgit v1.1-26-g67d0