Merge pull request #45 from kaosat-dev/bevy-0.11

chore(): Bevy 0.11 migration
MrGVSV · Jul 28, 2023 · 5e721b6 · 5e721b6
2 parents e613d45 + 62a8e50
commit 5e721b6
Show file tree

Hide file tree

Showing 44 changed files with 592 additions and 487 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -100,7 +100,7 @@ bevy_ui = [
 
 [dependencies]
 bevy_proto_backend = { version = "0.3", path = "./bevy_proto_backend", default-features = false }
-bevy = { version = ">=0.10.1", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.11", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 serde = "1.0"
 thiserror = "1.0"
@@ -111,8 +111,8 @@ serde_yaml = { version = "0.9", optional = true, default-features = false }
 [dev-dependencies]
 ron = "0.8"
 serde_yaml = "0.9"
-bevy = "0.10.1"
-bevy_prototype_lyon = "0.8.0"
+bevy = "0.11.0"
+bevy_prototype_lyon = "0.9.0"
 trybuild = "1.0.71"
 
 [[example]]

diff --git a/assets/examples/bevy/ui/Blue.prototype.ron b/assets/examples/bevy/ui/Blue.prototype.ron
@@ -3,22 +3,19 @@
   schematics: {
     "bevy_proto::custom::NodeBundle": (
       style: (
-        size: (
-          width: Px(200.0),
-          height: Px(200.0),
-        ),
+        width: Px(200.0),
+        height: Px(200.0),
         position_type: Absolute,
-        position: (
-          left: Px(210.0),
-          bottom: Px(10.0),
-        ),
+        left: Px(210.0),
+        bottom: Px(10.0),
         border: (
           left: Px(20.0),
           right: Px(20.0),
           top: Px(20.0),
           bottom: Px(20.0),
         ),
       ),
+      border_color: (Green),
       background_color: (Rgba(
         red: 0.4,
         green: 0.4,
@@ -33,10 +30,8 @@
       schematics: {
         "bevy_proto::custom::NodeBundle": (
           style: (
-            size: (
-              width: Percent(100.0),
-              height: Percent(100.0),
-            ),
+            width: Percent(100.0),
+            height: Percent(100.0),
           ),
           background_color: (Rgba(
             red: 0.8,

diff --git a/assets/examples/bevy/ui/Left.prototype.ron b/assets/examples/bevy/ui/Left.prototype.ron
@@ -3,10 +3,7 @@
   schematics: {
     "bevy_proto::custom::NodeBundle": (
       style: (
-        size: (
-          width: Px(200.0),
-          height: Auto,
-        ),
+        width: Px(200.0),
         border: (
           left: Px(2.0),
           right: Px(2.0),
@@ -28,10 +25,7 @@
       schematics: {
         "bevy_proto::custom::NodeBundle": (
           style: (
-            size: (
-              width: Percent(100.0),
-              height: Auto,
-            ),
+            width: Percent(100.0),
           ),
           background_color: (Rgba(
             red: 0.15,

diff --git a/assets/examples/bevy/ui/Red.prototype.ron b/assets/examples/bevy/ui/Red.prototype.ron
@@ -3,10 +3,8 @@
   schematics: {
     "bevy_proto::custom::NodeBundle": (
       style: (
-        size: (
-          width: Percent(100.0),
-          height: Percent(100.0),
-        ),
+        width: Percent(100.0),
+        height: Percent(100.0),
         position_type: Absolute,
         align_items: Center,
         justify_content: Center,
@@ -19,10 +17,8 @@
       schematics: {
         "bevy_proto::custom::NodeBundle": (
           style: (
-            size: (
-              width: Px(100.0),
-              height: Px(100.0),
-            ),
+            width: Px(100.0),
+            height: Px(100.0),
           ),
           background_color: (Red),
         )
@@ -34,15 +30,11 @@
             schematics: {
               "bevy_proto::custom::NodeBundle": (
                 style: (
-                  size: (
-                    width: Percent(100.0),
-                    height: Percent(100.0),
-                  ),
+                  width: Percent(100.0),
+                  height: Percent(100.0),
                   position_type: Absolute,
-                  position: (
-                    left: Px(20.0),
-                    bottom: Px(20.0),
-                  ),
+                  left: Px(20.0),
+                  bottom: Px(20.0),
                 ),
                 background_color: (Rgba(
                   red: 1.0,
@@ -60,15 +52,11 @@
             schematics: {
               "bevy_proto::custom::NodeBundle": (
                 style: (
-                  size: (
-                    width: Percent(100.0),
-                    height: Percent(100.0),
-                  ),
+                  width: Percent(100.0),
+                  height: Percent(100.0),
                   position_type: Absolute,
-                  position: (
-                    left: Px(40.0),
-                    bottom: Px(40.0),
-                  ),
+                  left: Px(40.0),
+                  bottom: Px(40.0),
                 ),
                 background_color: (Rgba(
                   red: 1.0,
@@ -86,15 +74,11 @@
             schematics: {
               "bevy_proto::custom::NodeBundle": (
                 style: (
-                  size: (
-                    width: Percent(100.0),
-                    height: Percent(100.0),
-                  ),
+                  width: Percent(100.0),
+                  height: Percent(100.0),
                   position_type: Absolute,
-                  position: (
-                    left: Px(60.0),
-                    bottom: Px(60.0),
-                  ),
+                  left: Px(60.0),
+                  bottom: Px(60.0),
                 ),
                 background_color: (Rgba(
                   red: 1.0,
@@ -112,15 +96,11 @@
             schematics: {
               "bevy_proto::custom::NodeBundle": (
                 style: (
-                  size: (
-                    width: Percent(100.0),
-                    height: Percent(100.0),
-                  ),
+                  width: Percent(100.0),
+                  height: Percent(100.0),
                   position_type: Absolute,
-                  position: (
-                    left: Px(80.0),
-                    bottom: Px(80.0),
-                  ),
+                  left: Px(80.0),
+                  bottom: Px(80.0),
                 ),
                 background_color: (Rgba(
                   red: 1.0,

diff --git a/assets/examples/bevy/ui/Right.prototype.ron b/assets/examples/bevy/ui/Right.prototype.ron
@@ -6,10 +6,8 @@
         flex_direction: Column,
         justify_content: Center,
         align_items: Center,
-        size: (
-          width: Px(200.0),
-          height: Auto,
-        ),
+        width: Px(200.0),
+        height: Auto,
       ),
       background_color: (Rgba(
         red: 0.15,
@@ -35,10 +33,8 @@
             )]
           ),
           style: (
-            size: (
-              width: Auto,
-              height: Px(25.0),
-            )
+            width: Auto,
+            height: Px(25.0),
           ),
         ),
         "bevy_ui::widget::label::Label": ()

diff --git a/assets/examples/bevy/ui/Root.prototype.ron b/assets/examples/bevy/ui/Root.prototype.ron
@@ -3,10 +3,8 @@
   schematics: {
     "bevy_proto::custom::NodeBundle": (
       style: (
-        size: (
-          width: Percent(100.0),
-          height: Percent(100.0),
-        ),
+        width: Percent(100.0),
+        height: Percent(100.0),
         justify_content: SpaceBetween,
       )
     )

diff --git a/assets/examples/bevy/ui/Scrollbox.prototype.ron b/assets/examples/bevy/ui/Scrollbox.prototype.ron
@@ -5,11 +5,12 @@
       style: (
         flex_direction: Column,
         align_self: Stretch,
-        size: (
-          width: Auto,
-          height: Percent(50.0),
-        ),
-        overflow: Hidden
+        width: Auto,
+        height: Percent(50.0),
+        overflow: (
+          x: Clip,
+          y: Clip,
+        )
       ),
       background_color: (Rgba(
         red: 0.10,
@@ -26,10 +27,8 @@
         "bevy_proto::custom::NodeBundle": (
           style: (
             flex_direction: Column,
-            max_size: (
-              width: Undefined,
-              height: Undefined,
-            ),
+            max_width: Auto,
+            max_height: Auto,
             align_items: Center,
           ),
         ),

diff --git a/bevy_proto_backend/Cargo.toml b/bevy_proto_backend/Cargo.toml
@@ -63,7 +63,7 @@ bevy_ui = [
 
 [dependencies]
 bevy_proto_derive = { version = "0.5", path = "../bevy_proto_derive" }
-bevy = { version = ">=0.10.1", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.11", default-features = false, features = ["bevy_asset"] }
 anyhow = "1.0"
 serde = "1.0"
 thiserror = "1.0"

diff --git a/bevy_proto_backend/src/impls/bevy_impls/asset.rs b/bevy_proto_backend/src/impls/bevy_impls/asset.rs
@@ -13,12 +13,7 @@ pub(super) fn register(app: &mut App) {
     register_schematic!(app, Handle<bevy::prelude::AnimationClip>);
 
     #[cfg(feature = "bevy_audio")]
-    register_schematic!(
-        app,
-        Handle<bevy::prelude::AudioSink>,
-        Handle<bevy::prelude::AudioSource>,
-        Handle<bevy::prelude::SpatialAudioSink>,
-    );
+    register_schematic!(app, Handle<bevy::prelude::AudioSource>,);
 
     #[cfg(feature = "bevy_gltf")]
     register_schematic!(

diff --git a/bevy_proto_backend/src/impls/bevy_impls/core.rs b/bevy_proto_backend/src/impls/bevy_impls/core.rs
@@ -1,6 +1,6 @@
 use bevy::app::App;
 use bevy::core::Name;
-use bevy::reflect::{FromReflect, Reflect};
+use bevy::reflect::Reflect;
 
 use crate::impls::macros::register_schematic;
 use bevy_proto_derive::impl_external_schematic;
@@ -13,7 +13,7 @@ impl_external_schematic! {
     #[schematic(from = NameInput)]
     struct Name {}
     // ---
-    #[derive(Reflect, FromReflect)]
+    #[derive(Reflect)]
     pub struct NameInput(String);
     impl From<NameInput> for Name {
         fn from(input: NameInput) -> Self {