chore(): Bevy 0.11 migration #45

kaosat-dev · 2023-07-17T21:42:11Z

Hi !
Started working on the migration to Bevy 0.11 , not quite done yet :)

…lly derived within the Reflect derive macro

hafiidz · 2023-07-18T03:12:37Z

Looking forward to this. Not sure how to help, I made an attempt to do the same recently but stuck at a few errors that I couldn't really understand.

Sharing the link here for "reference" https://github.com/hafiidz/bevy_proto/tree/upgrade_bevy_0_11

MrGVSV · 2023-07-18T05:04:46Z

Thanks for helping out! Could you put this in draft mode until you’re ready for review?

kaosat-dev · 2023-07-18T09:04:03Z

Thanks for helping out! Could you put this in draft mode until you’re ready for review?

Sure ! Sorry about that, it is now in draft mode

kaosat-dev · 2023-07-18T09:05:21Z

Looking forward to this. Not sure how to help, I made an attempt to do the same recently but stuck at a few errors that I couldn't really understand.

Sharing the link here for "reference" https://github.com/hafiidz/bevy_proto/tree/upgrade_bevy_0_11

Wow , you have already done pretty much all the work !
Perhaps it would make more sense that you create a PR and we can help to solve the remaining issues ? Or I can continue with this PR

hafiidz · 2023-07-19T00:06:33Z

I think we can just continue here. When I did mine it wasn't with the idea to publish it, so I didn't pay attention to be sticking to proper formatting. Just doing things as I learn from error reports. Maybe you can cherry pick changes as necessary. I'm not sure how to add changes here though. Should I send a PR to your branch separately? Based on brief Google search, it seems to show only the PR requester and repo owner can make changes here.

MrGVSV · 2023-07-19T01:20:38Z

Should I send a PR to your branch separately? Based on brief Google search, it seems to show only the PR requester and repo owner can make changes here.

Yeah generally in these cases you'd make a PR to their branch.

I'll also try to help out with the migration if I find time this week.

… improvements Chore: Migration 0.10 to 0.11 1. Flatten UI Style properties that use Size + remove Size 2. MeasureFunc improvements Need second eye especially on line 92 to 111 (pub struct ContentSize .... )

hafiidz · 2023-07-20T04:35:12Z

Added a PR kaosat-dev#2 to @kaosat-dev v0.11 draft branch

bevyengine/bevy#7795

Chore: Bevy v0.10 to v0.11 cherry picked changes

kaosat-dev · 2023-07-21T22:29:23Z

Added a PR kaosat-dev#2 to @kaosat-dev v0.11 draft branch

Thanks a lot ! Went over the changes, and it looks good and matches the needed changes outlined in the migration guide !

kaosat-dev · 2023-07-21T22:30:38Z

@MrGVSV & @hafiidz Sorry for the delay, I was swamped this week, I will finalize this PR tomorrow :)

hafiidz · 2023-07-22T02:59:41Z

@MrGVSV & @hafiidz Sorry for the delay, I was swamped this week, I will finalize this PR tomorrow :)

No worries, all good. Take your time, it's volunteer work anyway. I am just taking opportunity to use Rust in actual project and contributing back to the community since I love using this bevy add on in my personal project.

MrGVSV · 2023-07-22T07:35:34Z

@MrGVSV & @hafiidz Sorry for the delay, I was swamped this week, I will finalize this PR tomorrow :)

No worries, all good. Take your time, it's volunteer work anyway. I am just taking opportunity to use Rust in actual project and contributing back to the community since I love using this bevy add on in my personal project.

Agreed, don't feel rushed to do anything. Like @hafiidz said, this is all on a volunteer basis. You both are already doing more than enough by even taking the time to help out, so thank you! 😄

kaosat-dev · 2023-07-22T21:14:46Z

@MrGVSV & @hafiidz thanks for the kind words, also glad to help !
There are a few remaining issues (all within bevy_impls) that I have not been able to figure out :
conflicting implementations of trait 'FromReflect' for type 'EnvironmentMapLightInput' (and similarly for a few others), it seems to be macro related, but even after a bit of googling, I have not found a way to resolve those issues.
(I am guessing these where the ones you mentionned @hafiidz ?).

MrGVSV · 2023-07-22T22:33:43Z

@MrGVSV & @hafiidz thanks for the kind words, also glad to help ! There are a few remaining issues (all within bevy_impls) that I have not been able to figure out : conflicting implementations of trait 'FromReflect' for type 'EnvironmentMapLightInput' (and similarly for a few others), it seems to be macro related, but even after a bit of googling, I have not found a way to resolve those issues. (I am guessing these where the ones you mentionned @hafiidz ?).

No worries, taking a look now!

MrGVSV · 2023-07-22T23:17:12Z

Okay here's a pretty major problem: generic types that require an input.

Currently, the macro will generate an input that looks like this:

#[derive(Schematic)]
struct MyStruct<T, U: Asset> {
  foo: T,
  #[schematic(asset)]
  bar: Handle<U>
}

// Generates:
#[derive(Reflect)]
struct MyStructInput<T> {
  foo: T,
  #[reflect(ignore, default)]
  __phantom_ty__: ::core::marker::PhantomData<fn() -> ( T, U )>,
}

By adding the PhantomData, we're able to easily support any generic type without being forced to parse each field's type and attributes. Unfortunately, PhantomData does not implement FromReflect, so we get a compile error.

bevyengine/bevy#9046 would hopefully fix this, but I think it won't be until Bevy 0.12.

In the meantime, I think we might be able to solve this by adding a temporary attribute to indicate which generics are needed on the input (if one is to be generated):

// Struct where attribute needed:
#[derive(Schematic)]
#[schematic(input(generics(T)))] // We don't need `U`
struct MyStruct<T, U: Asset> {
  foo: T,
  #[schematic(asset)]
  bar: Handle<U>
}

// Struct where no attribute needed:
#[derive(Schematic)]
struct AnotherStruct<T> {
  foo: T,
}

Thoughts on this?

hafiidz · 2023-07-23T02:28:15Z

@MrGVSV & @hafiidz thanks for the kind words, also glad to help ! There are a few remaining issues (all within bevy_impls) that I have not been able to figure out : conflicting implementations of trait 'FromReflect' for type 'EnvironmentMapLightInput' (and similarly for a few others), it seems to be macro related, but even after a bit of googling, I have not found a way to resolve those issues. (I am guessing these where the ones you mentionned @hafiidz ?).

Haha, yup. A lot of Rust macros really felt like magic to me still.

@MrGVSV, unfortunately, I don't have a firm grasp on Rust/Bevy yet to give a strong opinion. It does looks good & especially simple when no attribute needed.

hafiidz · 2023-07-24T03:26:51Z

Not sure if this is the right place, but I think the bevy dependency might need to be more specific, i.e. only compatible with version 0.11.x

The following line in, might need changes from >= to = or to specify via * or ^ as per semver. I recently tried to create a new simple showcase for another issue (#44) with bevy 0.10 and bevy_proto 0.10 but this result in version conflict since cargo is trying to use bevy 0.11 on top of bevy 0.10 specified.

bevy_proto/Cargo.toml

Line 103 in e899c10

    
           bevy = { version = ">=0.11.0", default-features = false, features = ["bevy_asset"] }

MrGVSV · 2023-07-28T03:48:55Z

Okay I think I have it fixed. Turns out the issue was with doing #[reflect(ignore, default)]. That pattern must have broke in 0.11 as it was adding the FromReflect bound even though it's not needed. Removing default allows it to work as normal!

MrGVSV · 2023-07-28T03:49:43Z

Could one or both of you test the branch now? Hopefully it should work in your own projects again!

kaosat-dev · 2023-07-28T06:54:14Z

Could one or both of you test the branch now? Hopefully it should work in your own projects again!

Thanks ! I will take it for a spin now :)

kaosat-dev · 2023-07-28T06:55:33Z

Okay I think I have it fixed. Turns out the issue was with doing #[reflect(ignore, default)]. That pattern must have broke in 0.11 as it was adding the FromReflect bound even though it's not needed. Removing default allows it to work as normal!

ok, wow, so was it a dual issue ? Ie the one with the generic types and the one with defaults ?

kaosat-dev · 2023-07-28T06:58:03Z

Okay here's a pretty major problem: generic types that require an input.

Currently, the macro will generate an input that looks like this:
#[derive(Schematic)]
struct MyStruct<T, U: Asset> {
  foo: T,
  #[schematic(asset)]
  bar: Handle<U>
}

// Generates:
#[derive(Reflect)]
struct MyStructInput<T> {
  foo: T,
  #[reflect(ignore, default)]
  __phantom_ty__: ::core::marker::PhantomData<fn() -> ( T, U )>,
}
By adding the PhantomData, we're able to easily support any generic type without being forced to parse each field's type and attributes. Unfortunately, PhantomData does not implement FromReflect, so we get a compile error.

bevyengine/bevy#9046 would hopefully fix this, but I think it won't be until Bevy 0.12.

In the meantime, I think we might be able to solve this by adding a temporary attribute to indicate which generics are needed on the input (if one is to be generated):
// Struct where attribute needed:
#[derive(Schematic)]
#[schematic(input(generics(T)))] // We don't need `U`
struct MyStruct<T, U: Asset> {
  foo: T,
  #[schematic(asset)]
  bar: Handle<U>
}

// Struct where no attribute needed:
#[derive(Schematic)]
struct AnotherStruct<T> {
  foo: T,
}
Thoughts on this?

Same as @hafiidz , my understanding of Rust & Bevy is not yet good enough to make an informed decision, (PhantomData for example still goes a bit over my head :D ) but it seems like a good stop gap solution ?

kaosat-dev · 2023-07-28T07:09:12Z

@MrGVSV tested out the branch with your changes, it all works great ! (tried out all examples from the repo+ one of my own) well done 👍 !!

hafiidz · 2023-07-28T13:32:02Z

Could one or both of you test the branch now? Hopefully it should work in your own projects again!

My personal project might take a day to complete migration, will update tomorrow.

