Skip to content

Refactor: Refactor systems and behavior#46

Merged
SergioRibera merged 2 commits into
SergioRibera:mainfrom
leomeinel:refactor
Feb 20, 2026
Merged

Refactor: Refactor systems and behavior#46
SergioRibera merged 2 commits into
SergioRibera:mainfrom
leomeinel:refactor

Conversation

@leomeinel

@leomeinel leomeinel commented Feb 12, 2026

Copy link
Copy Markdown
Contributor

This currently includes other rebased commits of mine and therefore is quite cluttered. I did definetly not want to have to remerge this 1/2 times, therefore I just rebased on top of a branch with all PRs applied.

The following commits have to be merged before this can be merged:

Afterwards only the last commit can be merged on its own (I hope).

This is the successor of #40

@leomeinel leomeinel changed the title Refactor Refactor: Refactor most and use rust 2024 Feb 12, 2026
@leomeinel

Copy link
Copy Markdown
Contributor Author

This also builds if used as an external library here. I did not yet make a release yet using this branch as a dependency, but if I remember I'll update this with a link to the android release.

@leomeinel

This comment was marked as resolved.

@SergioRibera

Copy link
Copy Markdown
Owner

@leomeinel First of all, thank you very much for separating it into multiple PRs 🙌🏼, now it is very easy to review. Second, in what order should I merge the PRs? 😅

@leomeinel

leomeinel commented Feb 14, 2026

Copy link
Copy Markdown
Contributor Author

@leomeinel First of all, thank you very much for separating it into multiple PRs 🙌🏼, now it is very easy to review. Second, in what order should I merge the PRs? 😅

Of course, I hesitated at first but I also think that this is better.

I'm pretty sure that it is impossible to avoid conflicts, but I'd recommend merging in this order (fixes first):

  1. Fix: Expose VirtualJoystickInteractionArea #43
  2. Fix: Properly scale JoystickDynamic/Fixed Rects #45
  3. Examples: Migrate Android examples to cargo-ndk and update to Bevy 0.16 #44
  4. Update to Bevy 0.17 #41 (Will have merge conflicts*) -> Create release for 0.17
  5. Update to Bevy 0.18 #42
  6. This PR after it is ready for review. I'll have to remove some commits before it can be merged on top of the others*.

*I'll resolve the merge conflicts asap after the other branches have been merged, just leave a comment on the conflicting PR.

@SergioRibera

Copy link
Copy Markdown
Owner

Thank you so much, really. For now, I've merged the ones that are easier to review. When I get home, I'll calmly review the remaining ones

@leomeinel

Copy link
Copy Markdown
Contributor Author

Thank you so much, really. For now, I've merged the ones that are easier to review. When I get home, I'll calmly review the remaining ones

Perfect, that is awesome! Thank you very much for this crate and the reviews :)

@leomeinel leomeinel changed the title Refactor: Refactor most and use rust 2024 Refactor: Refactor systems and behavior Feb 15, 2026
@leomeinel leomeinel marked this pull request as ready for review February 19, 2026 21:51
@leomeinel

This comment was marked as resolved.

@SergioRibera SergioRibera force-pushed the main branch 2 times, most recently from caec19e to d9d2514 Compare February 19, 2026 22:05
@SergioRibera

Copy link
Copy Markdown
Owner

The update for Bevy 0.17 is already merged; we just need you to resolve the conflicts in 0.18 and then we'll merge the last two. Thank you so much!

@leomeinel

Copy link
Copy Markdown
Contributor Author

The update for Bevy 0.17 is already merged; we just need you to resolve the conflicts in 0.18 and then we'll merge the last two. Thank you so much!

Perfect, I'm very very happy about all the changes having been approved. I'm pretty sure that all conflicts in #42 and here are resolved correctly now :)

We have also switched to Rust edition 2024.

This dramatically improves readability by removing indents and simplifying variable assignments etc.
I've also added docs to code that I've touched.
@leomeinel

Copy link
Copy Markdown
Contributor Author

The last force push was just to rebase on top of the current main without any changes.

@SergioRibera SergioRibera merged commit bad9e3f into SergioRibera:main Feb 20, 2026
2 checks passed
@leomeinel

Copy link
Copy Markdown
Contributor Author

Awesome, thanks for merging all of this and all the work you have put into the reviews :)

@leomeinel leomeinel deleted the refactor branch February 20, 2026 19:00
@SergioRibera

Copy link
Copy Markdown
Owner

Hey @leomeinel they're finally all merged. Thank you so much for your help 🙌🏼 The project was really behind schedule. Thanks, friend, for all your trouble, and sorry for the delay 😶‍🌫️

@leomeinel

Copy link
Copy Markdown
Contributor Author

Hey @leomeinel they're finally all merged. Thank you so much for your help 🙌🏼 The project was really behind schedule. Thanks, friend, for all your trouble, and sorry for the delay 😶‍🌫️

You're welcome. I was really happy to have found this crate and it saved me a lot of work, therefore it was only appropriate to contribute 🥇

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants