diff --git a/Cargo.lock b/Cargo.lock index 1f80fa371..1b9a6e3fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,6 +42,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + [[package]] name = "ash" version = "0.33.3+1.2.191" @@ -596,7 +602,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16cb54cd28cb3d2e964d9444ca185676a94fd9b7cce5f02b22c717947ed8e9a2" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", +] + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec 0.7.2", ] [[package]] @@ -755,8 +770,7 @@ dependencies = [ [[package]] name = "moscato" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8372f6cdc8b2c431750a9c4edbc8d9c511ef1a68472aaa02500493414a407c64" +source = "git+https://github.com/dfrg/pinot#59db153ff83420449a909dfaace18466bddbf814" dependencies = [ "pinot", ] @@ -954,7 +968,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f00543608fb5ee6063f5ff1259246ae23073c1a5e413e643d0469da3d4b7b4de" dependencies = [ - "kurbo", + "kurbo 0.7.1", "unic-bidi", ] @@ -1012,7 +1026,7 @@ version = "0.1.0" dependencies = [ "bytemuck", "clap", - "kurbo", + "kurbo 0.7.1", "piet-gpu", "piet-gpu-hal", "rand", @@ -1031,8 +1045,8 @@ name = "piet-scene" version = "0.1.0" dependencies = [ "bytemuck", + "kurbo 0.8.3", "moscato", - "pinot", "smallvec", ] diff --git a/piet-scene/Cargo.toml b/piet-scene/Cargo.toml index df66483e3..e80cbb826 100644 --- a/piet-scene/Cargo.toml +++ b/piet-scene/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] bytemuck = { version = "1.7.2", features = ["derive"] } smallvec = "1.8.0" -pinot = "0.1.5" -moscato = "0.1.2" +moscato = { git = "https://github.com/dfrg/pinot" } +kurbo = { version = "0.8.3", optional = true } diff --git a/piet-scene/src/glyph/mod.rs b/piet-scene/src/glyph/mod.rs index 3bfa36ce6..690873cdf 100644 --- a/piet-scene/src/glyph/mod.rs +++ b/piet-scene/src/glyph/mod.rs @@ -14,7 +14,7 @@ // // Also licensed under MIT license, at your choice. -pub use pinot; +pub use moscato::pinot; use crate::brush::{Brush, Color}; use crate::geometry::Affine; diff --git a/piet-scene/src/lib.rs b/piet-scene/src/lib.rs index a72ff5425..8f436b20c 100644 --- a/piet-scene/src/lib.rs +++ b/piet-scene/src/lib.rs @@ -20,3 +20,103 @@ pub mod glyph; pub mod path; pub mod resource; pub mod scene; + +/// Implement conversions to and from Kurbo types when the `kurbo` feature is +/// enabled. +#[cfg(feature = "kurbo")] +mod kurbo_conv { + use super::geometry::{Affine, Point, Rect}; + use super::path::Element; + + impl Point { + /// Creates a new point from the equivalent kurbo type. + pub fn from_kurbo(point: kurbo::Point) -> Self { + Self::new(point.x as f32, point.y as f32) + } + } + + impl From for kurbo::Point { + fn from(p: Point) -> kurbo::Point { + Self::new(p.x as f64, p.y as f64) + } + } + + impl Affine { + /// Creates a new affine transformation from the equivalent kurbo type. + pub fn from_kurbo(affine: kurbo::Affine) -> Self { + let c = affine.as_coeffs(); + Self { + xx: c[0] as f32, + yx: c[1] as f32, + xy: c[2] as f32, + yy: c[3] as f32, + dx: c[4] as f32, + dy: c[5] as f32, + } + } + } + + impl From for kurbo::Affine { + fn from(a: Affine) -> Self { + Self::new([ + a.xx as f64, + a.yx as f64, + a.yx as f64, + a.yy as f64, + a.dx as f64, + a.dy as f64, + ]) + } + } + + impl Rect { + /// Creates a new rectangle from the equivalent kurbo type. + pub fn from_kurbo(rect: kurbo::Rect) -> Self { + Self { + min: Point::new(rect.x0 as f32, rect.y0 as f32), + max: Point::new(rect.x1 as f32, rect.y1 as f32), + } + } + } + + impl From for kurbo::Rect { + fn from(r: Rect) -> Self { + Self { + x0: r.min.x as f64, + y0: r.min.y as f64, + x1: r.max.x as f64, + y1: r.max.y as f64, + } + } + } + + impl Element { + /// Creates a new path element from the equivalent kurbo type. + pub fn from_kurbo(el: kurbo::PathEl) -> Self { + use kurbo::PathEl::*; + use Point::from_kurbo; + match e { + MoveTo(p0) => Self::MoveTo(from_kurbo(p0)), + LineTo(p0) => Self::LineTo(from_kurbo(p0)), + QuadTo(p0, p1) => Self::QuadTo(from_kurbo(p0), from_kurbo(p1)), + CurveTo(p0, p1, p2) => { + Self::CurveTo(from_kurbo(p0), from_kurbo(p1), from_kurbo(p2)) + } + ClosePath => Self::Close, + } + } + } + + impl From for kurbo::PathEl { + fn from(e: Element) -> Self { + use Element::*; + match e { + MoveTo(p0) => Self::MoveTo(p0.into()), + LineTo(p0) => Self::LineTo(p0.into()), + QuadTo(p0, p1) => Self::QuadTo(p0.into(), p1.into()), + CurveTo(p0, p1, p2) => Self::CurveTo(p0.into(), p1.into(), p2.into()), + Close => Self::ClosePath, + } + } + } +} diff --git a/piet-scene/src/scene/blend.rs b/piet-scene/src/scene/blend.rs index 7edc6cd69..d6aa080d4 100644 --- a/piet-scene/src/scene/blend.rs +++ b/piet-scene/src/scene/blend.rs @@ -34,6 +34,8 @@ pub enum Mix { Saturation = 13, Color = 14, Luminosity = 15, + // Clip is the same as normal, but doesn't always push a blend group. + Clip = 128, } /// Defines the layer composition function for a blend operation. @@ -53,8 +55,7 @@ pub enum Compose { DestAtop = 10, Xor = 11, Plus = 12, - PlusDarker = 13, - PlusLighter = 14, + PlusLighter = 13, } /// Blend mode consisting of mixing and composition functions. @@ -77,7 +78,7 @@ impl Blend { impl Default for Blend { fn default() -> Self { Self { - mix: Mix::Normal, + mix: Mix::Clip, compose: Compose::SrcOver, } } diff --git a/piet-scene/src/scene/builder.rs b/piet-scene/src/scene/builder.rs index 85d75b22f..8aa1bf52b 100644 --- a/piet-scene/src/scene/builder.rs +++ b/piet-scene/src/scene/builder.rs @@ -23,12 +23,14 @@ use core::borrow::Borrow; const MAX_BLEND_STACK: usize = 256; -/// Creates a new builder for constructing a scene. -pub fn build_scene<'a>(scene: &'a mut Scene, resources: &'a mut ResourceContext) -> Builder<'a> { - Builder::new(&mut scene.data, ResourceData::Scene(resources)) +/// Creates a new builder for filling a scene. Any current content in the scene +/// will be cleared. +pub fn build_scene<'a>(scene: &'a mut Scene, rcx: &'a mut ResourceContext) -> Builder<'a> { + Builder::new(&mut scene.data, ResourceData::Scene(rcx)) } -/// Creates a new builder for construction a scene fragment. +/// Creates a new builder for filling a scene fragment. Any current content in +/// the fragment will be cleared. pub fn build_fragment<'a>(fragment: &'a mut Fragment) -> Builder<'a> { Builder::new( &mut fragment.data, diff --git a/piet-scene/src/scene/mod.rs b/piet-scene/src/scene/mod.rs index 9f7be2f6d..577f81eb4 100644 --- a/piet-scene/src/scene/mod.rs +++ b/piet-scene/src/scene/mod.rs @@ -23,11 +23,12 @@ pub use builder::{build_fragment, build_scene, Builder}; pub use style::*; use super::brush::*; -use super::geometry::{Affine, Point, Rect}; +use super::geometry::{Affine, Point}; use super::path::Element; use core::ops::Range; +/// Raw data streams describing an encoded scene. #[derive(Default)] pub struct SceneData { pub transform_stream: Vec, @@ -83,6 +84,7 @@ pub struct Scene { } impl Scene { + /// Returns the raw encoded scene data streams. pub fn data(&self) -> &SceneData { &self.data } @@ -96,6 +98,8 @@ pub struct Fragment { } impl Fragment { + /// Returns the underlying stream of points that defined all encoded path + /// segments. pub fn points(&self) -> &[Point] { bytemuck::cast_slice(&self.data.pathseg_stream) }