update flake

.envrc

@@ -0,0 +1 @@
+use flake .

.gitignore

@@ -4,3 +4,4 @@ Cargo.lock
 **/*.rs.bk
 *.pdb
 rustc-ice-*.txt
+.direnv

flake.lock

@@ -0,0 +1,101 @@
+{
+  "nodes": {
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1725172314,
+        "narHash": "sha256-BtLY9lWu/pe6/ImFwuRRRqMwLacY5AZOKA2hUHUQ64k=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "28b42d01f549c38bd165296fbcb4fe66d98fc24f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "monthly",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1725534445,
+        "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "fenix": "fenix",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1725630423,
+        "narHash": "sha256-gNCLk3Zg7JlAwmWbVHTH6f3+iqdeQ4fheOotCZy8x5M=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "08c7bbc2dbe4dcc8968484f1a0e1e6fe7a1d4f6d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,51 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    fenix = {
+      url = "github:nix-community/fenix/monthly";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  outputs = { self, nixpkgs, flake-utils, fenix }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      devShell = pkgs.mkShell.override {
+        stdenv = if pkgs.stdenv.isLinux then
+          pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv
+        else
+          pkgs.clangStdenv;
+      } rec {
+        packages = with pkgs; [
+          (fenix.packages.${system}.complete.withComponents [
+            "cargo"
+            "rustc"
+            "rust-src"
+            "rustfmt"
+            "rust-analyzer"
+            "clippy"
+          ])
+          pkg-config
+          cmake
+        ];
+        buildInputs = with pkgs; [
+          wayland
+          xorg.libxcb
+          libxkbcommon
+          vulkan-tools
+          vulkan-headers
+          vulkan-loader
+          libGL
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
+          xorg.libXrandr
+          glslang
+        ];
+        LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
+        # RUSTFLAGS = "-Zthreads=8"; (causes rustc to ICE)
+        MANGOHUD_DLSYM = "1"; # mangohud glium fix
+      };
+    });
+}

hui-examples/Cargo.toml

@@ -7,9 +7,10 @@ publish = false
 
 [dev-dependencies]
 hui = { path = "../hui" }
+hui-painter = { path = "../hui-painter" }
 hui-glium = { path = "../hui-glium" }
 hui-winit = { path = "../hui-winit" }
-kubi-logging = { git = "https://github.com/griffi-gh/kubi", rev = "c162893fd" }
+kubi-logging = { git = "https://github.com/griffi-gh/kubi", rev = "be1e24ba0c9e6d24128e7d0e74bebd8b90c23be7" }
 glium = "0.35"
 winit = "0.30"
 glam = "0.28"

hui-examples/boilerplate.rs

@@ -53,6 +53,9 @@ pub fn ui<T>(
         WindowEvent::CloseRequested => {
           window_target.exit();
         },
+        WindowEvent::Resized(size) => {
+          display.resize((size.width, size.height));
+        },
         WindowEvent::RedrawRequested => {
           let mut frame = display.draw();
           frame.clear_color_srgb(0.5, 0.5, 0.5, 1.);

hui-painter/Cargo.toml

@@ -21,3 +21,4 @@ log = "0.4"
 rect_packer = "0.2" # TODO: use sth else like `crunch` instead?
 hashbrown = "0.14"
 nohash-hasher = "0.2"
+fontdue = "0.9"

hui-painter/src/lib.rs

@@ -1,11 +1,14 @@
 pub mod paint;
 pub mod texture;
+pub mod text;
 
+use text::FontManager;
 use texture::TextureAtlas;
 
 #[derive(Default)]
 pub struct Painter {
-  atlas: TextureAtlas,
+  pub atlas: TextureAtlas,
+  pub fonts: FontManager,
 }
 
 impl Painter {
@@ -13,7 +16,19 @@ impl Painter {
     Self::default()
   }
 
-  pub fn atlas(&self) -> &TextureAtlas {
-    &self.atlas
-  }
+  // pub fn atlas(&self) -> &TextureAtlas {
+  //   &self.atlas
+  // }
+
+  // pub fn atlas_mut(&mut self) -> &mut TextureAtlas {
+  //   &mut self.atlas
+  // }
+
+  // pub fn fonts(&self) -> &FontManager {
+  //   &self.fonts
+  // }
+
+  // pub fn fonts_mut(&mut self) -> &mut FontManager {
+  //   &mut self.fonts
+  // }
 }

hui-painter/src/paint/command.rs

@@ -1,4 +1,8 @@
-use crate::paint::buffer::PaintBuffer;
+use glam::Vec2;
+use crate::{paint::buffer::PaintBuffer, Painter};
+
+// mod root;
+// pub use root::RootCommand;
 
 mod transform;
 pub use transform::PaintTransform;
@@ -10,5 +14,20 @@ mod text;
 pub use text::PaintText;
 
 pub trait PaintCommand {
-  fn paint(&self, into: &mut PaintBuffer);
+  /// Called before actual paint command is executed\
+  /// Opportunity to pre-cache bitmaps, etc.
+  ///
+  /// Make sure to propagate this call to children!
+  #[allow(unused_variables)]
+  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 Painter, into: &mut PaintBuffer);
+}
+
+pub trait Measurable: PaintCommand {
+  fn size(&self, ctx: &Painter) -> Vec2;
 }

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

@@ -1,16 +1,37 @@
-use glam::{Vec2, vec2};
+use std::num::NonZeroU16;
+use glam::{vec2, Vec2, Vec4};
 use hui_shared::{color, rect::{Corners, FillColor}};
-use crate::paint::{
-  buffer::PaintBuffer,
-  command::PaintCommand,
+use crate::{
+  paint::{
+    buffer::{PaintBuffer, Vertex},
+    command::PaintCommand,
+  },
+  texture::TextureHandle,
+  Painter
 };
 
+/// Calculate the number of points based on the maximum corner radius
+fn point_count(corners: Corners<f32>) -> NonZeroU16 {
+  //Increase for higher quality
+  const VTX_PER_CORER_RADIUS_PIXEL: f32 = 0.5;
+  NonZeroU16::new(
+    (corners.max_f32() * VTX_PER_CORER_RADIUS_PIXEL).round() as u16 + 2
+  ).unwrap()
+}
+
 pub struct PaintRectangle {
   /// Color of the rectangle.
   pub color: FillColor,
 
+  /// Size of the rectangle.
+  ///
+  /// (Only different from using transform if the rectangle has border radius.)
+  pub size: Vec2,
+
   /// Texture to use for the rectangle.
-  pub texture: Option<u32>,
+  ///
+  /// Invalid handles will be ignored.
+  pub texture: Option<TextureHandle>,
 
   /// UV coords inside the texture
   pub texture_uv: Corners<Vec2>,
@@ -18,14 +39,20 @@ pub struct PaintRectangle {
   /// Border width.
   pub border_radius: Corners<f32>,
 
-  /// Border color.
-  pub border_radius_points_override: Option<f32>,
+  // TODO per-corner border radius point count override
+
+  /// Border radius point count.
+  ///
+  /// - If not set, it will be calculated based on the maximum radius.
+  /// - If set, it will be used for all corners.
+  pub border_radius_points_override: Option<NonZeroU16>,
 }
 
 impl Default for PaintRectangle {
   fn default() -> Self {
     Self {
       color: color::WHITE.into(),
+      size: Vec2::ONE,
       texture: None,
       texture_uv: Corners {
         top_left: vec2(0., 0.),
@@ -39,8 +66,213 @@ impl Default for PaintRectangle {
   }
 }
 
-impl PaintCommand for PaintRectangle {
-  fn paint(&self, into: &mut PaintBuffer) {
-    todo!()
+impl PaintRectangle {
+  pub fn from_color(color: impl Into<FillColor>) -> Self {
+    Self {
+      color: color.into(),
+      ..Default::default()
+    }
+  }
+
+  pub fn from_texture(texture: TextureHandle) -> Self {
+    Self {
+      texture: Some(texture),
+      color: color::WHITE.into(),
+      ..Default::default()
+    }
+  }
+
+  pub fn from_texture_color(texture: TextureHandle, color: impl Into<FillColor>) -> Self {
+    Self {
+      texture: Some(texture),
+      color: color.into(),
+      ..Default::default()
+    }
+  }
+}
+
+impl PaintCommand for PaintRectangle {
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
+    // If texture is set:
+    // - Get texture UV
+    // - Map local UVs to texture UV coords
+    // Otherwise, if texture handle is not set or invalid, use the bottom left
+    // corner of the texture which contains a white pixel.
+    let uvs = self.texture
+      .map(|handle| ctx.atlas.get_uv(handle))
+      .flatten()
+      .map(|global_uv| {
+        let texture_uv = self.texture_uv;
+        let texture_uv_is_default =
+          texture_uv.top_left == vec2(0., 0.) &&
+          texture_uv.top_right == vec2(1., 0.) &&
+          texture_uv.bottom_left == vec2(0., 1.) &&
+          texture_uv.bottom_right == vec2(1., 1.);
+
+        if texture_uv_is_default {
+          global_uv
+        } else {
+          let top = global_uv.top_left
+            .lerp(global_uv.top_right, texture_uv.top_left.x);
+          let bottom = global_uv.bottom_left
+            .lerp(global_uv.bottom_right, texture_uv.top_left.x);
+          let top_left = top
+            .lerp(bottom, texture_uv.top_left.y);
+
+          let top = global_uv.top_left
+            .lerp(global_uv.top_right, texture_uv.top_right.x);
+          let bottom = global_uv.bottom_left
+            .lerp(global_uv.bottom_right, texture_uv.top_right.x);
+          let top_right = top
+            .lerp(bottom, texture_uv.top_right.y);
+
+          let top = global_uv.top_left
+            .lerp(global_uv.top_right, texture_uv.bottom_left.x);
+          let bottom = global_uv.bottom_left
+            .lerp(global_uv.bottom_right, texture_uv.bottom_left.x);
+          let bottom_left = top
+            .lerp(bottom, texture_uv.bottom_left.y);
+
+          let top = global_uv.top_left
+            .lerp(global_uv.top_right, texture_uv.bottom_right.x);
+          let bottom = global_uv.bottom_left
+            .lerp(global_uv.bottom_right, texture_uv.bottom_right.x);
+          let bottom_right = top
+            .lerp(bottom, texture_uv.bottom_right.y);
+
+          Corners { top_left, top_right, bottom_left, bottom_right }
+        }
+      })
+      .unwrap_or(Corners::all(Vec2::ZERO)); // For non-textured rectangles
+
+    // Get corner colors
+    let colors = self.color.corners();
+
+    // Get the base index for the vertices
+    let idx_base = into.vertices.len() as u32;
+
+    if self.border_radius.max_f32() == 0. {
+      // No border radius:
+      // Draw a simple quad (2 tris)
+      let indices = Corners {
+        top_left: idx_base + 0,
+        top_right: idx_base + 1,
+        bottom_left: idx_base + 2,
+        bottom_right: idx_base + 3,
+      };
+      into.indices.extend([
+        indices.top_left,  indices.bottom_left, indices.top_right,
+        indices.top_right, indices.bottom_left, indices.bottom_right,
+      ]);
+      into.vertices.extend([
+        Vertex {
+          position: vec2(0., 0.) * self.size,
+          uv: uvs.top_left,
+          color: colors.top_left,
+        },
+        Vertex {
+          position: vec2(1., 0.) * self.size,
+          uv: uvs.top_right,
+          color: colors.top_right,
+        },
+        Vertex {
+          position: vec2(0., 1.) * self.size,
+          uv: uvs.bottom_left,
+          color: colors.bottom_left,
+        },
+        Vertex {
+          position: vec2(1., 1.) * self.size,
+          uv: uvs.bottom_right,
+          color: colors.bottom_right,
+        },
+      ]);
+    } else {
+      // Yes border radius :3
+      // Draw a rounded rectangle with the given border radius and point count
+
+      let point_count = self.border_radius_points_override
+        .unwrap_or(point_count(self.border_radius))
+        .get();
+
+      // Get vertex for a point in scaled pixel space
+      let point_impl = |point: Vec2| {
+        let point_uv = point / self.size;
+        let color_at_point =
+          colors.bottom_right * point_uv.x * point_uv.y +
+          colors.top_right * point_uv.x * (1. - point_uv.y) +
+          colors.bottom_left * (1. - point_uv.x) * point_uv.y +
+          colors.top_left * (1. - point_uv.x) * (1. - point_uv.y);
+        let uv_at_point =
+          uvs.bottom_right * point_uv.x * point_uv.y +
+          uvs.top_right * point_uv.x * (1. - point_uv.y) +
+          uvs.bottom_left * (1. - point_uv.x) * point_uv.y +
+          uvs.top_left * (1. - point_uv.x) * (1. - point_uv.y);
+        Vertex {
+          position: point,
+          color: color_at_point,
+          uv: uv_at_point,
+        }
+      };
+
+      into.vertices.reserve(point_count as usize * 4);
+      into.indices.reserve((point_count as usize - 1) * 12 * 4);
+
+      for i in 0..point_count as u32 {
+        let frac = i as f32 / (point_count - 1) as f32;
+        let angle = frac * std::f32::consts::PI * 0.5;
+        let x = angle.sin();
+        let y = angle.cos();
+        into.vertices.extend([
+          point_impl(vec2(x, 1. - y) * self.border_radius.top_right + vec2(self.size.x - self.border_radius.top_right, 0.)),
+          point_impl(vec2(x - 1., y) * self.border_radius.bottom_right + vec2(self.size.x, self.size.y - self.border_radius.bottom_right)),
+          point_impl(vec2(1. - x, y) * self.border_radius.bottom_left + vec2(0., self.size.y - self.border_radius.bottom_left)),
+          point_impl(vec2(1. - x, 1. - y) * self.border_radius.top_left),
+        ]);
+        if i > 0 {
+          // mental illness:
+          into.indices.extend([
+            //Top-right corner
+            idx_base,
+            idx_base + 1 + (i - 1) * 4,
+            idx_base + 1 + i * 4,
+            //Bottom-right corner
+            idx_base,
+            idx_base + 1 + (i - 1) * 4 + 1,
+            idx_base + 1 + i * 4 + 1,
+            //Bottom-left corner
+            idx_base,
+            idx_base + 1 + (i - 1) * 4 + 2,
+            idx_base + 1 + i * 4 + 2,
+            //Top-left corner
+            idx_base,
+            idx_base + 1 + (i - 1) * 4 + 3,
+            idx_base + 1 + i * 4 + 3,
+          ]);
+        }
+
+        //Fill in the rest
+        //mental illness 2:
+        into.indices.extend([
+          //Top
+          idx_base,
+          idx_base + 4,
+          idx_base + 1,
+          //Right?, i think
+          idx_base,
+          idx_base + 1 + (point_count as u32 - 1) * 4,
+          idx_base + 1 + (point_count as u32 - 1) * 4 + 1,
+          //Left???
+          idx_base,
+          idx_base + 1 + (point_count as u32 - 1) * 4 + 2,
+          idx_base + 1 + (point_count as u32 - 1) * 4 + 3,
+          //Bottom???
+          idx_base,
+          idx_base + 3,
+          idx_base + 2,
+        ]);
+      }
+
+      unimplemented!("Border radius is not supported yet");
+    }
   }
 }

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

@@ -1,14 +1,97 @@
-use crate::paint::{
-  buffer::PaintBuffer,
-  command::PaintCommand,
+use std::{borrow::Cow, sync::Arc};
+use fontdue::layout::{self, CoordinateSystem, GlyphRasterConfig, Layout};
+use glam::{vec2, Vec2};
+use crate::{
+  paint::{
+    buffer::PaintBuffer,
+    command::PaintCommand,
+  }, text::FontHandle, Painter
 };
 
+use super::Measurable;
+
+// TODO align, multichunk etc
+
+pub struct TextChunk {
+  pub text: Cow<'static, str>,
+  pub font: FontHandle,
+  pub size: f32,
+}
+
 pub struct PaintText {
-  //TODO: PaintText command
+  // TODO multiple text chunks
+  pub text: TextChunk,
+}
+
+impl PaintText {
+  pub fn new(text: impl Into<Cow<'static, str>>, font: FontHandle, size: f32) -> Self {
+    Self {
+      text: TextChunk {
+        text: text.into(),
+        font,
+        size,
+      }
+    }
+  }
+
+  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]
+  }
+
+  fn build_layout(&self, font_array: &[&fontdue::Font]) -> Layout {
+    let mut layout = Layout::new(CoordinateSystem::PositiveYDown);
+    layout.append(
+      &font_array,
+      &fontdue::layout::TextStyle::new(
+        &self.text.text,
+        self.text.size,
+        0
+      )
+    );
+    layout
+  }
 }
 
 impl PaintCommand for PaintText {
-  fn paint(&self, into: &mut PaintBuffer) {
+  fn pre_paint(&self, ctx: &mut Painter) {
+    let font_array = self.build_font_array(ctx);
+    let layout = self.build_layout(&font_array);
+
+    for glyph in layout.glyphs() {
+      ctx.fonts.render_glyph(&mut ctx.atlas, self.text.font, glyph.key);
+    }
+  }
+
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
+    // let font_array = self.build_font_array(ctx);
+    // let layout = self.build_layout(&font_array);
+
+    // for glyph in layout.glyphs() {
+    //   let config = GlyphRasterConfig {
+    //     glyph_index: glyph.font_index
+    //   };
+    //   let glyph_raster = ctx.fonts().render_glyph(atlas, font, config);
+    // }
+
     todo!()
   }
 }
+
+impl Measurable for PaintText {
+  fn size(&self, ctx: &Painter) -> Vec2 {
+    let font_array = self.build_font_array(ctx);
+    let layout = self.build_layout(&font_array);
+
+    let width = layout.lines().map(|lines| {
+      lines.iter().fold(0.0_f32, |acc, x| {
+        let glyph = layout.glyphs().get(x.glyph_end).unwrap();
+        acc.max(glyph.x + glyph.width as f32)
+      })
+    }).unwrap_or(0.);
+    let height = layout.height();
+
+    vec2(width, height)
+  }
+}

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

@@ -1,29 +1,47 @@
-use crate::paint::{
-  buffer::PaintBuffer,
-  command::PaintCommand,
+use crate::{
+  Painter,
+  paint::{
+    buffer::PaintBuffer,
+    command::PaintCommand,
+  },
 };
 
-//TODO: use generics instead
-
 pub struct PaintTransform {
   pub transform: glam::Affine2,
   pub children: Vec<Box<dyn PaintCommand>>,
 }
 
 impl PaintCommand for PaintTransform {
-  fn paint(&self, into: &mut PaintBuffer) {
+  fn pre_paint(&self, ctx: &mut Painter) {
+    for child in &self.children {
+      child.pre_paint(ctx);
+    }
+  }
+
+  fn paint(&self, ctx: &mut Painter, into: &mut PaintBuffer) {
     // remember the starting index
     let starting_index = into.vertices.len();
 
     // paint children nodes
     for child in &self.children {
-      child.paint(into);
+      child.paint(ctx, into);
+    }
+
+    let mut min_point = glam::Vec2::splat(f32::MAX);
+    let mut max_point = glam::Vec2::splat(f32::MIN);
+    for vtx in &into.vertices[starting_index..] {
+      min_point = min_point.min(vtx.position);
+      max_point = max_point.max(vtx.position);
     }
 
     // trans the children in-place
     for vtx in &mut into.vertices[starting_index..] {
-      //TODO fix for rotation around the center of the object
+      //HACK: to match the old behavior:
+      //(shift the origin to the center before transforming)
+      let offset = (max_point + min_point) / 2.0;
+      vtx.position -= offset;
       vtx.position = self.transform.transform_point2(vtx.position);
+      vtx.position += offset;
     }
   }
 }

hui-painter/src/text.rs

@@ -0,0 +1,69 @@
+use fontdue::layout::GlyphRasterConfig;
+use crate::texture::{TextureAtlas, TextureHandle};
+
+pub(crate) mod ftm;
+pub(crate) mod font;
+
+pub use font::FontHandle;
+
+pub struct FontManager {
+  fonts: font::FontHandleManager,
+  ftm: ftm::FontTextureManager,
+}
+
+impl FontManager {
+  pub fn new() -> Self {
+    Self {
+      fonts: font::FontHandleManager::new(),
+      ftm: ftm::FontTextureManager::new(),
+    }
+  }
+
+  /// Add a font to the manager.
+  ///
+  /// Panics:
+  /// - If the font data is invalid.
+  pub fn add_font(&mut self, data: &[u8]) -> FontHandle {
+    let font = self.fonts.add_font(data);
+    self.ftm.init_font(font);
+    font
+  }
+
+  /// Remove and deallocate a font from the manager.
+  ///
+  /// Panics:
+  /// - If the font handle is invalid.
+  pub fn remove_font(&mut self, font: FontHandle, atlas: &mut TextureAtlas) {
+    self.ftm.drop_font(font, atlas);
+    self.fonts.remove_font(font);
+  }
+
+  /// Render a glyph and cache it in the texture atlas.
+  ///
+  /// Panics:
+  /// - If the font handle is invalid or not initialized.
+  /// - Fuck around and find out, this api is unstable
+  pub(crate) fn render_glyph(
+    &mut self,
+    atlas: &mut TextureAtlas,
+    font: FontHandle,
+    config: GlyphRasterConfig
+  ) -> TextureHandle {
+    self.ftm.render_glyph(font, &self.fonts, config, atlas)
+  }
+
+  /// Internal API
+  pub(crate) fn get_fontdue_font(
+    &self,
+    handle: FontHandle
+  ) -> Option<&fontdue::Font> {
+    self.fonts.get_font_repr(handle)
+      .map(|x| &x.font)
+  }
+}
+
+impl Default for FontManager {
+  fn default() -> Self {
+    Self::new()
+  }
+}

hui-painter/src/text/font.rs

@@ -0,0 +1,52 @@
+use hashbrown::HashMap;
+use nohash_hasher::BuildNoHashHasher;
+
+pub(crate) type FontId = u16;
+
+#[derive(Clone, Copy)]
+pub struct FontHandle(pub(crate) FontId);
+
+pub(crate) struct FontRepr {
+  pub(crate) font: fontdue::Font,
+}
+
+pub struct FontHandleManager {
+  idc: FontId,
+  fonts: HashMap<FontId, FontRepr,BuildNoHashHasher<FontId>>,
+}
+
+impl FontHandleManager {
+  pub fn new() -> Self {
+    Self {
+      idc: 0,
+      fonts: HashMap::default(),
+    }
+  }
+
+  /// Add a font to the manager.
+  ///
+  /// Panics:
+  /// - If the font data is invalid.
+  pub fn add_font(&mut self, data: &[u8]) -> FontHandle {
+    let font = fontdue::Font::from_bytes(data, fontdue::FontSettings::default()).unwrap();
+    self.fonts.insert_unique_unchecked(self.idc, FontRepr { font });
+    self.idc += 1;
+    FontHandle(self.idc - 1)
+  }
+
+  /// Internal function
+  ///
+  /// Remove and deallocate a font from the manager if the font handle is valid.
+  ///
+  /// Panics:
+  /// - If the font handle is invalid.
+  pub(crate) fn remove_font(&mut self, handle: FontHandle) {
+    self.fonts.remove(&handle.0).unwrap();
+  }
+
+  /// Get the font handle for the specified font.
+  pub(crate) fn get_font_repr(&self, handle: FontHandle) -> Option<&FontRepr> {
+    self.fonts.get(&handle.0)
+  }
+}
+

hui-painter/src/text/ftm.rs

@@ -0,0 +1,94 @@
+use fontdue::layout::GlyphRasterConfig;
+use hashbrown::HashMap;
+use nohash_hasher::BuildNoHashHasher;
+use crate::texture::{SourceTextureFormat, TextureAtlas, TextureHandle};
+use super::font::{FontHandle, FontHandleManager, FontId};
+
+/// Maps to the actual texture handle.
+struct RasterizedGlyphInternal {
+  handle: TextureHandle,
+  metrics: fontdue::Metrics,
+}
+
+/// Map from raster config to glyph cache item.
+///
+/// Partitioned by font id in FtM :3
+type PartitionKey = HashMap<GlyphRasterConfig, RasterizedGlyphInternal>;
+
+/// Manages glyph cache items in a texture atlas.
+pub struct FontTextureManager {
+  partition: HashMap<FontId, PartitionKey, BuildNoHashHasher<FontId>>,
+}
+
+impl FontTextureManager {
+  pub fn new() -> Self {
+    Self {
+      partition: HashMap::default(),
+    }
+  }
+
+  /// Drop cached data for the specified font.
+  ///
+  /// Panics:
+  /// - If the font handle is invalid or not initialized.
+  /// - If any of the cached items are not found in the texture atlas or became invalid.\
+  ///   This may happen if, for example, a different atlas is passed than the one used to allocate the items.
+  pub(crate) fn drop_font(&mut self, font: FontHandle, atlas: &mut TextureAtlas) {
+    let dump = self.partition.remove(&font.0).expect("Font handle is invalid");
+    for (_, item) in dump {
+      atlas.deallocate(item.handle);
+    }
+  }
+
+  /// Initialize the partition for the specified font.
+  ///
+  /// Panics:
+  /// - If the partition for the font already exists.
+  pub(crate) fn init_font(&mut self, font: FontHandle) {
+    assert!(!self.partition.contains_key(&font.0), "Font handle already initialized");
+    self.partition.insert_unique_unchecked(font.0, HashMap::default());
+  }
+
+  /// Render a glyph and cache it in the texture atlas.
+  ///
+  /// Panics:
+  /// - If the font handle is invalid or not initialized.
+  /// - Fuck around and find out, this api is unstable
+  pub(crate) fn render_glyph(
+    &mut self,
+    font_handle: FontHandle,
+    fhm_internal: &FontHandleManager,
+    config: GlyphRasterConfig,
+    atlas: &mut TextureAtlas
+  ) -> TextureHandle {
+    // Get partiton
+    let partition = self.partition.get_mut(&font_handle.0)
+      .expect("Font handle is not registered in FtM");
+
+    // Check if glyph is alr cached
+    if let Some(item) = partition.get(&config) {
+      return item.handle;
+    }
+
+    // Get fontdue font from the manager
+    let font = &fhm_internal.get_font_repr(font_handle)
+      .expect("Font handle is invalid")
+      .font;
+
+    // Rasterize the font and copy the texture data
+    let (metrics, data) = font.rasterize_config(config);
+    let handle = atlas.allocate_with_data(SourceTextureFormat::A8, &data, metrics.width);
+
+    // Create a texture item struct and insert it into the partition
+    let itm = RasterizedGlyphInternal { handle, metrics };
+    partition.insert_unique_unchecked(config, itm);
+
+    return handle;
+  }
+}
+
+impl Default for FontTextureManager {
+  fn default() -> Self {
+    Self::new()
+  }
+}

hui-painter/src/texture/atlas.rs

@@ -1,4 +1,5 @@
-use glam::{UVec2, uvec2, ivec2};
+use glam::{ivec2, uvec2, vec2, UVec2, Vec2};
+use hui_shared::rect::Corners;
 use rect_packer::DensePacker;
 use hashbrown::HashMap;
 use nohash_hasher::BuildNoHashHasher;
@@ -342,6 +343,22 @@ impl TextureAtlas {
 
     handle
   }
+
+  /// Get uv coordinates for the texture handle.
+  pub(crate) fn get_uv(&self, handle: TextureHandle) -> Option<Corners<Vec2>> {
+    let TextureAllocation { offset, size, .. } = self.allocations
+      .get(&handle.id)?;
+    let p0x = offset.x as f32 / self.size.x as f32;
+    let p1x = (offset.x as f32 + size.x as f32) / self.size.x as f32;
+    let p0y = offset.y as f32 / self.size.y as f32;
+    let p1y = (offset.y as f32 + size.y as f32) / self.size.y as f32;
+    Some(Corners {
+      top_left: vec2(p0x, p0y),
+      top_right: vec2(p1x, p0y),
+      bottom_left: vec2(p0x, p1y),
+      bottom_right: vec2(p1x, p1y),
+    })
+  }
 }
 
 impl Default for TextureAtlas {

hui/src/draw.rs

@@ -211,7 +211,7 @@ impl UiDrawCall {
             //TODO: fix some corners tris being invisible (but it's already close enough lol)
             let rounded_corner_verts = corner.point_count.get() as u32;
             for i in 0..rounded_corner_verts {
-              let cratio = i as f32 / rounded_corner_verts as f32;
+              let cratio = i as f32 / (rounded_corner_verts - 1) as f32;
               let angle = cratio * std::f32::consts::PI * 0.5;
               let x = angle.sin();
               let y = angle.cos();