feat: Incremental rendering

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "rust-analyzer.cargo.features": [
         "devtools",
-        "log",
+        "tracing-subscriber",
         "use_camera"
     ]
 }

Cargo.toml

@@ -7,12 +7,13 @@ edition = "2021"
 members = ["crates/renderer", "crates/state", "crates/freya", "crates/elements", "crates/components", "crates/hooks", "crates/common", "crates/core", "crates/testing", "crates/devtools", "crates/torin", "crates/engine", "./examples/installer",  "crates/native-core",  "crates/native-core-macro"]
 
 [features]
-log = ["freya/log"]
+tracing-subscriber = ["freya/tracing-subscriber"]
 devtools = ["freya/devtools"]
 use_camera = ["freya/use_camera"]
 hot-reload = ["freya/hot-reload"]
 custom-tokio-rt = ["freya/custom-tokio-rt"]
 performance-overlay = ["freya/performance-overlay"]
+fade-cached-incremental-areas = ["freya/fade-cached-incremental-areas"]
 
 [patch.crates-io]
 # dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" }

crates/common/Cargo.toml

@@ -28,4 +28,12 @@ freya-engine = { workspace = true }
 freya-native-core = { workspace = true }
 rustc-hash= { workspace = true }
 
+itertools = "0.13.0"
 uuid = { workspace = true }
+
+
+[dev-dependencies]
+dioxus = { workspace = true }
+freya = { path = "../freya" }
+freya-testing = { path = "../testing" }
+tokio = { workspace = true }

crates/common/src/compositor_dirty_nodes.rs

