3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-04 08:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Refactor serializing gradient fill

Browse source
This commit is contained in:
Belén Albeza 2025-04-15 12:16:40 +02:00
parent dc3d802d3d
commit 1f58f96e88
4 changed files with 69 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

65
render-wasm/src/main.rs
View file

@ -487,42 +487,55 @@ pub extern "C" fn add_shape_stroke_solid_fill(raw_color: u32) {
}
#[no_mangle]
pub extern "C" fn add_shape_stroke_linear_fill(
start_x: f32,
start_y: f32,
end_x: f32,
end_y: f32,
opacity: f32,
) {
pub extern "C" fn add_shape_stroke_linear_fill() {
with_current_shape!(state, |shape: &mut Shape| {
let bytes = mem::bytes();
let raw_gradient_bytes: [u8; RAW_FILL_DATA_SIZE] =
bytes[0..RAW_FILL_DATA_SIZE].try_into().unwrap();
let raw_gradient = shapes::RawGradientData::from(raw_gradient_bytes);
let stops: Vec<shapes::RawStopData> = bytes[RAW_FILL_DATA_SIZE..]
.chunks(RAW_STOP_DATA_SIZE)
.map(|chunk| {
let data: [u8; RAW_STOP_DATA_SIZE] = chunk.try_into().unwrap();
shapes::RawStopData::from(data)
})
.collect();
shape
.set_stroke_fill(shapes::Fill::new_linear_gradient(
(start_x, start_y),
(end_x, end_y),
opacity,
.set_stroke_fill(shapes::Fill::new_linear_gradient_with_stops(
raw_gradient.start(),
raw_gradient.end(),
raw_gradient.opacity(),
stops,
))
.expect("could not add stroke linear fill");
.expect("could not add stroke linear gradient fill");
});
}
#[no_mangle]
pub extern "C" fn add_shape_stroke_radial_fill(
start_x: f32,
start_y: f32,
end_x: f32,
end_y: f32,
opacity: f32,
width: f32,
) {
pub extern "C" fn add_shape_stroke_radial_fill() {
with_current_shape!(state, |shape: &mut Shape| {
let bytes = mem::bytes();
let raw_gradient_bytes: [u8; RAW_FILL_DATA_SIZE] =
bytes[0..RAW_FILL_DATA_SIZE].try_into().unwrap();
let raw_gradient = shapes::RawGradientData::from(raw_gradient_bytes);
let stops: Vec<shapes::RawStopData> = bytes[RAW_FILL_DATA_SIZE..]
.chunks(RAW_STOP_DATA_SIZE)
.map(|chunk| {
let data: [u8; RAW_STOP_DATA_SIZE] = chunk.try_into().unwrap();
shapes::RawStopData::from(data)
})
.collect();
shape
.set_stroke_fill(shapes::Fill::new_radial_gradient(
(start_x, start_y),
(end_x, end_y),
opacity,
width,
.set_stroke_fill(shapes::Fill::new_radial_gradient_with_stops(
raw_gradient.start(),
raw_gradient.end(),
raw_gradient.opacity(),
raw_gradient.width(),
stops,
))
.expect("could not add stroke radial fill");
.expect("could not add stroke radial gradient fill");
});
}

13
render-wasm/src/shapes/fills.rs
View file

@ -171,10 +171,6 @@ pub enum Fill {
}
impl Fill {
pub fn new_linear_gradient(start: (f32, f32), end: (f32, f32), opacity: f32) -> Self {
Self::new_linear_gradient_with_stops(start, end, opacity, vec![])
}
pub fn new_linear_gradient_with_stops(
start: (f32, f32),
end: (f32, f32),
@ -197,15 +193,6 @@ impl Fill {
Self::LinearGradient(gradient)
}
pub fn new_radial_gradient(
start: (f32, f32),
end: (f32, f32),
opacity: f32,
width: f32,
) -> Self {
Self::new_radial_gradient_with_stops(start, end, opacity, width, vec![])
}
pub fn new_radial_gradient_with_stops(
start: (f32, f32),
end: (f32, f32),