bloeys/nmage
1
0
Fork 0
mirror of https://github.com/bloeys/nmage.git synced 2025-12-29 13:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Captured/uncaptured mode in input package+comments

Browse Source
This commit is contained in:
bloeys
2024-04-20 11:53:06 +04:00
parent a131e1b52d
commit 4d8ccdaf56
2 changed files with 178 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/engine.go
View File

@ -33,25 +33,12 @@ type Window struct {
func (w *Window) handleInputs() {
input.EventLoopStart()
imIo := imgui.CurrentIO()
imguiCaptureMouse := imIo.WantCaptureMouse()
imguiCaptureKeyboard := imIo.WantCaptureKeyboard()
// These two are to fix a bug where state isn't cleared
// even after imgui captures the keyboard/mouse.
//
// For example, if player is moving due to key held and then imgui captures the keyboard,
// the player keeps moving even when the key is no longer pressed because the input system never
// receives the key up event.
if imguiCaptureMouse {
input.ClearMouseState()
}
if imguiCaptureKeyboard {
input.ClearKeyboardState()
}
input.EventLoopStart(imguiCaptureMouse, imguiCaptureKeyboard)
for event := sdl.PollEvent(); event != nil; event = sdl.PollEvent() {
@ -65,18 +52,12 @@ func (w *Window) handleInputs() {
case *sdl.MouseWheelEvent:
if !imguiCaptureMouse {
input.HandleMouseWheelEvent(e)
}
input.HandleMouseWheelEvent(e)
imIo.AddMouseWheelDelta(float32(e.X), float32(e.Y))
case *sdl.KeyboardEvent:
if !imguiCaptureKeyboard {
input.HandleKeyboardEvent(e)
}
input.HandleKeyboardEvent(e)
imIo.AddKeyEvent(nmageimgui.SdlScancodeToImGuiKey(e.Keysym.Scancode), e.Type == sdl.KEYDOWN)
// Send modifier key updates to imgui
@ -101,10 +82,7 @@ func (w *Window) handleInputs() {
case *sdl.MouseButtonEvent:
if !imguiCaptureMouse {
input.HandleMouseBtnEvent(e)
}
input.HandleMouseBtnEvent(e)
isPressed := e.State == sdl.PRESSED
if e.Button == sdl.BUTTON_LEFT {
@ -117,9 +95,7 @@ func (w *Window) handleInputs() {
case *sdl.MouseMotionEvent:
if !imguiCaptureMouse {
input.HandleMouseMotionEvent(e)
}
input.HandleMouseMotionEvent(e)
case *sdl.WindowEvent: