mirror of
https://github.com/penpot/penpot.git
synced 2025-05-18 10:36:10 +02:00
🎉 Recursive drawing shapes in rust
This commit is contained in:
parent
132b1800c2
commit
b149f96500
7 changed files with 76 additions and 60 deletions
render-wasm/src
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue