🎉 Improve frame rendering

This commit is contained in:
AzazelN28 2024-11-20 13:49:45 +01:00
parent 59fdf64c66
commit 2db1740ce8
6 changed files with 59 additions and 31 deletions

View file

@ -285,16 +285,11 @@
(mf/with-effect [base-objects canvas-init?]
(when @canvas-init?
(wasm.api/set-objects base-objects)
(wasm.api/draw-objects zoom vbox)))
(mf/with-effect [modifiers canvas-init?]
(when (and @canvas-init? modifiers)
(wasm.api/draw-objects zoom vbox)))
(wasm.api/set-objects base-objects)))
(mf/with-effect [vbox canvas-init?]
(let [frame-id (when @canvas-init? (wasm.api/draw-objects zoom vbox))]
(partial wasm.api/cancel-draw frame-id)))
(when @canvas-init?
(wasm.api/set-view zoom vbox)))
(hooks/setup-dom-events zoom disable-paste in-viewport? read-only? drawing-tool drawing-path?)
(hooks/setup-viewport-size vport viewport-ref)

View file

@ -13,13 +13,27 @@
[app.render-wasm.helpers :as h]
[promesa.core :as p]))
(defonce internal-frame-id nil)
(defonce internal-module #js {})
(defn create-shape
[id]
(let [buffer (uuid/get-u32 id)]
(h/call internal-module "_create_shape"
(aget buffer 0) (aget buffer 1) (aget buffer 2) (aget buffer 3))))
;; This should never be called from the outside.
;; This function receives a "time" parameter that we're not using but maybe in the future could be useful (it is the time since
;; the window started rendering elements so it could be useful to measure time between frames).
(defn- render
[_]
(h/call internal-module "_render")
(set! internal-frame-id nil))
(defn cancel-render
[]
(when internal-frame-id
(js/cancelAnimationFrame internal-frame-id)
(set! internal-frame-id nil)))
(defn request-render
[]
(when internal-frame-id (cancel-render))
(set! internal-frame-id (js/requestAnimationFrame render)))
(defn use-shape
[id]
@ -105,6 +119,11 @@
;; https://rust-skia.github.io/doc/skia_safe/enum.BlendMode.html
(h/call internal-module "_set_shape_blend_mode" (translate-blend-mode blend-mode)))
(defn set-view
[zoom vbox]
(h/call internal-module "_set_view" zoom (- (:x vbox)) (- (:y vbox)))
(request-render))
(defn set-objects
[objects]
(let [shapes (into [] (vals objects))
@ -127,23 +146,11 @@
(set-shape-fills fills)
(set-shape-blend-mode blend-mode)
(set-shape-children children)
(recur (inc index)))))))
(defn draw-objects
[zoom vbox]
(js/requestAnimationFrame
(fn []
(let [pan-x (- (dm/get-prop vbox :x))
pan-y (- (dm/get-prop vbox :y))]
(h/call internal-module "_draw_all_shapes" zoom pan-x pan-y)))))
(defn cancel-draw
[frame-id]
(when (some? frame-id)
(js/cancelAnimationFrame frame-id)))
(recur (inc index))))))
(request-render))
(def ^:private canvas-options
#js {:antialias true
#js {:antialias false
:depth true
:stencil true
:alpha true})

View file

@ -101,7 +101,11 @@
:fills (api/set-shape-fills v)
:blend-mode (api/set-shape-blend-mode v)
:shapes (api/set-shape-children v)
nil))
nil)
;; when something synced with wasm
;; is modified, we need to request
;; a new render.
(api/request-render))
(let [delegate (.-delegate ^ShapeProxy self)
delegate' (assoc delegate k v)]
(if (identical? delegate' delegate)