3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-19 05:37:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Refactor mutability modifiers in wasm

Browse source
This commit is contained in:
alonso.torres 2025-07-01 12:46:50 +02:00
parent f0f01af55c
commit 3d374e8e97
12 changed files with 155 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ use uuid::Uuid;
pub(crate) static mut STATE: Option<Box<State>> = None;
#[macro_export]
macro_rules! with_state {
macro_rules! with_state_mut {
($state:ident, $block:block) => {{
let $state = unsafe {
#[allow(static_mut_refs)]
@ -40,14 +40,39 @@ macro_rules! with_state {
}};
}
macro_rules! with_state {
($state:ident, $block:block) => {{
let $state = unsafe {
#[allow(static_mut_refs)]
STATE.as_ref()
}
.expect("Got an invalid state pointer");
$block
}};
}
#[macro_export]
macro_rules! with_current_shape {
macro_rules! with_current_shape_mut {
($state:ident, |$shape:ident: &mut Shape| $block:block) => {
let $state = unsafe {
#[allow(static_mut_refs)]
STATE.as_mut()
}
.expect("Got an invalid state pointer");
if let Some($shape) = $state.current_shape_mut() {
$block
}
};
}
#[macro_export]
macro_rules! with_current_shape {
($state:ident, |$shape:ident: &Shape| $block:block) => {
let $state = unsafe {
#[allow(static_mut_refs)]
STATE.as_ref()
}
.expect("Got an invalid state pointer");
if let Some($shape) = $state.current_shape() {
$block
}
@ -71,15 +96,15 @@ pub extern "C" fn clean_up() {
#[no_mangle]
pub extern "C" fn clear_drawing_cache() {
with_state!(state, {
with_state_mut!(state, {
state.rebuild_tiles();
});
}
#[no_mangle]
pub extern "C" fn set_render_options(debug: u32, dpr: f32) {
with_state!(state, {
let render_state = state.render_state();
with_state_mut!(state, {
let render_state = state.render_state_mut();
render_state.set_debug_flags(debug);
render_state.set_dpr(dpr);
});
@ -87,7 +112,7 @@ pub extern "C" fn set_render_options(debug: u32, dpr: f32) {
#[no_mangle]
pub extern "C" fn set_canvas_background(raw_color: u32) {
with_state!(state, {
with_state_mut!(state, {
let color = skia::Color::new(raw_color);
state.set_background_color(color);
});
@ -95,7 +120,7 @@ pub extern "C" fn set_canvas_background(raw_color: u32) {
#[no_mangle]
pub extern "C" fn render(_: i32) {
with_state!(state, {
with_state_mut!(state, {
state
.start_render_loop(performance::get_time())
.expect("Error rendering");
@ -104,7 +129,7 @@ pub extern "C" fn render(_: i32) {
#[no_mangle]
pub extern "C" fn render_from_cache(_: i32) {
with_state!(state, {
with_state_mut!(state, {
state.render_from_cache();
});
}
@ -112,7 +137,7 @@ pub extern "C" fn render_from_cache(_: i32) {
#[no_mangle]
pub extern "C" fn process_animation_frame(timestamp: i32) {
let result = std::panic::catch_unwind(|| {
with_state!(state, {
with_state_mut!(state, {
state
.process_animation_frame(timestamp)
.expect("Error processing animation frame");
@ -133,24 +158,24 @@ pub extern "C" fn process_animation_frame(timestamp: i32) {
#[no_mangle]
pub extern "C" fn reset_canvas() {
with_state!(state, {
state.render_state().reset_canvas();
with_state_mut!(state, {
state.render_state_mut().reset_canvas();
});
}
#[no_mangle]
pub extern "C" fn resize_viewbox(width: i32, height: i32) {
with_state!(state, {
with_state_mut!(state, {
state.resize(width, height);
});
}
#[no_mangle]
pub extern "C" fn set_view(zoom: f32, x: f32, y: f32) {
with_state!(state, {
let render_state = state.render_state();
with_state_mut!(state, {
let render_state = state.render_state_mut();
render_state.viewbox.set_all(zoom, x, y);
with_state!(state, {
with_state_mut!(state, {
// We can have renders in progress
state.render_state.cancel_animation_frame();
if state.render_state.options.is_profile_rebuild_tiles() {
@ -164,7 +189,7 @@ pub extern "C" fn set_view(zoom: f32, x: f32, y: f32) {
#[no_mangle]
pub extern "C" fn clear_focus_mode() {
with_state!(state, {
with_state_mut!(state, {
state.clear_focus_mode();
});
}
@ -178,21 +203,21 @@ pub extern "C" fn set_focus_mode() {
.map(|data| Uuid::from_bytes(data.try_into().unwrap()))
.collect();
with_state!(state, {
with_state_mut!(state, {
state.set_focus_mode(entries);
});
}
#[no_mangle]
pub extern "C" fn init_shapes_pool(capacity: usize) {
with_state!(state, {
with_state_mut!(state, {
state.init_shapes_pool(capacity);
});
}
#[no_mangle]
pub extern "C" fn use_shape(a: u32, b: u32, c: u32, d: u32) {
with_state!(state, {
with_state_mut!(state, {
let id = uuid_from_u32_quartet(a, b, c, d);
state.use_shape(id);
});
@ -200,7 +225,7 @@ pub extern "C" fn use_shape(a: u32, b: u32, c: u32, d: u32) {
#[no_mangle]
pub extern "C" fn set_parent(a: u32, b: u32, c: u32, d: u32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
let id = uuid_from_u32_quartet(a, b, c, d);
shape.set_parent(id);
});
@ -208,56 +233,56 @@ pub extern "C" fn set_parent(a: u32, b: u32, c: u32, d: u32) {
#[no_mangle]
pub extern "C" fn set_shape_masked_group(masked: bool) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_masked(masked);
});
}
#[no_mangle]
pub extern "C" fn set_shape_bool_type(raw_bool_type: u8) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_bool_type(BoolType::from(raw_bool_type));
});
}
#[no_mangle]
pub extern "C" fn set_shape_type(shape_type: u8) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_shape_type(Type::from(shape_type));
});
}
#[no_mangle]
pub extern "C" fn set_shape_selrect(left: f32, top: f32, right: f32, bottom: f32) {
with_state!(state, {
with_state_mut!(state, {
state.set_selrect_for_current_shape(left, top, right, bottom);
});
}
#[no_mangle]
pub extern "C" fn set_shape_clip_content(clip_content: bool) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_clip(clip_content);
});
}
#[no_mangle]
pub extern "C" fn set_shape_rotation(rotation: f32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_rotation(rotation);
});
}
#[no_mangle]
pub extern "C" fn set_shape_transform(a: f32, b: f32, c: f32, d: f32, e: f32, f: f32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_transform(a, b, c, d, e, f);
});
}
#[no_mangle]
pub extern "C" fn add_shape_child(a: u32, b: u32, c: u32, d: u32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
let id = uuid_from_u32_quartet(a, b, c, d);
shape.add_child(id);
});
@ -274,12 +299,12 @@ pub extern "C" fn set_children() {
let mut deleted = IndexSet::new();
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
(_, deleted) = shape.compute_children_differences(&entries);
shape.children = entries.clone();
});
with_state!(state, {
with_state_mut!(state, {
for id in deleted {
state.delete_shape(id);
}
@ -301,18 +326,18 @@ pub extern "C" fn store_image(
c2: u32,
d2: u32,
) {
with_state!(state, {
with_state_mut!(state, {
let image_id = uuid_from_u32_quartet(a2, b2, c2, d2);
let image_bytes = mem::bytes();
if let Err(msg) = state.render_state().add_image(image_id, &image_bytes) {
if let Err(msg) = state.render_state_mut().add_image(image_id, &image_bytes) {
eprintln!("{}", msg);
}
mem::free_bytes();
});
with_state!(state, {
with_state_mut!(state, {
let shape_id = uuid_from_u32_quartet(a1, b1, c1, d1);
state.update_tile_for_shape(shape_id);
});
@ -320,7 +345,7 @@ pub extern "C" fn store_image(
#[no_mangle]
pub extern "C" fn is_image_cached(a: u32, b: u32, c: u32, d: u32) -> bool {
with_state!(state, {
with_state_mut!(state, {
let id = uuid_from_u32_quartet(a, b, c, d);
state.render_state().has_image(&id)
})
@ -328,7 +353,7 @@ pub extern "C" fn is_image_cached(a: u32, b: u32, c: u32, d: u32) -> bool {
#[no_mangle]
pub extern "C" fn set_shape_svg_raw_content() {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
let bytes = mem::bytes();
let svg_raw_content = String::from_utf8(bytes)
.unwrap()
@ -342,56 +367,56 @@ pub extern "C" fn set_shape_svg_raw_content() {
#[no_mangle]
pub extern "C" fn set_shape_blend_mode(mode: i32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_blend_mode(render::BlendMode::from(mode));
});
}
#[no_mangle]
pub extern "C" fn set_shape_vertical_align(align: u8) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_vertical_align(VerticalAlign::from(align));
});
}
#[no_mangle]
pub extern "C" fn set_shape_opacity(opacity: f32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_opacity(opacity);
});
}
#[no_mangle]
pub extern "C" fn set_shape_constraint_h(constraint: u8) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_constraint_h(ConstraintH::from(constraint));
});
}
#[no_mangle]
pub extern "C" fn set_shape_constraint_v(constraint: u8) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_constraint_v(ConstraintV::from(constraint));
});
}
#[no_mangle]
pub extern "C" fn set_shape_hidden(hidden: bool) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_hidden(hidden);
});
}
#[no_mangle]
pub extern "C" fn set_shape_blur(blur_type: u8, hidden: bool, value: f32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_blur(blur_type, hidden, value);
});
}
#[no_mangle]
pub extern "C" fn set_shape_corners(r1: f32, r2: f32, r3: f32, r4: f32) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_corners((r1, r2, r3, r4));
});
}
@ -427,7 +452,7 @@ pub extern "C" fn get_selection_rect() -> *mut u8 {
})
.collect();
with_state!(state, {
with_state_mut!(state, {
let bbs: Vec<_> = entries
.iter()
.flat_map(|id| {
@ -472,7 +497,7 @@ pub extern "C" fn set_structure_modifiers() {
.map(|data| StructureEntry::from_bytes(data.try_into().unwrap()))
.collect();
with_state!(state, {
with_state_mut!(state, {
for entry in entries {
match entry.entry_type {
StructureEntryType::ScaleContent => {
@ -500,7 +525,7 @@ pub extern "C" fn set_structure_modifiers() {
#[no_mangle]
pub extern "C" fn clean_modifiers() {
with_state!(state, {
with_state_mut!(state, {
state.structure.clear();
state.scale_content.clear();
state.modifiers.clear();
@ -516,7 +541,7 @@ pub extern "C" fn set_modifiers() {
.map(|data| TransformEntry::from_bytes(data.try_into().unwrap()))
.collect();
with_state!(state, {
with_state_mut!(state, {
for entry in entries {
state.modifiers.insert(entry.id, entry.transform);
}
@ -534,7 +559,7 @@ pub extern "C" fn add_shape_shadow(
raw_style: u8,
hidden: bool,
) {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
let color = skia::Color::new(raw_color);
let style = shapes::ShadowStyle::from(raw_style);
let shadow = shapes::Shadow::new(color, blur, spread, (x, y), style, hidden);
@ -544,14 +569,14 @@ pub extern "C" fn add_shape_shadow(
#[no_mangle]
pub extern "C" fn clear_shape_shadows() {
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.clear_shadows();
});
}
#[no_mangle]
pub extern "C" fn update_shape_tiles() {
with_state!(state, {
with_state_mut!(state, {
state.update_tile_for_current_shape();
});
}
@ -578,7 +603,7 @@ pub extern "C" fn set_flex_layout_data(
let justify_content = shapes::JustifyContent::from_u8(justify_content);
let wrap_type = shapes::WrapType::from_u8(wrap_type);
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_flex_layout_data(
dir,
row_gap,
@ -629,7 +654,7 @@ pub extern "C" fn set_layout_child_data(
None
};
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_flex_layout_child_data(
margin_top,
margin_right,
@ -668,7 +693,7 @@ pub extern "C" fn set_grid_layout_data(
let justify_items = shapes::JustifyItems::from_u8(justify_items);
let justify_content = shapes::JustifyContent::from_u8(justify_content);
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_grid_layout_data(
dir,
row_gap,
@ -694,7 +719,7 @@ pub extern "C" fn set_grid_columns() {
.map(|data| shapes::RawGridTrack::from_bytes(data.try_into().unwrap()))
.collect();
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_grid_columns(entries);
});
@ -710,7 +735,7 @@ pub extern "C" fn set_grid_rows() {
.map(|data| shapes::RawGridTrack::from_bytes(data.try_into().unwrap()))
.collect();
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_grid_rows(entries);
});
@ -726,7 +751,7 @@ pub extern "C" fn set_grid_cells() {
.map(|data| shapes::RawGridCell::from_bytes(data.try_into().unwrap()))
.collect();
with_current_shape!(state, |shape: &mut Shape| {
with_current_shape_mut!(state, |shape: &mut Shape| {
shape.set_grid_cells(entries);
});
@ -735,7 +760,7 @@ pub extern "C" fn set_grid_cells() {
#[no_mangle]
pub extern "C" fn show_grid(a: u32, b: u32, c: u32, d: u32) {
with_state!(state, {
with_state_mut!(state, {
let id = uuid_from_u32_quartet(a, b, c, d);
state.render_state.show_grid = Some(id);
});
@ -743,7 +768,7 @@ pub extern "C" fn show_grid(a: u32, b: u32, c: u32, d: u32) {
#[no_mangle]
pub extern "C" fn hide_grid() {
with_state!(state, {
with_state_mut!(state, {
state.render_state.show_grid = None;
});
}