@@ -0,0 +1,31 @@
+use std::ops::{
+    Deref,
+    DerefMut,
+};
+
+use freya_native_core::NodeId;
+use rustc_hash::FxHashSet;
+
+#[derive(Clone, Default, Debug)]
+pub struct CompositorDirtyNodes(FxHashSet<NodeId>);
+
+impl Deref for CompositorDirtyNodes {
+    type Target = FxHashSet<NodeId>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for CompositorDirtyNodes {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl CompositorDirtyNodes {
+    /// Mark a certain node as invalidated.
+    pub fn invalidate(&mut self, node_id: NodeId) {
+        self.0.insert(node_id);
+    }
+}

crates/common/src/layers.rs

@@ -1,39 +1,48 @@
-use std::sync::{
-    Arc,
-    Mutex,
-    MutexGuard,
+use std::{
+    self,
+    ops::{
+        Deref,
+        DerefMut,
+    },
 };
 
 use freya_native_core::NodeId;
 use rustc_hash::FxHashMap;
 
-#[derive(Default, Clone)]
-pub struct Layers {
-    pub layers: Arc<Mutex<FxHashMap<i16, Vec<NodeId>>>>,
-}
+#[derive(Default, Clone, Debug, PartialEq)]
+pub struct Layers(FxHashMap<i16, Vec<NodeId>>);
 
 impl Layers {
-    pub fn insert_node_in_layer(&self, node_id: NodeId, layer_n: i16) {
-        let mut layers = self.layers.lock().unwrap();
-        let layer = layers.entry(layer_n).or_default();
+    /// Insert the given [NodeId] in the given layer. Will create an entry for the layer if missing.
+    pub fn insert_node_in_layer(&mut self, node_id: NodeId, layer_n: i16) {
+        let layer = self.0.entry(layer_n).or_default();
+        if layer.contains(&node_id) {
+            return;
+        }
         layer.push(node_id);
     }
 
-    pub fn remove_node_from_layer(&self, node_id: NodeId, layer_n: i16) {
-        let mut layers = self.layers.lock().unwrap();
-        let layer = layers.get_mut(&layer_n).unwrap();
+    /// Remove the [NodeId] from the given layer. Will remove the entry of the layer if it becomes empty.
+    pub fn remove_node_from_layer(&mut self, node_id: NodeId, layer_n: i16) {
+        let layer = self.0.get_mut(&layer_n).unwrap();
         layer.retain(|id| *id != node_id);
 
         if layer.is_empty() {
-            layers.remove(&layer_n);
+            self.0.remove(&layer_n);
         }
     }
+}
 
-    pub fn layers(&self) -> MutexGuard<FxHashMap<i16, Vec<NodeId>>> {
-        self.layers.lock().unwrap()
+impl Deref for Layers {
+    type Target = FxHashMap<i16, Vec<NodeId>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
     }
+}
 
-    pub fn len_layers(&self) -> usize {
-        self.layers.lock().unwrap().len()
+impl DerefMut for Layers {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }

crates/common/src/layout.rs

@@ -27,7 +27,7 @@ pub enum CursorLayoutResponse {
     TextSelection { from: usize, to: usize, id: usize },
 }
 
-pub struct CachedParagraph(pub Paragraph);
+pub struct CachedParagraph(pub Paragraph, pub f32);
 
 /// # Safety
 /// Skia `Paragraph` are neither Sync or Send, but in order to store them in the Associated

crates/common/src/lib.rs

@@ -1,7 +1,9 @@
+mod compositor_dirty_nodes;
 mod layers;
 mod layout;
 mod paragraphs;
 
+pub use compositor_dirty_nodes::*;
 pub use layers::*;
 pub use layout::*;
 pub use paragraphs::*;

crates/common/src/paragraphs.rs

@@ -1,7 +1,9 @@
-use std::sync::{
-    Arc,
-    Mutex,
-    MutexGuard,
+use std::{
+    self,
+    ops::{
+        Deref,
+        DerefMut,
+    },
 };
 
 use freya_native_core::NodeId;
@@ -12,36 +14,38 @@ use rustc_hash::{
 use uuid::Uuid;
 
 #[derive(Default, Clone)]
-pub struct ParagraphElements {
-    pub paragraphs: Arc<Mutex<FxHashMap<Uuid, FxHashSet<NodeId>>>>,
-}
+pub struct ParagraphElements(FxHashMap<Uuid, FxHashSet<NodeId>>);
 
 impl ParagraphElements {
-    pub fn insert_paragraph(&self, node_id: NodeId, text_id: Uuid) {
-        let mut paragraphs = self.paragraphs.lock().unwrap();
-        let text_group = paragraphs.entry(text_id).or_default();
+    pub fn insert_paragraph(&mut self, node_id: NodeId, text_id: Uuid) {
+        let text_group = self.0.entry(text_id).or_default();
 
         text_group.insert(node_id);
     }
 
-    pub fn paragraphs(&self) -> MutexGuard<FxHashMap<Uuid, FxHashSet<NodeId>>> {
-        self.paragraphs.lock().unwrap()
-    }
-
-    pub fn remove_paragraph(&self, node_id: NodeId, text_id: &Uuid) {
-        let mut paragraphs = self.paragraphs.lock().unwrap();
-        let text_group = paragraphs.get_mut(text_id);
+    pub fn remove_paragraph(&mut self, node_id: NodeId, text_id: &Uuid) {
+        let text_group = self.0.get_mut(text_id);
 
         if let Some(text_group) = text_group {
             text_group.retain(|id| *id != node_id);
 
             if text_group.is_empty() {
-                paragraphs.remove(text_id);
+                self.0.remove(text_id);
             }
         }
     }
+}
+
+impl Deref for ParagraphElements {
+    type Target = FxHashMap<Uuid, FxHashSet<NodeId>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
 
-    pub fn len_paragraphs(&self) -> usize {
-        self.paragraphs.lock().unwrap().len()
+impl DerefMut for ParagraphElements {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }

crates/components/src/graph.rs

@@ -4,6 +4,7 @@ use freya_engine::prelude::*;
 use freya_hooks::{
     use_applied_theme,
     use_canvas_with_deps,
+    use_node_signal,
     use_platform,
     GraphTheme,
     GraphThemeWith,
@@ -45,13 +46,12 @@ pub struct GraphProps {
 #[allow(non_snake_case)]
 pub fn Graph(props: GraphProps) -> Element {
     let platform = use_platform();
+    let (reference, size) = use_node_signal();
     let GraphTheme { width, height } = use_applied_theme!(&props.theme, graph);
 
-    use_effect(use_reactive(&props, move |_| {
+    let canvas = use_canvas_with_deps(&props, move |props| {
+        platform.invalidate_drawing_area(size.peek().area);
         platform.request_animation_frame();
-    }));
-
-    let canvas = use_canvas_with_deps(&props, |props| {
         Box::new(move |ctx: &mut CanvasRunnerContext| {
             ctx.canvas.translate((ctx.area.min_x(), ctx.area.min_y()));
 
@@ -165,6 +165,7 @@ pub fn Graph(props: GraphProps) -> Element {
             background: "white",
             rect {
                 canvas_reference: canvas.attribute(),
+                reference,
                 width: "100%",
                 height: "100%",
             }

crates/components/src/slider.rs

@@ -13,7 +13,6 @@ use freya_hooks::{
     use_platform,
     SliderThemeWith,
 };
-use tracing::info;
 use winit::window::CursorIcon;
 
 /// Properties for the [`Slider`] component.
@@ -33,10 +32,12 @@ pub struct SliderProps {
 #[inline]
 fn ensure_correct_slider_range(value: f64) -> f64 {
     if value < 0.0 {
-        info!("Slider value is less than 0.0, setting to 0.0");
+        #[cfg(debug_assertions)]
+        tracing::info!("Slider value is less than 0.0, setting to 0.0");
         0.0
     } else if value > 100.0 {
-        info!("Slider value is greater than 100.0, setting to 100.0");
+        #[cfg(debug_assertions)]
+        tracing::info!("Slider value is greater than 100.0, setting to 100.0");
         100.0
     } else {
         value

crates/core/Cargo.toml

@@ -17,6 +17,7 @@ features = ["freya-engine/mocked-engine"]
 [features]
 shared = []
 skia-engine = ["freya-engine/skia-engine"]
+fade-cached-incremental-areas = []
 
 [dependencies]
 freya-node-state = { workspace = true }