Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplify controllers #4914

Merged
merged 23 commits into from
Jan 20, 2025
Merged

simplify controllers #4914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
40023d4
start moving towards just using `ShipDeviceIndex::SDLGamepad`
briaguya-ai Jan 19, 2025
672ef86
rename `ShipDeviceIndex` to `ShipDeviceType`
briaguya-ai Jan 19, 2025
05d80f9
all sdl mappings are always `ShipDeviceType::SDLGamepad`
briaguya-ai Jan 19, 2025
855b2bf
create new `physicaldevice` directory where the new stuff can live
briaguya-ai Jan 19, 2025
007f9bb
`ConnectedPhysicalDeviceManager`
briaguya-ai Jan 19, 2025
07e687f
start to not need index mapping manager
briaguya-ai Jan 19, 2025
fd4f7c1
somes fixes and stuff
briaguya-ai Jan 19, 2025
a890d73
remove more shipdeviceindex stuff
briaguya-ai Jan 19, 2025
89613cd
more removing and what not
briaguya-ai Jan 19, 2025
4f4ce6b
axis thresholds
briaguya-ai Jan 19, 2025
e3fd7ed
rename some stuff and remove device icons
briaguya-ai Jan 19, 2025
70c36f3
back to all stuff visible
briaguya-ai Jan 19, 2025
458008f
show connected device names
briaguya-ai Jan 19, 2025
75c6bc1
bring in mouse color from lus input editor window
briaguya-ai Jan 19, 2025
bfad7be
lus
briaguya-ai Jan 19, 2025
dee04b4
remove
briaguya-ai Jan 19, 2025
88d2e46
more stuff
briaguya-ai Jan 19, 2025
619a7e6
more lus
briaguya-ai Jan 19, 2025
6155f59
basic filtering
briaguya-ai Jan 20, 2025
5588be7
update lus
briaguya-ai Jan 20, 2025
10afeac
Merge branch 'develop' into simplify-controllers-slow-and-steady
briaguya-ai Jan 20, 2025
9b89b7a
upstream LUS
briaguya-ai Jan 20, 2025
36a3133
make `Controller_ShouldRumble` make sense
briaguya-ai Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 93 files
+11 −16 src/controller/controldeck/ControlDeck.cpp
+6 −6 src/controller/controldeck/ControlDeck.h
+18 −108 src/controller/controldevice/controller/Controller.cpp
+3 −4 src/controller/controldevice/controller/Controller.h
+9 −8 src/controller/controldevice/controller/ControllerButton.cpp
+3 −3 src/controller/controldevice/controller/ControllerButton.h
+2 −2 src/controller/controldevice/controller/ControllerGyro.cpp
+1 −2 src/controller/controldevice/controller/ControllerGyro.h
+6 −5 src/controller/controldevice/controller/ControllerLED.cpp
+2 −2 src/controller/controldevice/controller/ControllerLED.h
+8 −7 src/controller/controldevice/controller/ControllerRumble.cpp
+3 −3 src/controller/controldevice/controller/ControllerRumble.h
+14 −11 src/controller/controldevice/controller/ControllerStick.cpp
+3 −3 src/controller/controldevice/controller/ControllerStick.h
+3 −2 src/controller/controldevice/controller/mapping/ControllerAxisDirectionMapping.cpp
+1 −1 src/controller/controldevice/controller/mapping/ControllerAxisDirectionMapping.h
+2 −2 src/controller/controldevice/controller/mapping/ControllerButtonMapping.cpp
+1 −1 src/controller/controldevice/controller/mapping/ControllerButtonMapping.h
+3 −2 src/controller/controldevice/controller/mapping/ControllerGyroMapping.cpp
+1 −1 src/controller/controldevice/controller/mapping/ControllerGyroMapping.h
+2 −1 src/controller/controldevice/controller/mapping/ControllerInputMapping.cpp
+1 −1 src/controller/controldevice/controller/mapping/ControllerInputMapping.h
+3 −3 src/controller/controldevice/controller/mapping/ControllerLEDMapping.cpp
+1 −1 src/controller/controldevice/controller/mapping/ControllerLEDMapping.h
+3 −3 src/controller/controldevice/controller/mapping/ControllerMapping.cpp
+4 −5 src/controller/controldevice/controller/mapping/ControllerMapping.h
+2 −2 src/controller/controldevice/controller/mapping/ControllerRumbleMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/ControllerRumbleMapping.h
+17 −56 src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.cpp
+1 −1 src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.h
+34 −91 src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.cpp
+1 −1 src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.h
+9 −43 src/controller/controldevice/controller/mapping/factories/GyroMappingFactory.cpp
+9 −43 src/controller/controldevice/controller/mapping/factories/LEDMappingFactory.cpp
+13 −49 src/controller/controldevice/controller/mapping/factories/RumbleMappingFactory.cpp
+1 −1 src/controller/controldevice/controller/mapping/factories/RumbleMappingFactory.h
+1 −6 src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.cpp
+0 −1 src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAnyMapping.h
+2 −2 src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAxisDirectionMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.cpp
+1 −5 src/controller/controldevice/controller/mapping/mouse/MouseButtonToAnyMapping.cpp
+0 −1 src/controller/controldevice/controller/mapping/mouse/MouseButtonToAnyMapping.h
+2 −2 src/controller/controldevice/controller/mapping/mouse/MouseButtonToAxisDirectionMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/mouse/MouseButtonToButtonMapping.cpp
+1 −5 src/controller/controldevice/controller/mapping/mouse/MouseWheelToAnyMapping.cpp
+0 −1 src/controller/controldevice/controller/mapping/mouse/MouseWheelToAnyMapping.h
+2 −2 src/controller/controldevice/controller/mapping/mouse/MouseWheelToAxisDirectionMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/mouse/MouseWheelToButtonMapping.cpp
+9 −36 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAnyMapping.cpp
+2 −3 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAnyMapping.h
+23 −19 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.h
+26 −31 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h
+6 −163 src/controller/controldevice/controller/mapping/sdl/SDLButtonToAnyMapping.cpp
+2 −7 src/controller/controldevice/controller/mapping/sdl/SDLButtonToAnyMapping.h
+16 −14 src/controller/controldevice/controller/mapping/sdl/SDLButtonToAxisDirectionMapping.cpp
+2 −2 src/controller/controldevice/controller/mapping/sdl/SDLButtonToAxisDirectionMapping.h
+12 −15 src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.cpp
+1 −2 src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.h
+46 −30 src/controller/controldevice/controller/mapping/sdl/SDLGyroMapping.cpp
+2 −4 src/controller/controldevice/controller/mapping/sdl/SDLGyroMapping.h
+14 −21 src/controller/controldevice/controller/mapping/sdl/SDLLEDMapping.cpp
+2 −3 src/controller/controldevice/controller/mapping/sdl/SDLLEDMapping.h
+0 −170 src/controller/controldevice/controller/mapping/sdl/SDLMapping.cpp
+1 −30 src/controller/controldevice/controller/mapping/sdl/SDLMapping.h
+15 −22 src/controller/controldevice/controller/mapping/sdl/SDLRumbleMapping.cpp
+2 −3 src/controller/controldevice/controller/mapping/sdl/SDLRumbleMapping.h
+0 −159 src/controller/deviceindex/ControllerDisconnectedWindow.cpp
+0 −32 src/controller/deviceindex/ControllerDisconnectedWindow.h
+0 −113 src/controller/deviceindex/ControllerReorderingWindow.cpp
+0 −28 src/controller/deviceindex/ControllerReorderingWindow.h
+0 −54 src/controller/deviceindex/ShipDeviceIndex.h
+0 −694 src/controller/deviceindex/ShipDeviceIndexMappingManager.cpp
+0 −52 src/controller/deviceindex/ShipDeviceIndexMappingManager.h
+0 −27 src/controller/deviceindex/ShipDeviceIndexToPhysicalDeviceIndexMapping.cpp
+0 −23 src/controller/deviceindex/ShipDeviceIndexToPhysicalDeviceIndexMapping.h
+0 −80 src/controller/deviceindex/ShipDeviceIndexToSDLDeviceIndexMapping.cpp
+0 −38 src/controller/deviceindex/ShipDeviceIndexToSDLDeviceIndexMapping.h
+73 −0 src/controller/physicaldevice/ConnectedPhysicalDeviceManager.cpp
+32 −0 src/controller/physicaldevice/ConnectedPhysicalDeviceManager.h
+54 −0 src/controller/physicaldevice/GlobalSDLDeviceSettings.cpp
+25 −0 src/controller/physicaldevice/GlobalSDLDeviceSettings.h
+7 −0 src/controller/physicaldevice/PhysicalDeviceType.h
+33 −0 src/controller/physicaldevice/SDLAddRemoveDeviceEventHandler.cpp
+17 −0 src/controller/physicaldevice/SDLAddRemoveDeviceEventHandler.h
+2 −2 src/debug/CrashHandler.cpp
+1 −1 src/resource/type/Texture.cpp
+1 −1 src/window/Window.h
+4 −17 src/window/gui/Gui.cpp
+1 −2 src/window/gui/Gui.h
+84 −387 src/window/gui/InputEditorWindow.cpp
+3 −8 src/window/gui/InputEditorWindow.h
Loading