Initial implementation of InputManager #28
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LumpBloom7
changed the title
LumpBloom7
force-pushed
the
feature/InputManager
branch
from
7b85a1d to
eafdeb8
Compare
This time fixing merge problems on GitHub and any build jobs.
LumpBloom7
force-pushed
the
feature/InputManager
branch
from
eafdeb8 to
6a8c66e
Compare
Contributor
Author
|
Thanks for the helpful review, will work on fixing all of it. |
added 3 commits
March 2, 2019 00:54
- Use enum class instead of enum - Add const and noexcept qualifiers - Make isPrintable private - Rename m_will_quit and m_isLocked to m_quitState and m_lockState - Simplify clearing m_printable in update()
Collaborator
|
Hm, |
This is absolutely NOT complete. Still a lot of work to be done, but this should act as a starting point.
Contributor
Author
Something like this? If this is a good direction, I'll continue to work on this. Else I'll try another method. EDIT: Several improvements were made in the next two commits. |
- Move all input staff to `bloom::input` namespace - Move Keyboard and Mouse classes to separate file - Rename Keyboard to KeyboardEvent and Mouse to MouseEvent - Add set and clear methods for event classes (private methods) - Add enum for event types - Add reset() for InputManager to reset all events (private method) - Mark isUp and isDown as deprecated (check comments for them)
Collaborator
|
@LumpBloom7, check my implementation https://github.com/xapdkop/BloomFramework/commit/2177f7135e7c4ee23e84bc8c2feee40c84987f8a |
- Add ctors for KeyboardEvent and MouseEvent - Rename clear to reset in KeyboardEvent and MouseEvent - Add messages for deprecated funcs - Store printable character as char - Use pairs for pos, movement and scroll in MouseEvent - Make enter and backspace printable - Rework the logic of events handing - Add flag for prevention the handling of [unhandled] events if quit event was handled - Now InputManager::update will return current quit state w/o resetting it (to reset use resetQuit) - Turn off InputManager::getType
- Adjust KeyboardKey::KEYBOARD_SIZE - Add MOUSE_X1 and MOUSE_X2 to MouseButton - Simplify `set` in MouseEvent and KeyboardEvent - Add NoEvent to EventType - Use std::bitset instead of std::array in KeyboardEvent - Record all printable chars (and make m_printable as std::string) - Add `getPos`, `getOffset` and `getScroll` to MouseEvent - Add `wait` to InputManager to wait event (SDL_WaitEvent and SDL_WaitEventTimeout) - Now `InputManager::update ` will return true if at least one event was handled, otherwise false will be returned - Add internal SDL_Event to prevent creating new one each time `update` or `wait` is called - Update getting mod keys (capslock, numlock) state - Add `KeyboardEvent::capsLock` to check caps lock's state - Move main handler from InputManager::update to InputManager::handle
- Rename isUp and isDown to wasDown and wasUp - Add control of state change - Now wasDown and wasUp will check if state was changed - Add stateChanged func You may check how wasUp and wasDown work by pressing 0, caps lock and LMB in the Test Bench
Contributor
Author
|
I want to get this merged in as soon as possible. It has been on hold for way too long. Do you think this is ready? |
LumpBloom7
changed the title
* Remove old code * [InputEvents] Use constexpr functions instead of macros * Update and simplify keys and buttons naming Use PascalCase (CamelCase) instead of UpperCase. For keys naming was used https://docs.rs/sdl2/0.32.2/sdl2/keyboard/enum.Scancode.html * Add KeyboardEvent::getPrintableRef * Small simplifications * Implement SymRecorder for KeyboardEvent And store only last event char ('\0' if event is not printable) SymRecorder [disabled by default] records all chars from events on demand (after it was activated) to printable user-friendly (means no more '\b' chars and all 'Enter' will be converted to "\r\n") string. 'Backspace' deletes last char.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the ability to handle user input
InputManageris an object which takes all keyboard and mouse input and makes it easy to use.InputDefinitionsis an enum list of all usable keys(keyboard and mouse has one each) named in a simple format.