At the same time, I have just performed a quick simple project to test, it seems to be working great. However, there is a separate issue with button bundle that might need your help to see later, that still remain persistent even with bevy 0.11 (#44).

hafiidz · 2023-07-28T14:59:42Z

Just take the time to complete the migration of my personal project, much faster than expected. It is running really well now.

Thank you very much! Awesome work @MrGVSV.

hafiidz · 2023-07-28T23:21:26Z

Everything seems to be working well now. The error with button bundle is resolved.

MrGVSV · 2023-07-28T23:22:46Z

Awesome, I'm going to go ahead and merge this then! Thank you both for your help!

kaosat-dev added 3 commits July 17, 2023 23:37

chore(): bumped versions & dependency versions

1874ae4

chore(): removed the FromReflect macro calls, as it is now automatica…

e4a2a87

…lly derived within the Reflect derive macro

chore(examples): migrated examples to schedule-first

47a6759

kaosat-dev marked this pull request as draft July 18, 2023 09:03

hafiidz added 6 commits July 20, 2023 12:04

Rename Command's "write" method to "apply"

2630069

Changed spelling linebreak_behaviour to linebreak_behavior

85aa324

Require #[derive(Event)] on all Events

91c6805

Allow custom depth texture usage

17cea81

Flatten UI Style properties that use Size + remove Size & MeasureFunc…

1eee06e

… improvements Chore: Migration 0.10 to 0.11 1. Flatten UI Style properties that use Size + remove Size 2. MeasureFunc improvements Need second eye especially on line 92 to 111 (pub struct ContentSize .... )

Rename Interaction::Clicked > Interaction::Pressed

b38efd1

hafiidz and others added 3 commits July 20, 2023 13:10

Ui Node Borders #7795

5cae089

bevyengine/bevy#7795

typo background_color -> border_color

7ef1337

Merge pull request #2 from hafiidz/bevy-0.11-cherrypickedchanges

655bec6

Chore: Bevy v0.10 to v0.11 cherry picked changes

kaosat-dev added 2 commits July 22, 2023 22:35

fix(ImageBundle): added missing image_size field

566204e

chore(from_reflect): removed obsoleted from_reflect imports

0becab5

Add some more fixes

e899c10

hafiidz mentioned this pull request Jul 25, 2023

Unwrap error when using ButtonBundle #44

Closed

MrGVSV added 3 commits July 27, 2023 20:00

Fix generics causing compile error

403dfec

Update examples

759061d

Change bevy version

5f189fe

MrGVSV added 3 commits July 27, 2023 20:59

Fix clippy

ece4b16

Fix clippy

a053979

Fix clippy (some more)

c395e52

Update color defaults

d6c35d6

MrGVSV marked this pull request as ready for review July 28, 2023 23:22

Reset version

7e49ee4

MrGVSV approved these changes Jul 28, 2023

View reviewed changes

Reset dep version

62a8e50

MrGVSV merged commit 5e721b6 into MrGVSV:main Jul 28, 2023
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(): Bevy 0.11 migration #45

chore(): Bevy 0.11 migration #45

kaosat-dev commented Jul 17, 2023 •

edited

Loading

hafiidz commented Jul 18, 2023

MrGVSV commented Jul 18, 2023

kaosat-dev commented Jul 18, 2023

kaosat-dev commented Jul 18, 2023 •

edited

Loading

hafiidz commented Jul 19, 2023

MrGVSV commented Jul 19, 2023

hafiidz commented Jul 20, 2023

kaosat-dev commented Jul 21, 2023

kaosat-dev commented Jul 21, 2023

hafiidz commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

kaosat-dev commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

hafiidz commented Jul 23, 2023

hafiidz commented Jul 24, 2023

MrGVSV commented Jul 28, 2023

MrGVSV commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023 •

edited

Loading

hafiidz commented Jul 28, 2023

hafiidz commented Jul 28, 2023

hafiidz commented Jul 28, 2023

MrGVSV commented Jul 28, 2023

chore(): Bevy 0.11 migration #45

chore(): Bevy 0.11 migration #45

Conversation

kaosat-dev commented Jul 17, 2023 • edited Loading

hafiidz commented Jul 18, 2023

MrGVSV commented Jul 18, 2023

kaosat-dev commented Jul 18, 2023

kaosat-dev commented Jul 18, 2023 • edited Loading

hafiidz commented Jul 19, 2023

MrGVSV commented Jul 19, 2023

hafiidz commented Jul 20, 2023

kaosat-dev commented Jul 21, 2023

kaosat-dev commented Jul 21, 2023

hafiidz commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

kaosat-dev commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

MrGVSV commented Jul 22, 2023

hafiidz commented Jul 23, 2023

hafiidz commented Jul 24, 2023

MrGVSV commented Jul 28, 2023

MrGVSV commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023

kaosat-dev commented Jul 28, 2023 • edited Loading

hafiidz commented Jul 28, 2023

hafiidz commented Jul 28, 2023

hafiidz commented Jul 28, 2023

MrGVSV commented Jul 28, 2023

kaosat-dev commented Jul 17, 2023 •

edited

Loading

kaosat-dev commented Jul 18, 2023 •

edited

Loading

kaosat-dev commented Jul 28, 2023 •

edited

Loading