-
-
Notifications
You must be signed in to change notification settings - Fork 306
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
Merge nannou_egui
into this repo
#854
Merged
mitchmindtree
merged 78 commits into
nannou-org:master
from
mitchmindtree:merge-nannou_egui
May 15, 2022
Merged
Merge nannou_egui
into this repo
#854
mitchmindtree
merged 78 commits into
nannou-org:master
from
mitchmindtree:merge-nannou_egui
May 15, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Create LICENSE
Also updates the methods that involve encoding the render pass to propagate the egui_wgpu_backend `Result`. TODO: - [ ] Switch from nannou git patch to new version once published.
Also updates the `do_frame_with_epi_frame` method to return the `egui::Output` in order to properly handle animation requests and other kinds of output events.
Update to nannou 0.18.1, wgpu 0.11, egui 0.15, egui_wgpu_backend 0.14.
Includes recent updates for 0.18.1, wgpu 0.11, egui 0.15
Publish version 0.5.0
enable access to create and update TextureId's
Originally these used `nannou_conrod` to display text as these examples were created before nannou landed native support for drawing text. Now that we're abandoning `conrod` in favour of `egui` more generally, it seems a good time to remove the unnecessary usage here.
egui already has a variety of convenience color edit functions. This one is specifically useful to the example, so it was moved there.
mitchmindtree
force-pushed
the
merge-nannou_egui
branch
from
May 15, 2022 11:30
6b067d4
to
80d0233
Compare
mitchmindtree
added a commit
to mitchmindtree/nannou_egui
that referenced
this pull request
May 15, 2022
Here's the PR that merges this repo into the nannou repo: nannou-org/nannou#854
mitchmindtree
added a commit
to mitchmindtree/nannou
that referenced
this pull request
May 15, 2022
Both crates have been deprecated in favour of `nannou_egui` and have moved into a separate repository: https://github.com/nannou-org/nannou_conrod See the following issue for some context on the motivations behind switching to nannou_egui: PistonDevelopers/conrod#1454 See the following PR for the merge of `nannou_egui` into the main nannou repository: nannou-org#854 Conrod-specific examples have been moved to the separate `nannou_conrod` repo, while other examples that used `nannou_conrod` have been transitioned use `nannou_egui`.
This was referenced May 15, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We've been working towards dropping conrod interop support in favour of egui for a while. You can read more about the reasoning behind this approach here:
PistonDevelopers/conrod#1454
cc @AlexEne we talked about merging this a while back, but just thought I'd give you a heads up it's finally happening :) I'll open a PR at the original repo that updates the README to point here instead.
I've included the nannou_egui crates by merging in the entire repository and its history so that we don't lose any commit info.
Following this, the plan is to remove
nannou_conrod
andnannou_timeline
now that they've been deprecated and moved to their own repo. Then, update wgpu and egui to the latest versions.