fixes #88, cleanup shape abstraction

Author: yjpark

crates/bevy_utils/src/dev/layout.rs

@@ -1,49 +1,22 @@
 use bevy::prelude::*;
 use bevy_prototype_lyon::prelude::*;
 
-use crate::lyon::lyon_shape::{LyonShape, LyonShapeOp};
-use crate::prelude::LayoutData;
+use crate::prelude::{LayoutData, OutlineRectangle, ShapeOp};
 
 use super::theme::BevyUtilsTheme;
 
-pub struct LayoutShape<'a> {
-    pub theme: &'a BevyUtilsTheme,
-    pub data: LayoutData,
-}
-
-impl<'a> LyonShape<shapes::Rectangle> for LayoutShape<'a> {
-    fn get_name(&self) -> String {
-        format!("{}", self.data)
-    }
-    fn get_shape(&self) -> shapes::Rectangle {
-        shapes::Rectangle {
-            width: self.data.size.width,
-            height: self.data.size.height,
-            origin: shapes::RectangleOrigin::from(self.data),
-        }
-    }
-    fn get_colors(&self) -> ShapeColors {
-        ShapeColors::outlined(
-            self.theme.layout.get_view_color(),
-            self.theme.layout.border_color,
-        )
-    }
-    fn get_draw_mode(&self) -> DrawMode {
-        DrawMode::Outlined {
-            fill_options: FillOptions::default(),
-            outline_options: StrokeOptions::default()
-                .with_line_width(self.theme.layout.border_line_width),
+impl ShapeOp<BevyUtilsTheme, shapes::Rectangle, OutlineRectangle> for LayoutData {
+    fn get_shape(&self, theme: &BevyUtilsTheme) -> OutlineRectangle {
+        let color = theme.layout.get_view_color();
+        let outline_color = theme.layout.border_color;
+        OutlineRectangle {
+            width: self.size.width,
+            height: self.size.height,
+            origin: shapes::RectangleOrigin::from(*self),
+            color,
+            outline_width: theme.layout.border_line_width,
+            outline_color,
+            offset: Vec3::new(self.offset.x, self.offset.y, 2.0),
         }
     }
-    fn get_transform(&self) -> Transform {
-        Transform::from_xyz(self.data.offset.x, self.data.offset.y, 2.0)
-    }
-}
-
-impl<'a> LyonShapeOp<'a, BevyUtilsTheme, LayoutData, shapes::Rectangle, LayoutShape<'a>>
-    for LayoutShape<'a>
-{
-    fn new_shape(theme: &'a BevyUtilsTheme, data: LayoutData) -> LayoutShape<'a> {
-        LayoutShape::<'a> { theme, data }
-    }
 }

crates/bevy_utils/src/dev/plugin.rs

@@ -1,7 +1,6 @@
 use crate::prelude::*;
 use bevy::prelude::*;
 
-use super::layout::LayoutShape;
 use super::theme::BevyUtilsTheme;
 
 #[derive(Debug, Default)]
@@ -21,7 +20,7 @@ fn on_add_layout_data(
     layout_query: Query<(Entity, &LayoutData), Added<LayoutData>>,
 ) {
     for (entity, layout) in layout_query.iter() {
-        LayoutShape::create(&mut commands, &theme, entity, *layout);
+        layout.create(&mut commands, &theme, entity);
     }
 }
 
@@ -31,6 +30,6 @@ fn on_layout_data_changed(
     layout_query: Query<(Entity, &LayoutData), Changed<LayoutData>>,
 ) {
     for (entity, layout) in layout_query.iter() {
-        LayoutShape::update(&mut commands, &theme, entity, &layout);
+        layout.update(&mut commands, &theme, entity);
     }
 }

crates/bevy_utils/src/layout/anchor.rs

@@ -1,7 +1,11 @@
 use bevy::prelude::*;
 use std::fmt::Display;
 
+#[cfg(feature = "inspector")]
+use bevy_inspector_egui::Inspectable;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub enum LayoutHAnchor {
     Left,
     Center,
@@ -19,6 +23,7 @@ impl Default for LayoutHAnchor {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub enum LayoutVAnchor {
     Top,
     Center,
@@ -36,6 +41,7 @@ impl Default for LayoutVAnchor {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct LayoutAnchor {
     pub v: LayoutVAnchor,
     pub h: LayoutHAnchor,

crates/bevy_utils/src/layout/data.rs

@@ -4,9 +4,13 @@ use std::ops::{Add, Sub};
 use bevy::prelude::*;
 use bevy_prototype_lyon::shapes;
 
+#[cfg(feature = "inspector")]
+use bevy_inspector_egui::Inspectable;
+
 use crate::prelude::{LayoutAnchor, LayoutHAnchor, LayoutVAnchor};
 
 #[derive(Copy, Clone, Debug, Default)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct LayoutSize {
     pub width: f32,
     pub height: f32,
@@ -46,6 +50,7 @@ impl LayoutConstraint {
 }
 
 #[derive(Copy, Clone, Debug, Default)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct LayoutData {
     pub depth: usize,
     pub size: LayoutSize,

crates/bevy_utils/src/layout/view.rs

@@ -140,6 +140,9 @@ pub trait View<TE: LayoutEnv>: Any + Send + Sync + ToString + 'static {
     fn is_root(&self) -> bool {
         false
     }
+    fn log_set_layout(&self) -> bool {
+        false
+    }
     fn log_layout_changed(&self) -> bool {
         false
     }
@@ -171,19 +174,19 @@ pub trait View<TE: LayoutEnv>: Any + Send + Sync + ToString + 'static {
         } else {
             data
         };
-        /*
-        if need_adjust {
-            println!(
-                "{}.set_layout_data(\n\t{} {} ->\n\t{}\n)",
-                self.to_string(),
-                data.pivot,
-                data.offset,
-                adjusted
-            );
-        } else {
-            println!("{}.set_layout_data(\n\t{}\n)", self.to_string(), adjusted);
+        if self.log_set_layout() {
+            if need_adjust {
+                println!(
+                    "{}.set_layout_data(\n\t{} {} ->\n\t{}\n)",
+                    self.to_string(),
+                    data.pivot,
+                    data.offset,
+                    adjusted
+                );
+            } else {
+                println!("{}.set_layout_data(\n\t{}\n)", self.to_string(), adjusted);
+            }
         }
-        */
         match layout_query.get_mut(entity) {
             Ok((mut layout_data, mut transform)) => {
                 *layout_data = adjusted;

crates/bevy_utils/src/lib.rs

@@ -1,6 +1,6 @@
 pub mod bundle;
 pub mod layout;
-pub mod lyon;
+pub mod shape;
 pub mod util;
 pub mod view;
 
@@ -28,7 +28,15 @@ pub mod prelude {
         View, ViewAddedQuery, ViewEntity, ViewQuery, ViewRootAddedQuery, ViewRootQuery,
     };
     #[doc(hidden)]
-    pub use crate::lyon::lyon_shape::{LyonShape, LyonShapeOp, NoThemeLyonShape};
+    pub use crate::shape::shape::{Shape, ShapeOp};
+    #[doc(hidden)]
+    pub use crate::shape::rectangle::{FillRectangle, StrokeRectangle, OutlineRectangle};
+    #[doc(hidden)]
+    pub use crate::shape::circle::{FillCircle, OutlineCircle};
+    #[doc(hidden)]
+    pub use crate::shape::line::{StrokeLine};
+    #[doc(hidden)]
+    pub use crate::shape::path::{StrokePath};
     #[doc(hidden)]
     pub use crate::util::BevyUtil;
     #[doc(hidden)]

crates/bevy_utils/src/lyon/lyon_shape.rs

@@ -0,0 +1,87 @@
+use bevy::prelude::*;
+use bevy_prototype_lyon::prelude::*;
+
+use crate::prelude::BevyUtil;
+
+use super::shape::Shape;
+
+#[derive(Clone, Debug)]
+pub struct FillCircle {
+    pub radius: f32,
+    pub color: Color,
+    pub offset: Vec3,
+}
+
+impl Shape<shapes::Circle> for FillCircle {
+    fn get_shape(&self) -> shapes::Circle {
+        shapes::Circle {
+            center: Vec2::ZERO,
+            radius: self.radius,
+        }
+    }
+    fn get_colors(&self) -> ShapeColors {
+        ShapeColors::new(self.color)
+    }
+    fn get_draw_mode(&self) -> DrawMode {
+        DrawMode::Fill(FillOptions::default())
+    }
+    fn get_transform(&self) -> Transform {
+        if self.radius <= 0.0 {
+            return BevyUtil::offscreen_transform();
+        }
+        Transform::from_xyz(
+            self.offset.x,
+            self.offset.y,
+            self.offset.z,
+        )
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct OutlineCircle {
+    pub radius: f32,
+    pub color: Color,
+    pub outline_width: f32,
+    pub outline_color: Color,
+    pub offset: Vec3,
+}
+
+impl Shape<shapes::Circle> for OutlineCircle {
+    fn get_shape(&self) -> shapes::Circle {
+        shapes::Circle {
+            center: Vec2::ZERO,
+            radius: self.radius,
+        }
+    }
+    fn get_colors(&self) -> ShapeColors {
+        if self.outline_width > 0.0 {
+            ShapeColors::outlined(
+                self.color,
+                self.outline_color,
+            )
+        } else {
+            ShapeColors::new(self.color)
+        }
+    }
+    fn get_draw_mode(&self) -> DrawMode {
+        if self.outline_width > 0.0 {
+            DrawMode::Outlined {
+                fill_options: FillOptions::default(),
+                outline_options: StrokeOptions::default().with_line_width(self.outline_width),
+            }
+        } else {
+            DrawMode::Fill(FillOptions::default())
+        }
+    }
+    fn get_transform(&self) -> Transform {
+        if self.radius <= 0.0 {
+            return BevyUtil::offscreen_transform();
+        }
+        Transform::from_xyz(
+            self.offset.x,
+            self.offset.y,
+            self.offset.z,
+        )
+    }
+}
+