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

Jump to bottom

Add gamepad rumble support to bevy_input #8398

Merged
merged 57 commits into from
Apr 24, 2023
Merged

Add gamepad rumble support to bevy_input #8398

merged 57 commits into from
Apr 24, 2023

Commits on Feb 5, 2022

  1. Add rumble support to bevy_gilrs 

    This adds the `RumbleRequest` event and a system to read them and rumble
controllers accordingly.

It gives users two ways of controlling controller rumble:
1. A very primitive API with `RumbleIntensity` that is easy to
   understand and use.
2. A direct access to the girls `ff::Effect` system for complete
   fine-grained control over how the gamepad rumbles.
    @nicopap
    nicopap committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    0707bdc View commit details
    Browse the repository at this point in the history

  2. Rework error handling in rumble system

    @nicopap
    nicopap committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    8bfbfda View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Merge remote-tracking branch 'origin/main' into rumble 

    Conflicts:
	crates/bevy_gilrs/Cargo.toml
	crates/bevy_gilrs/src/lib.rs
	crates/bevy_gilrs/src/rumble.rs
	examples/README.md
	examples/input/gamepad_rumble.rs
    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    1628d42 View commit details
    Browse the repository at this point in the history

  2. Suggestions from code-review 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @johanhelsing @alice-i-cecile
    johanhelsing and alice-i-cecile committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    a2f5fd9 View commit details
    Browse the repository at this point in the history

  3. Remove gilrs types and re-exports from public API

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    6ca8654 View commit details
    Browse the repository at this point in the history

  4. Fix typo

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    34e6420 View commit details
    Browse the repository at this point in the history

  5. Remove gilrs effect from rumble request

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    08e5690 View commit details
    Browse the repository at this point in the history

  6. Move gamepad rumble request to bevy_input

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    7787e6a View commit details
    Browse the repository at this point in the history

  7. Rename RumbleRequest to GamepadRumbleRequest

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    55985d7 View commit details
    Browse the repository at this point in the history

  8. Move rumble above tests

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    0b5615f View commit details
    Browse the repository at this point in the history

  9. refactor: Use retain instead of temporary Vec

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    47dd5b3 View commit details
    Browse the repository at this point in the history

  10. refactor: Remove pointless is_empty check

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    dc75f63 View commit details
    Browse the repository at this point in the history

  11. style: Use same logging style as rest of Bevy

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    d16c375 View commit details
    Browse the repository at this point in the history

  12. Add gamepad rumble example to Cargo.toml 

    non-wasm, for now
    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    bac6ddd View commit details
    Browse the repository at this point in the history

  13. Add missing semis

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    c36af78 View commit details
    Browse the repository at this point in the history

  14. docs: Finish renaming

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    254be0f View commit details
    Browse the repository at this point in the history

  15. fixup: fix example compile error

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    7fed666 View commit details
    Browse the repository at this point in the history

  16. fixup: Remove accidental code in docs

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    e54e6ef View commit details
    Browse the repository at this point in the history

  17. chore: build templated pages

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    d092d2a View commit details
    Browse the repository at this point in the history

  18. Remove GamepadRumbleRequest::stop

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    90079b9 View commit details
    Browse the repository at this point in the history

  19. Expose strong and weak magnitudes, stop

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    1f4e744 View commit details
    Browse the repository at this point in the history

  20. Document weak and strong motor types

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    23668eb View commit details
    Browse the repository at this point in the history

  21. Add docs

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    fbc5283 View commit details
    Browse the repository at this point in the history

  22. Add WEAK_MAX and STRONG_MAX rumble constants

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    e26fd82 View commit details
    Browse the repository at this point in the history

  23. Document additive behavior

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    ef0e248 View commit details
    Browse the repository at this point in the history

  24. Fix docs example

    @johanhelsing
    johanhelsing committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    fc92a5b View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Make GamepadRumbleRequest an enum

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    d455a2b View commit details
    Browse the repository at this point in the history

  2. Interrupt rumble with east button 

    This is more commonly used for "cancel" type actions.
    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    307eadc View commit details
    Browse the repository at this point in the history

  3. Make rumble duration a Duration

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    380764a View commit details
    Browse the repository at this point in the history

  4. Add GamepadRumbleIntensity::weak and strong constructors

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    71a09b6 View commit details
    Browse the repository at this point in the history

  5. Fix clippy lints

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    9a0a616 View commit details
    Browse the repository at this point in the history

  6. fixup: Duration in doc test

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    714f2af View commit details
    Browse the repository at this point in the history

  7. fixup: gamepad_rumble example compile error

    @johanhelsing
    johanhelsing committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    643b9a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @johanhelsing @alice-i-cecile
    johanhelsing and alice-i-cecile committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    8d0ab03 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Add GamepadRumbleRequest::gamepad

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    52c7f4f View commit details
    Browse the repository at this point in the history

  2. Fix issues with rumble durations 

    Rumbling was closely coupled with frame rate, meaning if you dropped
