Fix text-on-path rendering

Author: jsjgdh

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

@@ -394,7 +394,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 				center,
 			} => {
 				let mut options = usvg::Options::default();
-				options.fontdb_mut().load_font_data(include_bytes!("../../../../font.ttf").to_vec());
+				options.fontdb_mut().load_font_data(include_bytes!("../overlays/source-sans-pro-regular.ttf").to_vec());
 				options.font_family = "Source Sans Pro".to_string();
 
 				let svg = svg.replace("font-family=\"sans-serif\"", "font-family=\"Source Sans Pro\"");

node-graph/nodes/text/src/font_cache.rs

@@ -1,6 +1,7 @@
 use dyn_any::DynAny;
 use parley::fontique::Blob;
 use std::collections::HashMap;
+use std::hash::Hash;
 use std::sync::Arc;
 use serde::Deserialize;
 
@@ -37,6 +38,21 @@ impl Font {
 			font_style_to_restore: None,
 		}
 	}
+
+	pub fn named_weight(weight: u32) -> &'static str {
+		match weight {
+			100 => "Thin",
+			200 => "Extra Light",
+			300 => "Light",
+			400 => "Regular",
+			500 => "Medium",
+			600 => "Semi Bold",
+			700 => "Bold",
+			800 => "Extra Bold",
+			900 => "Black",
+			_ => "Weight",
+		}
+	}
 }
 
 impl Default for Font {
@@ -50,21 +66,32 @@ impl Default for Font {
 }
 
 /// A cache of fonts
-#[derive(Debug, Default, Clone, DynAny)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize, DynAny)]
 pub struct FontCache {
 	/// Mapping of font family name to font style name to font data
 	pub font_file_data: HashMap<Font, Arc<Vec<u8>>>,
 }
 
+impl Hash for FontCache {
+	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+		self.font_file_data.len().hash(state);
+	}
+}
+
 impl FontCache {
 	/// Get the font data for a font
 	pub fn get_data(&self, font: &Font) -> Option<Arc<Vec<u8>>> {
 		self.font_file_data.get(font).cloned()
 	}
 
 	/// Insert font data for a font
-	pub fn insert(&mut self, font: Font, data: Arc<Vec<u8>>) {
-		self.font_file_data.insert(font, data);
+	pub fn insert(&mut self, font: Font, data: impl Into<Arc<Vec<u8>>>) {
+		self.font_file_data.insert(font, data.into());
+	}
+
+	/// Check if the font data for a font is cached
+	pub fn loaded_font(&self, font: &Font) -> bool {
+		self.font_file_data.contains_key(font)
 	}
 
 	/// Check if the font data for a font is cached

node-graph/nodes/text/src/path_builder.rs

@@ -30,10 +30,15 @@ impl<Upstream: Default + 'static> PathBuilder<Upstream> {
 		}
 	}
 
+	fn point(&self, x: f32, y: f32) -> Point {
+		Point::new(x as f64, -y as f64)
+	}
+
 	pub fn draw_glyph(&mut self, glyph: &OutlineGlyph<'_>, size: f32, normalized_coords: &[NormalizedCoord], style_skew: Option<DAffine2>, final_transform: DAffine2, per_glyph_instances: bool) {
 		self.origin = final_transform.translation;
 		self.glyph_subpaths.clear();
 		self.current_segments.clear();
+		self.current_point = Point::ZERO;
 
 		let settings = DrawSettings::unhinted(Size::new(size), normalized_coords);
 		glyph.draw(settings, self).unwrap();
@@ -101,26 +106,26 @@ impl<Upstream: Default + 'static> OutlinePen for PathBuilder<Upstream> {
 			self.glyph_subpaths.push(Subpath::from_beziers(&self.current_segments, false));
 			self.current_segments.clear();
 		}
-		self.current_point = Point::new(x as f64, y as f64);
+		self.current_point = self.point(x, y);
 	}
 
 	fn line_to(&mut self, x: f32, y: f32) {
-		let p = Point::new(x as f64, y as f64);
+		let p = self.point(x, y);
 		self.current_segments.push(PathSeg::Line(kurbo::Line::new(self.current_point, p)));
 		self.current_point = p;
 	}
 
 	fn quad_to(&mut self, cx0: f32, cy0: f32, x: f32, y: f32) {
-		let p1 = Point::new(cx0 as f64, cy0 as f64);
-		let p2 = Point::new(x as f64, y as f64);
+		let p1 = self.point(cx0, cy0);
+		let p2 = self.point(x, y);
 		self.current_segments.push(PathSeg::Quad(kurbo::QuadBez::new(self.current_point, p1, p2)));
 		self.current_point = p2;
 	}
 
 	fn curve_to(&mut self, cx0: f32, cy0: f32, cx1: f32, cy1: f32, x: f32, y: f32) {
-		let p1 = Point::new(cx0 as f64, cy0 as f64);
-		let p2 = Point::new(cx1 as f64, cy1 as f64);
-		let p3 = Point::new(x as f64, y as f64);
+		let p1 = self.point(cx0, cy0);
+		let p2 = self.point(cx1, cy1);
+		let p3 = self.point(x, y);
 		self.current_segments.push(PathSeg::Cubic(kurbo::CubicBez::new(self.current_point, p1, p2, p3)));
 		self.current_point = p3;
 	}