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

Robust State Matching (formerly Sub state support) #9957

Closed
wants to merge 130 commits into from
Closed

Robust State Matching (formerly Sub state support) #9957

wants to merge 130 commits into from

Commits on Sep 28, 2023

  1. initial work

    @lee-orr
    lee-orr committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    fe8ea3f View commit details
    Browse the repository at this point in the history

  2. Remove States::variants and its associated type

    @ItsDoot
    ItsDoot committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    2fe866b View commit details
    Browse the repository at this point in the history

  3. Remove enums-only restriction on States derive

    @ItsDoot
    ItsDoot committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4a3802c View commit details
    Browse the repository at this point in the history

  4. Make sure TestState::B gets used

    @ItsDoot
    ItsDoot committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    68a5aba View commit details
    Browse the repository at this point in the history

  5. prepare app 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4a691d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. got it working! 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    307f7bb View commit details
    Browse the repository at this point in the history

  2. fixing clippy 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    cdc424d View commit details
    Browse the repository at this point in the history

  3. documenting example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    0650131 View commit details
    Browse the repository at this point in the history

  4. document and add macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    b892f7d View commit details
    Browse the repository at this point in the history

  5. adjust in__state, apply_state_transition and run_enter_schedule so th… 

    …ey treat the State resource as optional, and fail gracefully if it does not exist.

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    c128beb View commit details
    Browse the repository at this point in the history

  6. add sub-states 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    2f7e51e View commit details
    Browse the repository at this point in the history

  7. re-organize state.rs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    4ffc9d2 View commit details
    Browse the repository at this point in the history

  8. add stuff to prelude 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    00bcaa6 View commit details
    Browse the repository at this point in the history

  9. get all necessary portions into prelude, remove bevy_internal 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    dd91474 View commit details
    Browse the repository at this point in the history

  10. fix backticks 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    6768e0e View commit details
    Browse the repository at this point in the history

  11. add backticks 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    9474c18 View commit details
    Browse the repository at this point in the history

  12. fix additional ci lints 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    29f9e79 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    be263de View commit details
    Browse the repository at this point in the history

  14. call OnStateTransition 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    acf0dae View commit details
    Browse the repository at this point in the history

  15. Merge branch 'feat/simplify-states' of https://github.com/ItsDoot/bevy … 

    …into sub-state-support
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    59cbda9 View commit details
    Browse the repository at this point in the history

  16. fix typo SetupTransitionScheduleLables to SetupTransitionScheduleLabels 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    72cbbc6 View commit details
    Browse the repository at this point in the history

  17. Remove function fariants of matcher functions in SetupTransitionSched… 

    …uleLabels

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    d49b5dc View commit details
    Browse the repository at this point in the history

  18. clippy 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f2cc095 View commit details
    Browse the repository at this point in the history

  19. remove out of date full feature from sysn 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    66abc5e View commit details
    Browse the repository at this point in the history

  20. fix docs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    8bec2f8 View commit details
    Browse the repository at this point in the history

  21. re-name next state variants 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    2c88a21 View commit details
    Browse the repository at this point in the history

  22. more renaming 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    7425c33 View commit details
    Browse the repository at this point in the history

  23. removed debug print in examples 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    b46b68f View commit details
    Browse the repository at this point in the history

  24. Update state.rs

    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    394fa99 View commit details
    Browse the repository at this point in the history

  25. adjust basic state example, rename conditional state to sub state 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    960cae7 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'sub-state-support' of https://github.com/lee-orr/bevy i… 

    …nto sub-state-support
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    4c10d55 View commit details
    Browse the repository at this point in the history

  27. fix typos in macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    fc2d802 View commit details
    Browse the repository at this point in the history

  28. Advanced states example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    3cd0322 View commit details
    Browse the repository at this point in the history

  29. add advance state example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    04a7c57 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Reset cargo toml to avoid re-formatting 

    This reverts commit 04a7c57.
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    d6d6aea View commit details
    Browse the repository at this point in the history

  2. Update Cargo.toml

    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    d8a2ed9 View commit details
    Browse the repository at this point in the history

  3. rename advance state example to advanced state 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    35532ac View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    b533c83 View commit details
    Browse the repository at this point in the history

  5. make macros more egronomic - remove need to re-state type 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    0724c0a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    131c197 View commit details
    Browse the repository at this point in the history

  7. use eq instead of == for PathSegment (prevent miri error) 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    ed0be55 View commit details
    Browse the repository at this point in the history

  8. adjust syn to include extra-traits 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    ca28c0d View commit details
    Browse the repository at this point in the history

  9. dependency adjustment 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    199e363 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Update examples/ecs/advanced_state.rs 

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

  2. Update crates/bevy_ecs/src/schedule/state.rs 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @lee-orr @alice-i-cecile
    lee-orr and alice-i-cecile committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9121bdc View commit details
    Browse the repository at this point in the history

  3. Update examples/ecs/advanced_state.rs 

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

  4. Update examples/ecs/advanced_state.rs 

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

  5. remove allow dead code 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    089cd4d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'sub-state-support' of https://github.com/lee-orr/bevy i… 

    …nto sub-state-support
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    d27beae View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    935dee0 View commit details
    Browse the repository at this point in the history

  8. change MovementState::Invert to MovemenetState::Inverted 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    ca312ce View commit details
    Browse the repository at this point in the history

  9. use default for schedule labels with phantom data 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    e3a286f View commit details
    Browse the repository at this point in the history

  10. Remove StateMatcherFunction struct - move to using fn(&S) -> bool d… 

    …irectly

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    83019d5 View commit details
    Browse the repository at this point in the history

  11. remove arc from NextState 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    7161b02 View commit details
    Browse the repository at this point in the history

  12. use optional resources for state handling 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    2f85085 View commit details
    Browse the repository at this point in the history

  13. add simple sub states 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    cb8bc32 View commit details
    Browse the repository at this point in the history

  14. update example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    1d24c58 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'simple_sub_states' into sub-state-support 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    1eb6c90 View commit details
    Browse the repository at this point in the history

  16. docs improvements 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    00dcbe6 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'simple_sub_states' into sub-state-support 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    b0c6cce View commit details
    Browse the repository at this point in the history

  18. fix doc compilation 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    fe56e91 View commit details
    Browse the repository at this point in the history

  19. remove link 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    249321f View commit details
    Browse the repository at this point in the history

  20. Merge branch 'simple_sub_states' into sub-state-support

    @lee-orr
    lee-orr committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    00cd494 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. remove conditional sub states 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    9ce4545 View commit details
    Browse the repository at this point in the history

  2. make sure all PreviousState methods are private 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    220f428 View commit details
    Browse the repository at this point in the history

  3. fix imports 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    96d5357 View commit details
    Browse the repository at this point in the history

  4. remove advanced state, get state compiling 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    1a08184 View commit details
    Browse the repository at this point in the history

  5. Simplify IntoConditionalScheduleLabel, add default impl for `(S: Sche… 

    …duleLabel, C: Condition>)`

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    bff3047 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. separate in_state & state_matches conditions, remove `state_exist… 

    …s_and_equals` since it is now identical to i`n_state`

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    f23df0b View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. adjusted macros/structure 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    bcb1be1 View commit details
    Browse the repository at this point in the history

  2. add closure support for matching macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    15889fd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    e43e1fd View commit details
    Browse the repository at this point in the history

  4. lint fixes 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    23448db View commit details
    Browse the repository at this point in the history

  5. fix docs ci 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    ba6a49d View commit details
    Browse the repository at this point in the history

  6. remove every macro variants, set up for vector macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    af5fe15 View commit details
    Browse the repository at this point in the history

  7. support move closures 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    9e9d365 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. add multiple matchers in macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f699f8d View commit details
    Browse the repository at this point in the history

  2. add state matches 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    d8e969b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    1c96418 View commit details
    Browse the repository at this point in the history

  4. simplify macro generation 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    eee770d View commit details
    Browse the repository at this point in the history

  5. clippy + docs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f3ff047 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    6e6944d View commit details
    Browse the repository at this point in the history

  7. adjust comment 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    63d17e2 View commit details
    Browse the repository at this point in the history

  8. add on_transition! macro 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    b20b73d View commit details
    Browse the repository at this point in the history

  9. add enum state matchers 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    1124126 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. don't use OnEnter/OnExit/in_state in macros 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    3c6afb1 View commit details
    Browse the repository at this point in the history

  2. better macro docs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    7df432b View commit details
    Browse the repository at this point in the history

  3. better macro docs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    2ff3e5f View commit details
    Browse the repository at this point in the history

  4. clippy 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    6850905 View commit details
    Browse the repository at this point in the history

  5. remove condition labels 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    8f1aaef View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    a16dc38 View commit details
    Browse the repository at this point in the history

  7. revert all changes to app.rs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    074d474 View commit details
    Browse the repository at this point in the history

  8. revert set to main 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    85fdf63 View commit details
    Browse the repository at this point in the history

  9. get example to compile again and remove println 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    55d8184 View commit details
    Browse the repository at this point in the history

  10. renames for ergonomics: 

    - in `States`: `on_state_entry_schedule` -> `entering`, `on_state_exit_schedule` -> `exiting`, `on_state_transition_schedule` -> `transitioning`
