♻️ Refactor serializing gradient fill

This commit is contained in:
Belén Albeza 2025-04-15 12:16:40 +02:00
parent dc3d802d3d
commit 1f58f96e88
4 changed files with 69 additions and 108 deletions

View file

@ -234,18 +234,14 @@
(h/call wasm/internal-module "_add_shape_solid_fill" rgba))
(some? gradient)
(case (:type gradient)
:linear
(let [size (gradient-byte-size gradient)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u32)]
(sr-fills/serialize-linear-fill gradient opacity heap offset)
(h/call wasm/internal-module "_add_shape_linear_fill"))
:radial
(let [size (gradient-byte-size gradient)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u32)]
(sr-fills/serialize-radial-fill gradient opacity heap offset)
(let [size (gradient-byte-size gradient)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u32)]
(sr-fills/serialize-gradient-fill gradient opacity heap offset)
(case (:type gradient)
:linear
(h/call wasm/internal-module "_add_shape_linear_fill")
:radial
(h/call wasm/internal-module "_add_shape_radial_fill")))
(some? image)
@ -284,28 +280,15 @@
(cond
(some? gradient)
(let [stops (:stops gradient)
size (gradient-stop-get-entries-size stops)
(let [size (gradient-byte-size gradient)
offset (mem/alloc-bytes size)
heap (mem/get-heap-u8)]
heap (mem/get-heap-u32)]
(sr-fills/serialize-gradient-fill gradient opacity heap offset)
(case (:type gradient)
:linear
(h/call wasm/internal-module "_add_shape_stroke_linear_fill"
(:start-x gradient)
(:start-y gradient)
(:end-x gradient)
(:end-y gradient)
opacity)
(h/call wasm/internal-module "_add_shape_stroke_linear_fill")
:radial
(h/call wasm/internal-module "_add_shape_stroke_radial_fill"
(:start-x gradient)
(:start-y gradient)
(:end-x gradient)
(:end-y gradient)
opacity
(:width gradient)))
(sr-fills/serialize-gradient-stops stops heap offset)
(h/call wasm/internal-module "_add_shape_stroke_stops"))
(h/call wasm/internal-module "_add_shape_stroke_radial_fill")))
(some? image)
(let [id (dm/get-prop image :id)

View file

@ -6,10 +6,22 @@
(def GRADIENT-STOP-SIZE 8)
(def GRADIENT-BASE-SIZE 24)
(defn serialize-gradient-stops
[stops heap offset]
(let [dview (js/DataView. (.-buffer heap))]
(loop [stops (seq stops) offset offset]
(defn serialize-gradient-fill
[gradient opacity heap offset]
(let [dview (js/DataView. (.-buffer heap))
start-x (dm/get-prop gradient :start-x)
start-y (dm/get-prop gradient :start-y)
end-x (dm/get-prop gradient :end-x)
end-y (dm/get-prop gradient :end-y)
width (or (dm/get-prop gradient :width) 0)
stops (dm/get-prop gradient :stops)]
(.setFloat32 dview offset start-x true)
(.setFloat32 dview (+ offset 4) start-y true)
(.setFloat32 dview (+ offset 8) end-x true)
(.setFloat32 dview (+ offset 12) end-y true)
(.setFloat32 dview (+ offset 16) opacity true)
(.setFloat32 dview (+ offset 20) width true)
(loop [stops (seq stops) offset (+ offset GRADIENT-BASE-SIZE)]
(when-not (empty? stops)
(let [stop (first stops)
hex-color (dm/get-prop stop :color)
@ -18,38 +30,4 @@
stop-offset (dm/get-prop stop :offset)]
(.setUint32 dview offset argb true)
(.setFloat32 dview (+ offset 4) stop-offset true)
(recur (rest stops) (+ offset GRADIENT-STOP-SIZE)))))))
(defn serialize-linear-fill
[gradient opacity heap offset]
(let [dview (js/DataView. (.-buffer heap))
start-x (dm/get-prop gradient :start-x)
start-y (dm/get-prop gradient :start-y)
end-x (dm/get-prop gradient :end-x)
end-y (dm/get-prop gradient :end-y)
stops (dm/get-prop gradient :stops)
width 0]
(.setFloat32 dview offset start-x true)
(.setFloat32 dview (+ offset 4) start-y true)
(.setFloat32 dview (+ offset 8) end-x true)
(.setFloat32 dview (+ offset 12) end-y true)
(.setFloat32 dview (+ offset 16) opacity true)
(.setFloat32 dview (+ offset 20) width true)
(serialize-gradient-stops stops heap (+ offset GRADIENT-BASE-SIZE))))
(defn serialize-radial-fill
[gradient opacity heap offset]
(let [dview (js/DataView. (.-buffer heap))
start-x (dm/get-prop gradient :start-x)
start-y (dm/get-prop gradient :start-y)
end-x (dm/get-prop gradient :end-x)
end-y (dm/get-prop gradient :end-y)
stops (dm/get-prop gradient :stops)
width (dm/get-prop gradient :width)]
(.setFloat32 dview offset start-x true)
(.setFloat32 dview (+ offset 4) start-y true)
(.setFloat32 dview (+ offset 8) end-x true)
(.setFloat32 dview (+ offset 12) end-y true)
(.setFloat32 dview (+ offset 16) opacity true)
(.setFloat32 dview (+ offset 20) width true)
(serialize-gradient-stops stops heap (+ offset GRADIENT-BASE-SIZE))))
(recur (rest stops) (+ offset GRADIENT-STOP-SIZE)))))))