Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Update godot-rust and egui #32

Merged
merged 6 commits into from
May 26, 2022
Merged

Update godot-rust and egui #32

merged 6 commits into from
May 26, 2022

Conversation

Bromeon
Copy link
Contributor

@Bromeon Bromeon commented May 10, 2022

godot-rust
Updates to master version. Implements new API from godot-rust/gdnative#872.
This API is still in flux despite merged, so we could also skip that commit and wait until an API lands in a released version.

egui
I tried updating egui 0.15 to egui 0.18. For the most part, this worked, however:

  • For the texture-related functionality, I wasn't the one who wrote the original code, and the egui API is wildly different now. Might be good if someone else who knows more about those parts could complete this PR.
  • I left two TODO(bromeon) in the code for places where I wasn't sure, would appreciate a review/correction.

This PR allows edits by maintainers, feel free to push other commits on top.

Bromeon and others added 4 commits May 10, 2022 22:43
@jacobsky
Copy link
Collaborator

I added the changes to get the textures to work. Now that the textures seem to be rendered properly. Unfortunately, I also couldn't quite figure out how to modify the font-definitions.

@jacobsky jacobsky mentioned this pull request May 22, 2022
…xture from only the start of the insertion and not as a sub-rect of the texture.
@jacobsky jacobsky marked this pull request as ready for review May 25, 2022 07:47
Copy link
Collaborator

@jacobsky jacobsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're just about ready to merge everything in. I'm going to go back to pinning only the minor versions and then go ahead and merge this in.

… completed the last couple of TODOs in the PR.

egui_helpers::progress_bar() signature has changed due to egui version bump.
Copy link
Collaborator

@jacobsky jacobsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After finishing all the changes up, texture changes as well as dependencies, etc. I think we are good to merge this. I'll go ahead and merge it in.

@jacobsky jacobsky merged commit 60127a4 into setzer22:gdrust-master May 26, 2022
@Bromeon Bromeon deleted the feature/deps-update branch May 26, 2022 07:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants