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

🎉 Recursive drawing shapes in rust

Browse source
This commit is contained in:
Alejandro Alonso 2024-11-12 15:56:33 +01:00
parent 132b1800c2
commit b149f96500
7 changed files with 76 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ pub unsafe extern "C" fn draw_all_shapes(zoom: f32, pan_x: f32, pan_y: f32) {
scale(zoom, zoom);
translate(pan_x, pan_y);
render::render_all(state);
render::render_shape(state, Uuid::nil());
flush();
}
@ -125,26 +125,6 @@ pub unsafe extern "C" fn set_shape_rotation(rotation: f32) {
}
}
#[no_mangle]
pub unsafe extern "C" fn set_shape_x(x: f32) {
let state = unsafe { STATE.as_mut() }.expect("got an invalid state pointer");
if let Some(shape) = state.current_shape.as_deref_mut() {
let width = shape.selrect.x2 - shape.selrect.x1;
shape.selrect.x1 = x;
shape.selrect.x2 = x + width;
}
}
#[no_mangle]
pub unsafe extern "C" fn set_shape_y(y: f32) {
let state = unsafe { STATE.as_mut() }.expect("got an invalid state pointer");
if let Some(shape) = state.current_shape.as_deref_mut() {
let height = shape.selrect.y2 - shape.selrect.y1;
shape.selrect.y1 = y;
shape.selrect.y2 = y + height;
}
}
#[no_mangle]
pub unsafe extern "C" fn set_shape_transform(a: f32, b: f32, c: f32, d: f32, e: f32, f: f32) {
let state = unsafe { STATE.as_mut() }.expect("got an invalid state pointer");
@ -158,6 +138,23 @@ pub unsafe extern "C" fn set_shape_transform(a: f32, b: f32, c: f32, d: f32, e:
}
}
#[no_mangle]
pub extern "C" fn add_child_shape(a: u32, b: u32, c: u32, d: u32) {
let state = unsafe { STATE.as_mut() }.expect("got an invalid state pointer");
let id = uuid_from_u32_quartet(a, b, c, d);
if let Some(shape) = state.current_shape.as_deref_mut() {
shape.shapes.push(id);
}
}
#[no_mangle]
pub extern "C" fn clear_child_shapes() {
let state = unsafe { STATE.as_mut() }.expect("got an invalid state pointer");
if let Some(shape) = state.current_shape.as_deref_mut() {
shape.shapes.clear();
}
}
fn main() {
render::init_gl();
}

55
render-wasm/src/render.rs
View file

@ -1,5 +1,6 @@
use skia_safe as skia;
use skia_safe::gpu::{self, gl::FramebufferInfo, DirectContext};
use uuid::Uuid;
use crate::state::State;
@ -81,34 +82,44 @@ pub(crate) fn render_rect(surface: &mut skia::Surface, rect: skia::Rect, color:
surface.canvas().draw_rect(rect, &paint);
}
pub(crate) fn render_all(state: &mut State) {
for shape in state.shapes.values() {
let r = skia::Rect::new(
shape.selrect.x1,
shape.selrect.y1,
shape.selrect.x2,
shape.selrect.y2,
);
pub(crate) fn render_shape(state: &mut State, id: Uuid) {
let shape = state.shapes.get(&id).unwrap();
let r = skia::Rect::new(
shape.selrect.x1,
shape.selrect.y1,
shape.selrect.x2,
shape.selrect.y2,
);
state.render_state.surface.canvas().save();
// TODO: check if this save and restore are really neaded or not
// state.render_state.surface.canvas().save();
// Check transform-matrix code from common/src/app/common/geom/shapes/transforms.cljc
let mut matrix = skia::Matrix::new_identity();
let (translate_x, translate_y) = shape.translation();
let (scale_x, scale_y) = shape.scale();
let (skew_x, skew_y) = shape.skew();
// Check transform-matrix code from common/src/app/common/geom/shapes/transforms.cljc
let mut matrix = skia::Matrix::new_identity();
let (translate_x, translate_y) = shape.translation();
let (scale_x, scale_y) = shape.scale();
let (skew_x, skew_y) = shape.skew();
matrix.set_all(scale_x, skew_x, translate_x, skew_y, scale_y, translate_y, 0., 0., 1.);
matrix.set_all(scale_x, skew_x, translate_x, skew_y, scale_y, translate_y, 0., 0., 1.);
let mut center = r.center();
matrix.post_translate(center);
center.negate();
matrix.pre_translate(center);
let mut center = r.center();
matrix.post_translate(center);
center.negate();
matrix.pre_translate(center);
state.render_state.surface.canvas().concat(&matrix);
state.render_state.surface.canvas().concat(&matrix);
render_rect(&mut state.render_state.surface, r, skia::Color::RED);
let mut color = skia::Color::RED;;
if skew_x != 0. {
color = skia::Color::BLACK;
}
render_rect(&mut state.render_state.surface, r, color);
state.render_state.surface.canvas().restore();
// state.render_state.surface.canvas().restore();
let shape_ids = shape.shapes.clone();
for shape_id in shape_ids {
render_shape(state, shape_id);
}
}

4
render-wasm/src/shapes.rs
View file

@ -50,9 +50,10 @@ impl Matrix {
}
}
#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone)]
pub struct Shape {
pub id: Uuid,
pub shapes: Vec::<Uuid>,
pub kind: Kind,
pub selrect: Rect,
pub transform: Matrix,
@ -63,6 +64,7 @@ impl Shape {
pub fn new(id: Uuid) -> Self {
Self {
id,
shapes: Vec::<Uuid>::new(),
kind: Kind::Rect,
selrect: Rect::default(),
transform: Matrix::identity(),