3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-25 21:26:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Modify shapes geometry instead of transformation matrix

Browse source
This commit is contained in:
alonso.torres 2025-02-20 16:52:11 +01:00
parent b661f39422
commit 9143187efd
3 changed files with 106 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,24 +297,28 @@ impl RenderState {
self.drawing_surface
.canvas()
.concat(&transform.invert().unwrap());
.concat(&transform.invert().unwrap_or(Matrix::default()));
}
// Clone so we don't change the value in the global state
let mut shape = shape.clone();
if let Some(modifiers) = modifiers {
shape.apply_transform(&modifiers);
}
let center = shape.center();
// Transform the shape in the center
let mut matrix = shape.transform.clone();
let mut matrix = shape.transform;
matrix.post_translate(center);
matrix.pre_translate(-center);
if let Some(modifiers) = modifiers {
matrix.post_concat(&modifiers);
}
self.drawing_surface.canvas().concat(&matrix);
match &shape.kind {
Kind::SVGRaw(sr) => {
if let Some(modifiers) = modifiers {
self.drawing_surface.canvas().concat(&modifiers);
}
self.drawing_surface.canvas().concat(&matrix);
if let Some(svg) = shape.svg.as_ref() {
svg.render(self.drawing_surface.canvas())
} else {
@ -332,12 +336,14 @@ impl RenderState {
}
}
_ => {
self.drawing_surface.canvas().concat(&matrix);
for fill in shape.fills().rev() {
fills::render(self, shape, fill);
fills::render(self, &shape, fill);
}
for stroke in shape.strokes().rev() {
strokes::render(self, shape, stroke);
strokes::render(self, &shape, stroke);
}
for shadow in shape.inner_shadows().rev().filter(|s| !s.hidden()) {