From 66aa5fd01f4c2d15112606fffc089d6cbe124024 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 20 Dec 2023 15:01:58 +0100 Subject: [PATCH] WIP --- .../app/main/ui/workspace/viewport/sk.cljs | 3 ++- .../app/main/ui/workspace/viewport/sk_impl.js | 23 ++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/viewport/sk.cljs b/frontend/src/app/main/ui/workspace/viewport/sk.cljs index 53d2bdf0b8..f3af6b1183 100644 --- a/frontend/src/app/main/ui/workspace/viewport/sk.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/sk.cljs @@ -30,7 +30,8 @@ (println "init vbox" vbox) (-> (.initialize impl/CanvasKit "skia-canvas" vbox) (.then (fn [k] - (reset! canvas-kit k))))))) + (reset! canvas-kit k) + #_(.clear ^js k))))))) [:canvas {:id "skia-canvas" :class (stl/css :canvas) diff --git a/frontend/src/app/main/ui/workspace/viewport/sk_impl.js b/frontend/src/app/main/ui/workspace/viewport/sk_impl.js index 4d111418e0..11acaa2884 100644 --- a/frontend/src/app/main/ui/workspace/viewport/sk_impl.js +++ b/frontend/src/app/main/ui/workspace/viewport/sk_impl.js @@ -16,6 +16,15 @@ class CanvasKit { this.vbox = vbox; } + +clear() { + const surface = this.CanvasKit.MakeCanvasSurface(this.canvasId) + function draw(canvas) { + canvas.clear(CanvasKit.TRANSPARENT); + } + surface.drawOnce(draw); +} + paintRect(shape) { const surface = this.CanvasKit.MakeCanvasSurface(this.canvasId) @@ -29,6 +38,7 @@ class CanvasKit { paint.setStyle(self.CanvasKit.PaintStyle.Fill); const color = self.CanvasKit.parseColorString(fill["fill-color"]); const opacity = fill["fill-opacity"] + console.log("color", fill["fill-color"], fill["fill-opacity"]) color[3] = opacity paint.setColor(color); const rr = self.CanvasKit.RRectXY(self.CanvasKit.LTRBRect(shape.x, shape.y, shape.x + shape.width, shape.y + shape.height), 0, 0); @@ -178,16 +188,3 @@ export function path(CanvasKit, canvasId, x, y, content, kk1, kk2, kk3) { // } - - - -export function clear(CanvasKit, canvasId) { - surface = CanvasKit.MakeCanvasSurface(canvasId) - - function draw(canvas) { - // canvas.clear(CanvasKit.WHITE); - canvas.translate(400, 400); - - } - surface.drawOnce(draw); -} \ No newline at end of file