frames, you would get longer or shorter rumbles. Also, using an f32
would probably cause issues after an hour or two of gameplay.
    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    fc21d2f View commit details
    Browse the repository at this point in the history

  3. Use raw_elapsed

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    677fd91 View commit details
    Browse the repository at this point in the history

  4. Document internal bevy_gilrs API

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    dcf8e2e View commit details
    Browse the repository at this point in the history

  5. Suffix weak and strong intensities with motor

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    58825df View commit details
    Browse the repository at this point in the history

  6. Clamp intensities to 0 to 1 range

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    f9748db View commit details
    Browse the repository at this point in the history

  7. Add system label for rumble system

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    ecd61ca View commit details
    Browse the repository at this point in the history

  8. Use this_error for RumbleError

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    e07a55c View commit details
    Browse the repository at this point in the history

  9. Upgrade some gilrs rumble errors to warnings

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    d83959a View commit details
    Browse the repository at this point in the history

  10. Add aliases for GamepadRumbleRequest

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    388ef33 View commit details
    Browse the repository at this point in the history

  11. Change example button mapping 

    Not everybody has the same expectations about what button on a gamepad
should cancel.
    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    836218a View commit details
    Browse the repository at this point in the history

  12. Update crates/bevy_input/src/gamepad.rs 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @johanhelsing @alice-i-cecile
    johanhelsing and alice-i-cecile committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    fa5ceb0 View commit details
    Browse the repository at this point in the history

  13. refactor: Use values_mut

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    f5ed292 View commit details
    Browse the repository at this point in the history

  14. rename RumblesManager to RunningRumbleEffects

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    7978fae View commit details
    Browse the repository at this point in the history

  15. fix docs issue

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    438051f View commit details
    Browse the repository at this point in the history

  16. Add test for bevy to gilrs magnitude conversion

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    f250fb8 View commit details
    Browse the repository at this point in the history

  17. Also test negative bevy magnitudes

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    4261821 View commit details
    Browse the repository at this point in the history

  18. Update crates/bevy_gilrs/src/lib.rs 

    Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
    @johanhelsing @nicopap
    johanhelsing and nicopap committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    103fceb View commit details
    Browse the repository at this point in the history

  19. remove clamping in constructors

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    1829fc7 View commit details
    Browse the repository at this point in the history

  20. Make constructors const

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    a87e486 View commit details
    Browse the repository at this point in the history

  21. Re-order example gamepad button order to NESW

    @johanhelsing
    johanhelsing committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    673facd View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. Add doc alias 

    Co-authored-by: Bruce Reif (Buswolley) <bruce.reif@dynata.com>
    @alice-i-cecile @B-Reif
    alice-i-cecile and B-Reif committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    990a262 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Remove unused dependency, per CI

    @alice-i-cecile
    alice-i-cecile committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    98b26f0 View commit details
    Browse the repository at this point in the history