Migrate to bevy 0.11 #65

jkb0o · 2023-08-04T10:02:47Z

About

This is migration to bevy 0.11 PR.

A lot of work was done by @PhaestusFox in #63, and this PR is logical continuation of his work. If you want to contribute to bevy-011 version, please make pr to this branch.

You can test this by adding belly to deps:

# bash
cargo add --git https://github.com/jkb0o/belly.git --branch bevy-0.11 belly

# Cargo.toml
[dependencies]
belly = { git = "https://github.com/jkb0o/belly.git", branch = "bevy-0.11", version = "0.2.0" }

Tracker

Known bugs:

Some elemennts with flex-grow: 1 and text inside have invalid size, relates to Invalid node size calculation for text + flex_grow: 1.0 bevyengine/bevy#9350

this is the best I can do to bring this to bevy 0.11, I hade to cut overflow since it is a struct now and I don't know how to convert. also the mouse position is inverted the top is the bottom and vice virce, don't know where to look to fix that one

not quite sure why vscode is not showing some errors

I still have questions about some of the other comments, like removing undefined outright, I like that ess is close to css and should keep it unless it is impossible to represent with Bevy, and if it is removed should also only be depreciated otherwise the parser fails and brakes shit in a unnecessary way, just emit a warning till bevy 0.12?

it does not need to be mut

- introduce ReadySystemSet for `ready` signals - relations systems runs twice: in PreUpdate after input and in PostUpdate after ready - relations systems got strong ordering: binds, connections, custom - so on:ready signals have higher priority then binds

Not cpu do not leak over time when adding new connections

baitcode

Disregard my comments on Undefined. I've read PR description. And it's cool.

this is actually 4 PR merged in one

update to bevy 0.11
step 1 in removal of undefined var
style refactoring (min_width and width props moved e.t.c.)
update examples
would be easier to maintain and review.

Besides that, great job. Hopefully I'll be able to use this in my game after merge.

baitcode · 2023-08-04T16:39:32Z

crates/belly_core/src/eml/build.rs

@@ -412,6 +412,7 @@ pub trait Widget {
            ctx.insert(policy);
            ctx.insert(Interaction::default());
        }
+        ctx.insert(Name::new(self.name().as_str()));


What if Name is already there?

Might be worth adding some prefix so it would be obvious where the name comes from. like "belly_" maybe?

baitcode · 2023-08-04T16:41:38Z

crates/belly_core/src/ess/property/impls/layout_control.rs

@@ -35,7 +35,7 @@ style_property! {
 }

 compound_style_property! {
-    #[doc = " Specify element position by providing values to `Style.position`:"]
+    #[doc = " Specify element position by providing values to `Style.top` `Style.left` `Style.bottom` `Style.right`:"]


baitcode · 2023-08-04T16:43:57Z

crates/belly_core/src/ess/property/parse.rs

@@ -55,6 +55,35 @@ impl PropertyParser<Val> for ValParser {
    }
 }

+pub fn overflow(prop: &StyleProperty) -> Result<Overflow, ElementsError> {


baitcode · 2023-08-04T16:50:48Z

crates/belly_core/src/ess/property/style.rs

@@ -90,7 +90,8 @@ impl StylePropertyToken {
            StylePropertyToken::Percentage(p) => Ok(Val::Percent(p.to_float())),
            StylePropertyToken::Dimension(d, u) if u == "px" => Ok(Val::Px(d.to_float())),
            StylePropertyToken::Identifier(i) if i == "auto" => Ok(Val::Auto),
-            StylePropertyToken::Identifier(i) if i == "undefined" => Ok(Val::Undefined),
+            StylePropertyToken::Identifier(i) if i == "undefined" => Ok(Val::Px(0.)),
+            StylePropertyToken::Identifier(i) if i == "undefined" => Ok(Val::Px(0.)),


Actually this seems to be like an implicit rule. Maybe use 0 explicitly and deprecate undefined value.

baitcode · 2023-08-04T17:04:09Z

crates/belly_core/src/relations/mod.rs

-            let watchers = self.watchers.write().unwrap();
-            if watchers.contains(&watcher) {
-                return;
+        if !self.watchers.read().unwrap().contains(&watcher) {


If two watches would contain two watchers, which watch would watch which watcher

previous version with early returns was nicer. but yeah, does not work the same.

baitcode · 2023-08-04T17:08:14Z

crates/belly_widgets/src/img.rs

@@ -4,8 +4,9 @@ use belly_macro::*;
 use bevy::{
    asset::Asset,
    prelude::*,
-    utils::{HashMap, HashSet},
+    // utils::{HashMap, HashSet},


baitcode · 2023-08-04T17:11:02Z

docs/style-properties.md

@@ -99,7 +99,7 @@ stylebox-source: "images/stylebox.png"
 <!-- @property-type=$val -->
 Size type representing `bevy::prelude::Val` type. Possible values:
 - `auto` for `Val::Auto`
- `undefined` for `Val::Undefined`
+- `undefined` for `Val::Px(0.)`


This is kinda weird, right?

Yeah, if you need an undefined defined value, then it should probably map to Val::Auto.

baitcode · 2023-08-04T17:17:18Z

crates/belly_core/src/input.rs

-                    .in_base_set(CoreSet::PreUpdate)
-                    .in_set(Label::Signals)
-                    .after(InputSystem),
+            .add_systems(


Can you please add comments on what is happening here? This is the most complex place in whole PR and seems like it's a very important, it defines input processing pipeline, I can't comprehend.

…e parser

closes #73

PhaestusFox added 9 commits July 25, 2023 00:57

update to 0.11

d6ac9cf

this is the best I can do to bring this to bevy 0.11, I hade to cut overflow since it is a struct now and I don't know how to convert. also the mouse position is inverted the top is the bottom and vice virce, don't know where to look to fix that one

cargo fmt

822f0a4

fixed example

59321a4

not quite sure why vscode is not showing some errors

fixed inverted y of mouse

9300da5

rename Val::Undefined to Val::Px(0.)

b1c8ad5

Merge branch 'fix-update-error'

cf48968

fixed Overflow

8a149b2

made texts not mut

2157ac7

it does not need to be mut

jkb0o mentioned this pull request Aug 4, 2023

update to 0.11 #63

Closed

jkb0o added 11 commits August 4, 2023 12:16

[core.relations] use hashmap.retain instead of removed drain_filter

22c8f1b

[core.eelement] proper handle removed entities in Eelements

63a5b76

[examples] fix warnings & compilation errors

db3a1b2

[core] fix warnings for wee selector

28adfd4

[widgets.textinput] fix text selection flickering

b0c0165

[core.relation] Fix bug when same multiply connection systems was added

5fc9574

Not cpu do not leak over time when adding new connections

[core.eml] Add Name component to elements with content of tag name

947afeb

[core.eml] Do not panic from Elements commands when entity got removed

d75d193

[stylebox] fix stylebox invalid size

0e1d1e3

[examples] adapt to bevy-0.11

19d3b0f

jkb0o force-pushed the bevy-0.11 branch from 7c258b2 to 19d3b0f Compare August 4, 2023 10:16

baitcode approved these changes Aug 4, 2023

View reviewed changes

jkb0o added 5 commits August 5, 2023 23:26

[core.ess] implement column-gap & row-gap props

91e1d58

[core] do not patch text height as far as bevy text bug was fixed

9e6e57e

[core.ess] support css-functions as style property values with runtim…

76779a5

…e parser

[core.ess] support new grid style props & adjust existed props

2e213e8

[macro.ess] support css functions as style prop values

1de76d5

jkb0o and others added 10 commits August 16, 2023 19:43

[macro.ess] implement ess! macro for inline ess definition

679e208

[examples] add grid example

87c6541

[widgets] get rid of <br/> & <brl/> widgets

337a535

[macro] remove macro from core dependency

b6498ec

[core.element] Deprecate add_children, introduse add_child_with

5550966

[lib] update Cargo.lock

0845c96

[widgets] add follow widget & example

e14b5ea

[widgets] fix <follow> with multiple witndows crush (#75)

08d876e

closes #73

[core] remove debug prints

833f7ce

[bump] 0.3

59c7d68

jkb0o merged commit ddd29fc into main Sep 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate to bevy 0.11 #65

Migrate to bevy 0.11 #65

jkb0o commented Aug 4, 2023 •

edited

Loading

baitcode left a comment

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

baitcode Aug 4, 2023

nicoburns Aug 6, 2023

baitcode Aug 4, 2023

Migrate to bevy 0.11 #65

Migrate to bevy 0.11 #65

Conversation

jkb0o commented Aug 4, 2023 • edited Loading

About

Tracker

Known bugs:

baitcode left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkb0o commented Aug 4, 2023 •

edited

Loading