Register inner types

MrGVSV · Apr 29, 2023 · 68dbb4f · 68dbb4f
1 parent 00174e0
commit 68dbb4f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 23 deletions.
diff --git a/bevy_proto_backend/src/impls/bevy_impls/core_pipeline.rs b/bevy_proto_backend/src/impls/bevy_impls/core_pipeline.rs
@@ -23,6 +23,12 @@ pub(super) fn register(app: &mut App) {
         NormalPrepass,
         Tonemapping
     );
+
+    // Can be removed if https://github.com/bevyengine/bevy/pull/5781 is ever merged
+    app.register_type::<BloomPrefilterSettingsInput>()
+        .register_type::<BloomCompositeModeInput>()
+        .register_type::<ClearColorConfigInput>()
+        .register_type::<Camera3dDepthLoadOpInput>();
 }
 
 impl_external_schematic! {

diff --git a/bevy_proto_backend/src/impls/bevy_impls/pbr.rs b/bevy_proto_backend/src/impls/bevy_impls/pbr.rs
@@ -27,6 +27,9 @@ pub(super) fn register(app: &mut App) {
         SpotLight,
         Wireframe,
     );
+
+    // Can be removed if https://github.com/bevyengine/bevy/pull/5781 is ever merged
+    app.register_type::<FogFalloffInput>();
 }
 
 impl_external_schematic! {

diff --git a/bevy_proto_backend/src/impls/bevy_impls/text.rs b/bevy_proto_backend/src/impls/bevy_impls/text.rs
@@ -8,6 +8,10 @@ use bevy_proto_derive::impl_external_schematic;
 
 pub(super) fn register(app: &mut App) {
     register_schematic!(app, Text, Text2dBounds);
+
+    // Can be removed if https://github.com/bevyengine/bevy/pull/5781 is ever merged
+    app.register_type::<BreakLineOnInput>()
+        .register_type::<TextAlignmentInput>();
 }
 
 impl_external_schematic! {

diff --git a/bevy_proto_backend/src/impls/bevy_impls/transform.rs b/bevy_proto_backend/src/impls/bevy_impls/transform.rs
@@ -8,26 +8,6 @@ pub(super) fn register(app: &mut App) {
     register_schematic!(app, Transform, GlobalTransform);
 }
 
-// FIXME: `TransformBundle` does not impl `Reflect`
-// impl_external_schematic! {
-//     #[schematic(from = TransformBundleInput)]
-//     struct TransformBundle {}
-//     // ---
-//     #[derive(Reflect, FromReflect)]
-//     pub struct TransformBundleInput {
-//         local: Transform,
-//         global: GlobalTransform
-//     }
-//     impl From<TransformBundleInput> for TransformBundle {
-//         fn from(value: TransformBundleInput) -> Self {
-//             Self {
-//                 local: value.local,
-//                 global: value.global
-//             }
-//         }
-//     }
-// }
-
 impl_external_schematic! {
     struct Transform {}
 }

diff --git a/bevy_proto_backend/src/impls/bevy_impls/ui.rs b/bevy_proto_backend/src/impls/bevy_impls/ui.rs
@@ -8,7 +8,7 @@ use bevy::ui::{
     PositionType, RelativeCursorPosition, Size, Style, UiImage, UiRect, Val, ZIndex,
 };
 
-use crate::impls::macros::{from_to_default, register_schematic};
+use crate::impls::macros::{from_to, from_to_default, register_schematic};
 use crate::proto::ProtoAsset;
 use bevy_proto_derive::impl_external_schematic;
 
@@ -27,6 +27,21 @@ pub(super) fn register(app: &mut App) {
         Style,
         UiImage,
     );
+
+    // Can be removed if https://github.com/bevyengine/bevy/pull/5781 is ever merged
+    app.register_type::<AlignContentInput>()
+        .register_type::<AlignItemsInput>()
+        .register_type::<AlignSelfInput>()
+        .register_type::<DirectionInput>()
+        .register_type::<DisplayInput>()
+        .register_type::<FlexDirectionInput>()
+        .register_type::<FlexWrapInput>()
+        .register_type::<JustifyContentInput>()
+        .register_type::<PositionTypeInput>()
+        .register_type::<SizeInput>()
+        .register_type::<SizeInput>()
+        .register_type::<UiRectInput>()
+        .register_type::<ValInput>();
 }
 
 impl_external_schematic! {
@@ -155,11 +170,16 @@ impl_external_schematic! {
     // ---
     #[derive(Reflect, FromReflect)]
     pub struct NodeInput;
-    from_to_default!(
+    from_to!(
         Node,
         NodeInput,
         |_: Input| Self::default()
     );
+    impl Default for NodeInput {
+        fn default() -> Self {
+            Self
+        }
+    }
 }
 
 impl_external_schematic! {

diff --git a/bevy_proto_backend/src/impls/macros.rs b/bevy_proto_backend/src/impls/macros.rs
@@ -1,4 +1,4 @@
-/// Registers the given types along with their respective [`ReflectSchematic`].
+/// Registers the given types along with their respective input types and [`ReflectSchematic`].
 #[macro_export]
 #[doc(hidden)]
 macro_rules! register_schematic {
@@ -7,6 +7,7 @@ macro_rules! register_schematic {
             // Sanity check: ensure the type is actually registered
             // before actually registering the `ReflectSchematic` type data
             $app.register_type::<$ty>()
+                .register_type::<<$ty as $crate::schematics::Schematic>::Input>()
                 .register_type_data::<$ty, $crate::schematics::ReflectSchematic>();
 
         )*