mirror of
https://github.com/penpot/penpot.git
synced 2025-07-24 07:27:25 +02:00
Merge pull request #6379 from penpot/ladybenko-10753-fills-serialization
🎉 Serialize as bytes all fill kinds
This commit is contained in:
Elena Torró
GitHub
commit
46709fb02e
11 changed files with 358 additions and 329 deletions
|
|
@ -1,118 +1,39 @@
|
|||
use skia_safe::{self as skia, Rect};
|
||||
|
||||
use super::Color;
|
||||
pub use super::Color;
|
||||
use crate::uuid::Uuid;
|
||||
|
||||
const MAX_GRADIENT_STOPS: usize = 16;
|
||||
const BASE_GRADIENT_DATA_SIZE: usize = 28;
|
||||
const RAW_GRADIENT_DATA_SIZE: usize =
|
||||
BASE_GRADIENT_DATA_SIZE + RAW_STOP_DATA_SIZE * MAX_GRADIENT_STOPS;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[repr(C)]
|
||||
pub struct RawGradientData {
|
||||
start_x: f32,
|
||||
start_y: f32,
|
||||
end_x: f32,
|
||||
end_y: f32,
|
||||
opacity: f32,
|
||||
width: f32,
|
||||
stop_count: u32,
|
||||
stops: [RawStopData; MAX_GRADIENT_STOPS],
|
||||
}
|
||||
|
||||
impl From<[u8; RAW_GRADIENT_DATA_SIZE]> for RawGradientData {
|
||||
fn from(bytes: [u8; RAW_GRADIENT_DATA_SIZE]) -> Self {
|
||||
Self {
|
||||
start_x: f32::from_le_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]),
|
||||
start_y: f32::from_le_bytes([bytes[4], bytes[5], bytes[6], bytes[7]]),
|
||||
end_x: f32::from_le_bytes([bytes[8], bytes[9], bytes[10], bytes[11]]),
|
||||
end_y: f32::from_le_bytes([bytes[12], bytes[13], bytes[14], bytes[15]]),
|
||||
opacity: f32::from_le_bytes([bytes[16], bytes[17], bytes[18], bytes[19]]),
|
||||
width: f32::from_le_bytes([bytes[20], bytes[21], bytes[22], bytes[23]]),
|
||||
stop_count: u32::from_le_bytes([bytes[24], bytes[25], bytes[26], bytes[27]]),
|
||||
// FIXME: 2025-04-22: use `array_chunks` once the next release is out
|
||||
// and we update our devenv.
|
||||
// See https://github.com/rust-lang/rust/issues/74985
|
||||
stops: bytes[28..]
|
||||
.chunks_exact(RAW_STOP_DATA_SIZE)
|
||||
.map(|chunk| RawStopData::try_from(chunk).unwrap())
|
||||
.collect::<Vec<_>>()
|
||||
.try_into()
|
||||
.unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl RawGradientData {
|
||||
pub fn start(&self) -> (f32, f32) {
|
||||
(self.start_x, self.start_y)
|
||||
}
|
||||
|
||||
pub fn end(&self) -> (f32, f32) {
|
||||
(self.end_x, self.end_y)
|
||||
}
|
||||
|
||||
pub fn opacity(&self) -> f32 {
|
||||
self.opacity
|
||||
}
|
||||
|
||||
pub fn width(&self) -> f32 {
|
||||
self.width
|
||||
}
|
||||
}
|
||||
|
||||
pub const RAW_STOP_DATA_SIZE: usize = 8;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[repr(C)]
|
||||
pub struct RawStopData {
|
||||
color: u32,
|
||||
offset: f32,
|
||||
}
|
||||
|
||||
impl RawStopData {
|
||||
pub fn color(&self) -> skia::Color {
|
||||
skia::Color::from(self.color)
|
||||
}
|
||||
|
||||
pub fn offset(&self) -> f32 {
|
||||
self.offset
|
||||
}
|
||||
}
|
||||
|
||||
impl From<[u8; RAW_STOP_DATA_SIZE]> for RawStopData {
|
||||
fn from(bytes: [u8; RAW_STOP_DATA_SIZE]) -> Self {
|
||||
Self {
|
||||
color: u32::from_le_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]),
|
||||
offset: f32::from_le_bytes([bytes[4], bytes[5], bytes[6], bytes[7]]),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: We won't need this once we use `array_chunks`. See comment above.
|
||||
impl TryFrom<&[u8]> for RawStopData {
|
||||
type Error = String;
|
||||
|
||||
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
||||
let data: [u8; RAW_STOP_DATA_SIZE] = bytes
|
||||
.try_into()
|
||||
.map_err(|_| "Invalid stop data".to_string())?;
|
||||
Ok(RawStopData::from(data))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct Gradient {
|
||||
colors: Vec<Color>,
|
||||
offsets: Vec<f32>,
|
||||
opacity: f32,
|
||||
start: (f32, f32),
|
||||
end: (f32, f32),
|
||||
opacity: u8,
|
||||
width: f32,
|
||||
colors: Vec<Color>,
|
||||
offsets: Vec<f32>,
|
||||
}
|
||||
|
||||
impl Gradient {
|
||||
pub fn new(
|
||||
start: (f32, f32),
|
||||
end: (f32, f32),
|
||||
opacity: u8,
|
||||
width: f32,
|
||||
stops: &[(Color, f32)],
|
||||
) -> Self {
|
||||
let mut gradient = Gradient {
|
||||
start,
|
||||
end,
|
||||
opacity,
|
||||
colors: vec![],
|
||||
offsets: vec![],
|
||||
width,
|
||||
};
|
||||
|
||||
gradient.add_stops(stops);
|
||||
gradient
|
||||
}
|
||||
|
||||
fn add_stops(&mut self, stops: &[(Color, f32)]) {
|
||||
let colors = stops.iter().map(|(color, _)| *color);
|
||||
let offsets = stops.iter().map(|(_, offset)| *offset);
|
||||
|
|
@ -173,52 +94,24 @@ impl Gradient {
|
|||
}
|
||||
}
|
||||
|
||||
impl From<RawGradientData> for Gradient {
|
||||
fn from(raw_gradient: RawGradientData) -> Self {
|
||||
let stops = raw_gradient
|
||||
.stops
|
||||
.iter()
|
||||
.take(raw_gradient.stop_count as usize)
|
||||
.map(|stop| (stop.color(), stop.offset()))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let mut gradient = Gradient {
|
||||
start: raw_gradient.start(),
|
||||
end: raw_gradient.end(),
|
||||
opacity: raw_gradient.opacity(),
|
||||
colors: vec![],
|
||||
offsets: vec![],
|
||||
width: raw_gradient.width(),
|
||||
};
|
||||
|
||||
gradient.add_stops(&stops);
|
||||
|
||||
gradient
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<&[u8]> for Gradient {
|
||||
type Error = String;
|
||||
|
||||
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
||||
let raw_gradient_bytes: [u8; RAW_GRADIENT_DATA_SIZE] = bytes[0..RAW_GRADIENT_DATA_SIZE]
|
||||
.try_into()
|
||||
.map_err(|_| "Invalid gradient data".to_string())?;
|
||||
let gradient = RawGradientData::from(raw_gradient_bytes).into();
|
||||
|
||||
Ok(gradient)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct ImageFill {
|
||||
id: Uuid,
|
||||
opacity: u8,
|
||||
height: i32,
|
||||
width: i32,
|
||||
height: i32,
|
||||
}
|
||||
|
||||
impl ImageFill {
|
||||
pub fn new(id: Uuid, opacity: u8, width: i32, height: i32) -> Self {
|
||||
Self {
|
||||
id,
|
||||
opacity,
|
||||
width,
|
||||
height,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn size(&self) -> (i32, i32) {
|
||||
(self.width, self.height)
|
||||
}
|
||||
|
|
@ -228,27 +121,21 @@ impl ImageFill {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Copy)]
|
||||
pub struct SolidColor(pub Color);
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum Fill {
|
||||
Solid(Color),
|
||||
Solid(SolidColor),
|
||||
LinearGradient(Gradient),
|
||||
RadialGradient(Gradient),
|
||||
Image(ImageFill),
|
||||
}
|
||||
|
||||
impl Fill {
|
||||
pub fn new_image_fill(id: Uuid, opacity: u8, (width, height): (i32, i32)) -> Self {
|
||||
Self::Image(ImageFill {
|
||||
id,
|
||||
opacity,
|
||||
height,
|
||||
width,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn to_paint(&self, rect: &Rect, anti_alias: bool) -> skia::Paint {
|
||||
match self {
|
||||
Self::Solid(color) => {
|
||||
Self::Solid(SolidColor(color)) => {
|
||||
let mut p = skia::Paint::default();
|
||||
p.set_color(*color);
|
||||
p.set_style(skia::PaintStyle::Fill);
|
||||
|
|
@ -259,7 +146,7 @@ impl Fill {
|
|||
Self::LinearGradient(gradient) => {
|
||||
let mut p = skia::Paint::default();
|
||||
p.set_shader(gradient.to_linear_shader(rect));
|
||||
p.set_alpha((gradient.opacity * 255.) as u8);
|
||||
p.set_alpha(gradient.opacity);
|
||||
p.set_style(skia::PaintStyle::Fill);
|
||||
p.set_anti_alias(anti_alias);
|
||||
p.set_blend_mode(skia::BlendMode::SrcOver);
|
||||
|
|
@ -268,7 +155,7 @@ impl Fill {
|
|||
Self::RadialGradient(gradient) => {
|
||||
let mut p = skia::Paint::default();
|
||||
p.set_shader(gradient.to_radial_shader(rect));
|
||||
p.set_alpha((gradient.opacity * 255.) as u8);
|
||||
p.set_alpha(gradient.opacity);
|
||||
p.set_style(skia::PaintStyle::Fill);
|
||||
p.set_anti_alias(anti_alias);
|
||||
p.set_blend_mode(skia::BlendMode::SrcOver);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::shapes::fills::Fill;
|
||||
use crate::shapes::fills::{Fill, SolidColor};
|
||||
use skia_safe::{self as skia, Rect};
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
|
@ -78,10 +78,9 @@ impl Stroke {
|
|||
}
|
||||
|
||||
pub fn new_center_stroke(width: f32, style: u8, cap_start: u8, cap_end: u8) -> Self {
|
||||
let transparent = skia::Color::from_argb(0, 0, 0, 0);
|
||||
Stroke {
|
||||
fill: Fill::Solid(transparent),
|
||||
width: width,
|
||||
fill: Fill::Solid(SolidColor(skia::Color::TRANSPARENT)),
|
||||
width,
|
||||
style: StrokeStyle::from(style),
|
||||
cap_end: StrokeCap::from(cap_end),
|
||||
cap_start: StrokeCap::from(cap_start),
|
||||
|
|
@ -90,10 +89,9 @@ impl Stroke {
|
|||
}
|
||||
|
||||
pub fn new_inner_stroke(width: f32, style: u8, cap_start: u8, cap_end: u8) -> Self {
|
||||
let transparent = skia::Color::from_argb(0, 0, 0, 0);
|
||||
Stroke {
|
||||
fill: Fill::Solid(transparent),
|
||||
width: width,
|
||||
fill: Fill::Solid(SolidColor(skia::Color::TRANSPARENT)),
|
||||
width,
|
||||
style: StrokeStyle::from(style),
|
||||
cap_end: StrokeCap::from(cap_end),
|
||||
cap_start: StrokeCap::from(cap_start),
|
||||
|
|
@ -102,10 +100,9 @@ impl Stroke {
|
|||
}
|
||||
|
||||
pub fn new_outer_stroke(width: f32, style: u8, cap_start: u8, cap_end: u8) -> Self {
|
||||
let transparent = skia::Color::from_argb(0, 0, 0, 0);
|
||||
Stroke {
|
||||
fill: Fill::Solid(transparent),
|
||||
width: width,
|
||||
fill: Fill::Solid(SolidColor(skia::Color::TRANSPARENT)),
|
||||
width,
|
||||
style: StrokeStyle::from(style),
|
||||
cap_end: StrokeCap::from(cap_end),
|
||||
cap_start: StrokeCap::from(cap_start),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue