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.

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

Upgrade to egui v0.25 and macroquad v0.4.4 #39

Merged
merged 2 commits into from
Feb 3, 2024

Conversation

caspark
Copy link
Contributor

@caspark caspark commented Jan 31, 2024

This PR upgrades to egui v0.25 and updates macroquad to v0.4.4, which brings both dependencies up to date.

(And also makes a minor stylistic change: rewriting struct Egui(EguiMq, usize) as struct Egui { egui_mq: EguiMq, input_subscriber_id: usize }, because initially I was wondering what that usize was for, so now next time I look at this code I won't have to wonder. If you don't like this, feel free to undo it.)

It currently depends on my fork of egui-miniquad, which itself has been patched to upgrade egui to 0.25.0. I've raised not-fl3/egui-miniquad#65 to get these changes integrated into egui-miniquad proper, but I don't know when/if that'll get merged so here I've left a reference to my egui-miniquad fork in the Cargo.toml.

To be honest, I don't expect you to merge this PR until (unless?) my egui-miniquad PR is merged - but having this PR open will at least allow others to see that there is a fork which has the latest egui, which might save someone doing the same work I just did. Folks who don't want to wait can reference my fork directly in their Cargo.toml:

egui-macroquad = { git = 'https://github.com/caspark/egui-macroquad.git', rev = "727670e220fe1d2ce0e6f9f1ba903b4a3a71daca" }

Now zooming and pixels-per-point is handled correctly
Cargo.toml Show resolved Hide resolved
@optozorax optozorax merged commit 62f1a3e into optozorax:master Feb 3, 2024
@optozorax
Copy link
Owner

Thank you! Sorry for such delay of the new version

@optozorax
Copy link
Owner

Hmm, something is broken.

Old version:

изображение


New version:

изображение

Investigating

@optozorax optozorax mentioned this pull request Feb 3, 2024
@optozorax
Copy link
Owner

idk, it works in my project without problems, fix for it: 81d6a42#diff-b47ebf1eb6911d4469d1d1f150557cf832ca5cda154c5c0b7a50f14e43431bb5R57

Also, I can't publish because git links on crates.io is forbidden. Can you please publish your fork on crates.io (like with name egui-miniquad2)

@caspark
Copy link
Contributor Author

caspark commented Feb 4, 2024

@not-fl3 said over in not-fl3/egui-miniquad#65 :

Give me about a week, I am about to publish miniquad-0.4 without alpha.

(yes, I was about to publish it since forever, but now I really am!)

So I am personally happy to wait for that @optozorax - if it doesn't eventuate then I can publish my fork (or you're welcome to do so).

@jbracker
Copy link

jbracker commented Aug 17, 2024

Is there any progress on this issue? Currently egui already has version 0.28.1 and macroquad has version 0.4.12. I would also be interested in using more current versions.

Is everything waiting for this: not-fl3/egui-miniquad#72 ?

@caspark
Copy link
Contributor Author

caspark commented Aug 18, 2024

FWIW, since egui-miniquad and egui-macroquad are both only a couple hundred lines each, in the end I just vendored (~copy pasted, preserving licenses) them into my project. Miniquad/Macroquad are great libraries but their author appears to be stretched a bit thin, so this way I can just put in the time myself if I need a new feature from a new egui release.

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.

3 participants