- macros: `on_enter!` -> `entering!`, `on_exit!` -> `exiting!`, `on_transition!` -> `transitioning!`

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    c7bdc86 View commit details
    Browse the repository at this point in the history

  11. add common conditions 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    a5a5afa View commit details
    Browse the repository at this point in the history

  12. remove unused imports from state example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    348bf63 View commit details
    Browse the repository at this point in the history

  13. switch out some system labeling 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    305dc70 View commit details
    Browse the repository at this point in the history

  14. remove unused import 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    a7edad3 View commit details
    Browse the repository at this point in the history

  15. simple state example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    c360744 View commit details
    Browse the repository at this point in the history

  16. add Entering/Exiting/Transitioning to prelude 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    34bca2d View commit details
    Browse the repository at this point in the history

  17. small fixes to closures in the macros, nested_state example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    3624c5d View commit details
    Browse the repository at this point in the history

  18. add struct state example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    d4a5032 View commit details
    Browse the repository at this point in the history

  19. add state transitions 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    5f7f741 View commit details
    Browse the repository at this point in the history

  20. add custom state matcher example 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    ecbc08d View commit details
    Browse the repository at this point in the history

  21. update examples 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    2ebac56 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    7b7fc4e View commit details
    Browse the repository at this point in the history

  23. remove unneeded marker structs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    de265a4 View commit details
    Browse the repository at this point in the history

  24. improve docs 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    4aaf549 View commit details
    Browse the repository at this point in the history

  25. rustfmt 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    2e5add4 View commit details
    Browse the repository at this point in the history

  26. lints 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    10be647 View commit details
    Browse the repository at this point in the history

  27. fix doc tests 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    0bea620 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. move comment to follow style guide 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    bbc5048 View commit details
    Browse the repository at this point in the history

  2. move state matching to it's own file 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    7cb3e73 View commit details
    Browse the repository at this point in the history

  3. add tests for auto-implemented state matchers 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    5d0be9c View commit details
    Browse the repository at this point in the history

  4. add macro tests 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    c94cb6f View commit details
    Browse the repository at this point in the history

  5. adjust multi-pattern macro test to include a closure 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    4b59f9a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    697845a View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    6116cea View commit details
    Browse the repository at this point in the history

  2. remove custom state matchers 

    - remove the derive option
- add a sealed trait and better markers to prevent manually implementing state matchers
- replace the `custom state matchers` example with a `black box states` example

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    9e87a95 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    5d9cd9a View commit details
    Browse the repository at this point in the history

  4. fix NextState reflect - ignore dyn Fn 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    e448896 View commit details
    Browse the repository at this point in the history

  5. make StateMatcher private 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    ec2ed84 View commit details
    Browse the repository at this point in the history

  6. added documentation to what counts as matchers 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    1d79600 View commit details
    Browse the repository at this point in the history

  7. Fix crate-private trait in public interface error 

    while keeping `StateMatcher`'s internal implementation hidden.

- Renamed `StateMatcher` to `InternalStateMatcher` - kept as a `pub(crate)`
- Added a new `StateMatcher` trait that is public, and both requires and auto implemented for `InternalStateMatcher`'s
- Replace all public uses of `InternalStateMatcher` with `StateMatcher`

Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    91916a5 View commit details
    Browse the repository at this point in the history

  8. move InternalStateMatcher to sealed module, make it public 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    fd3564c View commit details
    Browse the repository at this point in the history

  9. remove private bounds lint 

    Signed-off-by: lee-orr <lee-orr@users.noreply.github.com>
    @lee-orr
    lee-orr committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    cf546bc View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    57dac9b View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    a264d06 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/bevyengine/bevy into sub-st… 

    …ate-support
    @lee-orr
    lee-orr committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    f72b7ef View commit details
    Browse the repository at this point in the history