Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-12 18:18:24 -05:00
Code Issues Activity

🐛 Fix blend modes for wasm render

Browse source
This commit is contained in:
Alejandro Alonso 2025-01-24 09:16:04 +01:00
parent e7c06fed22
commit f70b05a09e
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,7 @@ impl RenderState {
pub fn reset_canvas(&mut self) { pub fn reset_canvas(&mut self) {
self.drawing_surface self.drawing_surface
.canvas() .canvas()
.clear(skia::Color::TRANSPARENT) .clear(self.background_color)
.reset_matrix(); .reset_matrix();
self.final_surface self.final_surface
.canvas() .canvas()
@ -154,7 +154,20 @@ impl RenderState {
.reset_matrix(); .reset_matrix();
} }
pub fn render_shape(&mut self, shape: &mut Shape) { pub fn apply_drawing_to_final_canvas(&mut self) {
self.drawing_surface.draw(
&mut self.final_surface.canvas(),
(0.0, 0.0),
skia::SamplingOptions::new(skia::FilterMode::Linear, skia::MipmapMode::Nearest),
Some(&skia::Paint::default()),
);
self.drawing_surface
.canvas()
.clear(skia::Color::TRANSPARENT);
}
pub fn render_shape(&mut self, shape: &mut Shape, clip: bool) {
let transform = shape.transform.to_skia_matrix(); let transform = shape.transform.to_skia_matrix();
// Check transform-matrix code from common/src/app/common/geom/shapes/transforms.cljc // Check transform-matrix code from common/src/app/common/geom/shapes/transforms.cljc
@ -195,16 +208,13 @@ impl RenderState {
} }
}; };
self.drawing_surface.draw( if clip {
&mut self.final_surface.canvas(), self.drawing_surface
(0.0, 0.0), .canvas()
skia::SamplingOptions::new(skia::FilterMode::Linear, skia::MipmapMode::Nearest), .clip_rect(shape.bounds(), skia::ClipOp::Intersect, true);
Some(&skia::Paint::default()), }
);
self.drawing_surface self.apply_drawing_to_final_canvas();
.canvas()
.clear(skia::Color::TRANSPARENT);
} }
pub fn zoom(&mut self, tree: &HashMap<Uuid, Shape>) -> Result<(), String> { pub fn zoom(&mut self, tree: &HashMap<Uuid, Shape>) -> Result<(), String> {
@ -325,17 +335,12 @@ impl RenderState {
let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint); let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
// This is needed so the next non-children shape does not carry this shape's transform // This is needed so the next non-children shape does not carry this shape's transform
self.final_surface.canvas().save_layer(&layer_rec); self.final_surface.canvas().save_layer(&layer_rec);
self.drawing_surface.canvas().save();
self.drawing_surface.canvas().save();
if !root_id.is_nil() { if !root_id.is_nil() {
self.render_shape(&mut element.clone()); self.render_shape(&mut element.clone(), element.clip());
if element.clip() { } else {
self.drawing_surface.canvas().clip_rect( self.apply_drawing_to_final_canvas();
element.bounds(),
skia::ClipOp::Intersect,
true,
);
}
} }
self.drawing_surface.canvas().restore(); self.drawing_surface.canvas().restore();