hui-painter/src/lib.rs

@@ -1,19 +1,17 @@
 pub mod paint;
 pub mod texture;
 pub mod text;
-pub mod util;
 
 use text::FontManager;
 use texture::TextureAtlas;
 
-/// Painter instance, stores textures and fonts needed for rendering
 #[derive(Default)]
-pub struct PainterInstance {
+pub struct Painter {
   pub atlas: TextureAtlas,
   pub fonts: FontManager,
 }
 
-impl PainterInstance {
+impl Painter {
   pub fn new() -> Self {
     Self::default()
   }

hui-painter/src/paint/command.rs

@@ -1,12 +1,9 @@
 use glam::Vec2;
-use crate::{paint::buffer::PaintBuffer, PainterInstance};
+use crate::{paint::buffer::PaintBuffer, Painter};
 
 // mod root;
 // pub use root::RootCommand;
 
-mod list;
-pub use list::PaintList;
-
 mod transform;
 pub use transform::PaintTransform;
 
@@ -22,30 +19,15 @@ pub trait PaintCommand {
   ///
   /// Make sure to propagate this call to children!
   #[allow(unused_variables)]
-  fn pre_paint(&self, ctx: &mut PainterInstance) {}
+  fn pre_paint(&self, ctx: &mut Painter) {}
 
   /// Paint the command into the buffer
   ///
   /// Do not allocate new textures or cache glyphs here, use `pre_paint` instead!\
   /// (Doing this WILL lead to atlas corruption flicker for a single frame if it's forced to resize!)
-  fn paint(&self, ctx: &mut PainterInstance, into: &mut PaintBuffer);
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer);
 }
 
 pub trait Measurable: PaintCommand {
-  fn size(&self, ctx: &PainterInstance) -> Vec2;
+  fn size(&self, ctx: &Painter) -> Vec2;
 }
-
-// TODO move paint_root to PaintCommand instead of separate trait?
-
-pub trait PaintRoot: PaintCommand {
-  /// Paint the root command, calling `pre_paint` before painting
-  ///
-  /// This is a convenience method for painting the root command
-  /// Do not use this inside the `paint` method of a command!
-  fn paint_root(&self, ctx: &mut PainterInstance, into: &mut PaintBuffer) {
-    self.pre_paint(ctx);
-    self.paint(ctx, into);
-  }
-}
-
-impl<T: PaintCommand> PaintRoot for T {}

hui-painter/src/paint/command/list.rs

@@ -1,45 +0,0 @@
-use crate::PainterInstance;
-
-use super::PaintCommand;
-
-pub struct PaintList {
-  pub commands: Vec<Box<dyn PaintCommand>>,
-}
-
-impl PaintList {
-  pub fn new(commands: Vec<Box<dyn PaintCommand>>) -> Self {
-    Self {
-      commands
-    }
-  }
-
-  pub fn new_empty() -> Self {
-    Self {
-      commands: Vec::new(),
-    }
-  }
-
-  pub fn add(&mut self, command: impl PaintCommand + 'static) {
-    self.commands.push(Box::new(command));
-  }
-}
-
-impl Default for PaintList {
-  fn default() -> Self {
-    Self::new_empty()
-  }
-}
-
-impl PaintCommand for PaintList {
-  fn pre_paint(&self, ctx: &mut PainterInstance) {
-    for command in &self.commands {
-      command.pre_paint(ctx);
-    }
-  }
-
-  fn paint(&self, ctx: &mut crate::PainterInstance, into: &mut crate::paint::buffer::PaintBuffer) {
-    for command in &self.commands {
-      command.paint(ctx, into);
-    }
-  }
-}

hui-painter/src/paint/command/rectangle.rs

@@ -7,7 +7,7 @@ use crate::{
     command::PaintCommand,
   },
   texture::TextureHandle,
-  PainterInstance
+  Painter
 };
 
 /// Calculate the number of points based on the maximum corner radius
@@ -92,7 +92,7 @@ impl PaintRectangle {
 }
 
 impl PaintCommand for PaintRectangle {
-  fn paint(&self, ctx: &mut PainterInstance, into: &mut PaintBuffer) {
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
     // If texture is set:
     // - Get texture UV
     // - Map local UVs to texture UV coords

hui-painter/src/paint/command/text.rs

@@ -1,11 +1,11 @@
-use std::borrow::Cow;
+use std::{borrow::Cow, sync::Arc};
-use fontdue::layout::{CoordinateSystem, Layout};
+use fontdue::layout::{self, CoordinateSystem, GlyphRasterConfig, Layout};
 use glam::{vec2, Vec2};
 use crate::{
   paint::{
     buffer::PaintBuffer,
     command::PaintCommand,
-  }, text::FontHandle, PainterInstance
+  }, text::FontHandle, Painter
 };
 
 use super::Measurable;
@@ -34,7 +34,7 @@ impl PaintText {
     }
   }
 
-  fn build_font_array<'a>(&self, ctx: &'a PainterInstance) -> Vec<&'a fontdue::Font> {
+  fn build_font_array<'a>(&self, ctx: &'a Painter) -> Vec<&'a fontdue::Font> {
     let font = ctx.fonts.get_fontdue_font(self.text.font)
       .expect("FontHandle is invalid");
     vec![&font]
