feat: maximize and some performance

ten3roberts · Mar 16, 2024 · 59beb44 · 59beb44
1 parent 40626c8
commit 59beb44
Show file tree

Hide file tree

Showing 30 changed files with 376 additions and 276 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -82,6 +82,7 @@ palette.workspace = true
 futures-signals.workspace = true
 flax.workspace = true
 lru.workspace = true
+web-time.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true

diff --git a/examples/basic.rs b/examples/basic.rs
@@ -24,7 +24,7 @@ use violet_core::{
         danger_item, primary_background, secondary_background, spacing_medium, spacing_small,
         Background, SizeExt, ValueOrRef,
     },
-    widget::{BoxSized, ContainerStyle},
+    widget::ContainerStyle,
 };
 
 struct MainApp;
@@ -50,7 +50,7 @@ impl Widget for MainApp {
                     .map(|i| {
                         let size = Vec2::splat(128.0 / i as f32);
                         Stack::new(
-                            BoxSized::new(Image::new("./assets/images/statue.jpg"))
+                            Image::new("./assets/images/statue.jpg")
                                 .with_min_size(Unit::px(size))
                                 .with_aspect_ratio(1.0),
                         )
@@ -100,10 +100,10 @@ impl Widget for MainApp {
             .with_padding(spacing_small())
             .with_background(Background::new(primary_background())),
             Stack::new((
-                BoxSized::new(Rectangle::new(danger_item()))
+                Rectangle::new(danger_item())
                     .with_min_size(Unit::px(vec2(100.0, 30.0)))
                     .with_size(Unit::px(vec2(50.0, 30.0))),
-                BoxSized::new(Rectangle::new(danger_item()))
+                Rectangle::new(danger_item())
                     .with_min_size(Unit::px(vec2(200.0, 10.0)))
                     .with_size(Unit::px(vec2(50.0, 10.0))),
                 Text::new("This is some text").with_font_size(16.0),
@@ -170,14 +170,14 @@ impl Widget for LayoutFlexTest {
         List::new(
             (0..8)
                 .map(|i| {
-                    let size = vec2(100.0, 20.0);
+                    let size = vec2(50.0, 20.0);
 
                     Stack::new(
-                        BoxSized::new(Rectangle::new(ValueOrRef::value(
+                        Rectangle::new(ValueOrRef::value(
                             Hsva::new(i as f32 * 30.0, 1.0, 1.0, 1.0).into_color(),
-                        )))
+                        ))
                         .with_min_size(Unit::px(size))
-                        .with_size(Unit::px(size * vec2(i as f32, 1.0))),
+                        .with_maximize(Vec2::X * i as f32),
                     )
                     .with_margin(spacing_small())
                 })

diff --git a/examples/flow.rs b/examples/flow.rs
@@ -18,28 +18,13 @@ use violet_core::{
     style::{
         self,
         colors::{EERIE_BLACK_600, EERIE_BLACK_DEFAULT},
-        secondary_background, spacing_small, Background, SizeExt,
+        spacing_small, Background, SizeExt,
     },
     text::Wrap,
-    widget::{
-        card, column, row, BoxSized, Button, ButtonStyle, ContainerStyle, SliderWithLabel,
-        TextInput,
-    },
+    widget::{card, column, label, row, Button, ButtonStyle, SliderWithLabel, TextInput},
 };
 use violet_wgpu::renderer::RendererConfig;
 
-fn label(text: impl Into<String>) -> Stack<Text> {
-    Stack::new(Text::new(text.into()))
-        .with_padding(spacing_small())
-        .with_margin(spacing_small())
-}
-
-fn pill(widget: impl Widget) -> impl Widget {
-    Stack::new(widget).with_style(ContainerStyle {
-        background: Some(Background::new(secondary_background())),
-    })
-}
-
 pub fn main() -> anyhow::Result<()> {
     registry()
         .with(
@@ -94,8 +79,7 @@ impl Widget for MainApp {
                 ))
                 .with_stretch(true),
             ),
-            BoxSized::new(Rectangle::new(EERIE_BLACK_600))
-                .with_size(Unit::rel2(1.0, 0.0) + Unit::px2(0.0, 1.0)),
+            Rectangle::new(EERIE_BLACK_600).with_size(Unit::rel2(1.0, 0.0) + Unit::px2(0.0, 1.0)),
             card(column((
                 column((
                     row((
@@ -147,7 +131,7 @@ impl Widget for Tints {
                 );
 
                 card(column((
-                    BoxSized::new(Rectangle::new(color)).with_size(Unit::px2(100.0, 40.0)),
+                    Rectangle::new(color).with_size(Unit::px2(100.0, 40.0)),
                     label(format!("{tint}")),
                     label(color_string),
                 )))

diff --git a/examples/row.rs b/examples/row.rs
@@ -1,6 +1,8 @@
 use std::iter::repeat;
 
+use glam::{vec2, Vec2};
 use itertools::Itertools;
+use palette::named::DARKCYAN;
 use tracing_subscriber::{layer::SubscriberExt, registry, util::SubscriberInitExt, EnvFilter};
 use tracing_tree::HierarchicalLayer;
 
@@ -15,10 +17,13 @@ use violet::core::{
 };
 use violet_core::{
     style::{
-        colors::{JADE_400, JADE_DEFAULT, LION_DEFAULT, REDWOOD_100, ULTRA_VIOLET_DEFAULT},
+        colors::{
+            DARK_CYAN_DEFAULT, JADE_400, JADE_DEFAULT, LION_DEFAULT, REDWOOD_100,
+            ULTRA_VIOLET_DEFAULT,
+        },
         spacing_medium, spacing_small, SizeExt,
     },
-    widget::{card, column, label, row, Stack},
+    widget::{card, centered, column, label, row, Image, Stack},
 };
 use violet_wgpu::renderer::RendererConfig;
 
@@ -66,7 +71,17 @@ impl Widget for MainApp {
                 //     .with_min_size(Unit::px2(100.0, 100.0))
                 //     .with_size(Unit::px2(0.0, 100.0) + Unit::rel2(1.0, 0.0)),
                 // .with_margin(spacing_medium()),
-                row((0..16).map(|_| Stack::new(Item)).collect_vec()),
+                row((0..4)
+                    .map(|_| Box::new(Stack::new(Item)) as Box<dyn Widget>)
+                    .chain([Box::new(
+                        centered((Rectangle::new(JADE_DEFAULT)
+                            .with_maximize(vec2(1.0, 0.0))
+                            .with_size(Unit::px2(0.0, 50.0))
+                            .with_max_size(Unit::px2(1000.0, 100.0)),))
+                        .with_maximize(Vec2::ONE),
+                    ) as Box<dyn Widget>])
+                    .collect_vec())
+                .with_padding(spacing_small()),
             ))
             // .with_padding(spacing_medium())
             .contain_margins(true),
@@ -81,8 +96,9 @@ struct Item;
 
 impl Widget for Item {
     fn mount(self, scope: &mut Scope<'_>) {
-        Rectangle::new(ULTRA_VIOLET_DEFAULT)
+        Image::new("./assets/images/statue.jpg")
             .with_size(Unit::px2(100.0, 100.0))
+            // .with_aspect_ratio(1.0)
             .with_margin(spacing_small())
             .mount(scope)
     }

diff --git a/examples/sizing.rs b/examples/sizing.rs
@@ -23,19 +23,12 @@ use violet_core::{
     state::MapRef,
     style::{colors::DARK_CYAN_DEFAULT, SizeExt},
     text::Wrap,
-    widget::{card, centered, column, row, Slider},
+    widget::{card, centered, column, label, row, Slider},
 };
 use violet_wgpu::renderer::RendererConfig;
 
 const MARGIN_SM: Edges = Edges::even(4.0);
 
-fn label(text: impl Into<String>) -> Stack<Text> {
-    Stack::new(Text::new(text.into()))
-        .with_padding(MARGIN_SM)
-        .with_margin(MARGIN_SM)
-        .with_background(Background::new(EERIE_BLACK_400))
-}
-
 pub fn main() -> anyhow::Result<()> {
     registry()
         .with(

diff --git a/recipes.json b/recipes.json
@@ -1,6 +1,6 @@
 {
     "check": {
-        "cmd": "cargo check --all-targets --all-features"
+        "cmd": "cargo check --all-targets --all-features --workspace"
     },
     "run demo": {
         "cmd": "cargo run --package violet-demo"
@@ -56,10 +56,10 @@
     },
     "build web": {
         "cmd": "wasm-pack build --target web",
-        "cwd": "./violet-web-example/"
+        "cwd": "./violet-demo/"
     },
     "host": {
         "cmd": "python3 -m http.server 8080",
-        "cwd": "./violet-web-example/"
+        "cwd": "./violet-demo/"
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -5,3 +5,4 @@ pub use flax;
 pub use futures_signals;
 pub use glam;
 pub use palette;
+pub use web_time;
diff --git a/violet-core/src/components.rs b/violet-core/src/components.rs
@@ -66,6 +66,8 @@ component! {
     /// A margin is in essence a minimum allowed distance to another items bounds
     pub margin: Edges => [ Debuggable ],
 
+    pub maximize: Vec2 => [ Debuggable ],
+
     pub text: Vec<TextSegment> => [ ],
     pub text_wrap: Wrap => [ Debuggable ],
     pub font_size: f32 => [ Debuggable ],

diff --git a/violet-core/src/effect/mod.rs b/violet-core/src/effect/mod.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 pub use future::FutureEffect;
+use pin_project::pin_project;
 pub use stream::StreamEffect;
 
 /// An asynchronous computation which has access to `Data` when polled
@@ -16,4 +17,42 @@ pub use stream::StreamEffect;
 pub trait Effect<Data> {
     /// Polls the effect
     fn poll(self: Pin<&mut Self>, context: &mut Context<'_>, data: &mut Data) -> Poll<()>;
+    fn label(&self) -> Option<&str> {
+        None
+    }
+
+    fn with_label(self, label: impl Into<String>) -> EffectWithLabel<Self>
+    where
+        Self: Sized,
+    {
+        EffectWithLabel::new(self, Some(label.into()))
+    }
+}
+
+#[pin_project]
+#[doc(hidden)]
+pub struct EffectWithLabel<E> {
+    #[pin]
+    effect: E,
+    label: Option<String>,
+}
+
+impl<E> EffectWithLabel<E> {
+    pub fn new(effect: E, label: Option<String>) -> Self {
+        Self { effect, label }
+    }
+}
+
+impl<E, Data> Effect<Data> for EffectWithLabel<E>
+where
+    E: Effect<Data>,
+{
+    #[inline]
+    fn poll(self: Pin<&mut Self>, context: &mut Context<'_>, data: &mut Data) -> Poll<()> {
+        self.project().effect.poll(context, data)
+    }
+
+    fn label(&self) -> Option<&str> {
+        self.label.as_deref()
+    }
 }
diff --git a/violet-core/src/executor.rs b/violet-core/src/executor.rs
@@ -174,8 +174,10 @@ impl<Data> Executor<Data> {
     }
 
     pub fn tick(&mut self, data: &mut Data) {
+        puffin::profile_function!();
         assert!(self.processing.is_empty());
         loop {
+            puffin::profile_scope!("tick");
             // Add new tasks
             self.processing
                 .extend(self.incoming.borrow_mut().drain(..).map(|task| {
@@ -201,6 +203,8 @@ impl<Data> Executor<Data> {
                     // external waker
                     continue;
                 };
+
+                puffin::profile_scope!("process task", task.effect.label().unwrap_or_default());
                 let mut context = Context::from_waker(&*waker);
                 tracing::trace!(?id, "Polling task");
 

diff --git a/violet-core/src/input.rs b/violet-core/src/input.rs
@@ -1,8 +1,6 @@
-use std::str::FromStr;
-
 use flax::{
     component, components::child_of, entity_ids, fetch::Satisfied, filter::All, Component, Entity,
-    EntityIds, EntityRef, Fetch, FetchExt, Mutable, Query, Topo, World,
+    EntityIds, EntityRef, Fetch, FetchExt, Query, Topo, World,
 };
 use glam::Vec2;