@@ -55,7 +55,7 @@ impl PaintText {
 }
 
 impl PaintCommand for PaintText {
-  fn pre_paint(&self, ctx: &mut PainterInstance) {
+  fn pre_paint(&self, ctx: &mut Painter) {
     let font_array = self.build_font_array(ctx);
     let layout = self.build_layout(&font_array);
 
@@ -64,7 +64,7 @@ impl PaintCommand for PaintText {
     }
   }
 
-  fn paint(&self, ctx: &mut PainterInstance, into: &mut PaintBuffer) {
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
     // let font_array = self.build_font_array(ctx);
     // let layout = self.build_layout(&font_array);
 
@@ -80,7 +80,7 @@ impl PaintCommand for PaintText {
 }
 
 impl Measurable for PaintText {
-  fn size(&self, ctx: &PainterInstance) -> Vec2 {
+  fn size(&self, ctx: &Painter) -> Vec2 {
     let font_array = self.build_font_array(ctx);
     let layout = self.build_layout(&font_array);
 

hui-painter/src/paint/command/transform.rs

@@ -1,27 +1,31 @@
 use crate::{
-  PainterInstance,
+  Painter,
   paint::{
     buffer::PaintBuffer,
     command::PaintCommand,
   },
 };
 
-pub struct PaintTransform<T: PaintCommand + 'static> {
+pub struct PaintTransform {
   pub transform: glam::Affine2,
-  pub child: T,
+  pub children: Vec<Box<dyn PaintCommand>>,
 }
 
-impl<T: PaintCommand + 'static> PaintCommand for PaintTransform<T> {
+impl PaintCommand for PaintTransform {
-  fn pre_paint(&self, ctx: &mut PainterInstance) {
+  fn pre_paint(&self, ctx: &mut Painter) {
-    self.child.pre_paint(ctx);
+    for child in &self.children {
+      child.pre_paint(ctx);
+    }
   }
 
-  fn paint(&self, ctx: &mut PainterInstance, into: &mut PaintBuffer) {
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
     // remember the starting index
     let starting_index = into.vertices.len();
 
-    // paint children node
+    // paint children nodes
-    self.child.paint(ctx, into);
+    for child in &self.children {
+      child.paint(ctx, into);
+    }
 
     let mut min_point = glam::Vec2::splat(f32::MAX);
     let mut max_point = glam::Vec2::splat(f32::MIN);

hui-painter/src/text.rs

@@ -23,7 +23,7 @@ impl FontManager {
   ///
   /// Panics:
   /// - If the font data is invalid.
-  pub fn add(&mut self, data: &[u8]) -> FontHandle {
+  pub fn add_font(&mut self, data: &[u8]) -> FontHandle {
     let font = self.fonts.add_font(data);
     self.ftm.init_font(font);
     font
@@ -33,7 +33,7 @@ impl FontManager {
   ///
   /// Panics:
   /// - If the font handle is invalid.
-  pub fn remove(&mut self, font: FontHandle, atlas: &mut TextureAtlas) {
+  pub fn remove_font(&mut self, font: FontHandle, atlas: &mut TextureAtlas) {
     self.ftm.drop_font(font, atlas);
     self.fonts.remove_font(font);
   }

hui-painter/src/texture/atlas.rs

@@ -141,9 +141,6 @@ pub struct TextureAtlas {
   /// Deallocated allocations that can be reused, sorted by size
   //TODO: use binary heap or btreeset for reuse_allocations instead, but this works for now
   reuse_allocations: Vec<TextureAllocation>,
-
-  /// Version of the texture atlas, incremented every time the atlas is modified
-  version: u64,
 }
 
 impl TextureAtlas {
@@ -161,19 +158,9 @@ impl TextureAtlas {
       next_id: 0,
       allocations: HashMap::default(),
       reuse_allocations: Vec::new(),
-      version: 0,
     }
   }
 
-  pub fn version(&self) -> u64 {
-    self.version
-  }
-
-  fn mark_modified(&mut self) {
-    // XXX: wrapping_add? will this *ever* overflow?
-    self.version = self.version.wrapping_add(1);
-  }
-
   /// Get the next handle
   ///
   /// Does not allocate a texture associated with it
@@ -316,8 +303,6 @@ impl TextureAtlas {
         }
       }
     }
-
-    self.mark_modified();
   }
 
   /// Allocate a texture in the atlas, returning a handle to it.\

hui/Cargo.toml

@@ -18,7 +18,7 @@ include = [
 [dependencies]
 hui-derive = { version = "0.1.0-alpha.5", path = "../hui-derive", optional = true }
 hui-shared = { version = "0.1.0-alpha.5", path = "../hui-shared" }
-# hui-painter = { version = "0.1.0-alpha.5", path = "../hui-painter" }
+hui-painter = { version = "0.1.0-alpha.5", path = "../hui-painter" }
 hashbrown = "0.14"
 nohash-hasher = "0.2"
 glam = "0.28.0"