johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

✨ Use existing space for storing image fill flags

Browse Source
This commit is contained in:
Belén Albeza
2025-08-01 15:57:31 +02:00
parent 9a0c36c442
commit ae3aef8dcc
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/app/common/buffer.cljc
View File

@@ -21,6 +21,13 @@
(let [target (with-meta target {:tag 'java.nio.ByteBuffer})] (let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
`(long (.get ~target ~offset))))) `(long (.get ~target ~offset)))))
(defmacro read-unsigned-byte
[target offset]
(if (:ns &env)
`(.getUint8 ~target ~offset true)
(let [target (with-meta target {:tag 'java.nio.ByteBuffer})]
`(bit-and (long (.get ~target ~offset)) 0xff))))
(defmacro read-bool (defmacro read-bool
[target offset] [target offset]
(if (:ns &env) (if (:ns &env)

21
common/src/app/common/types/fills/impl.cljc
View File

@@ -121,13 +121,16 @@
(let [image-id (get image :id) (let [image-id (get image :id)
image-width (get image :width) image-width (get image :width)
image-height (get image :height) image-height (get image :height)
keep-aspect-ratio (get image :keep-aspect-ratio false)] opacity (mth/floor (* opacity 0xff))
keep-aspect-ratio (if (get image :keep-aspect-ratio false) 0x01 0x00)
flags (bit-or keep-aspect-ratio 0x00)]
(buf/write-byte buffer (+ offset 0) 0x03) (buf/write-byte buffer (+ offset 0) 0x03)
(buf/write-uuid buffer (+ offset 4) image-id) (buf/write-uuid buffer (+ offset 4) image-id)
(buf/write-float buffer (+ offset 20) opacity) (buf/write-byte buffer (+ offset 20) opacity)
(buf/write-byte buffer (+ offset 21) flags)
(buf/write-short buffer (+ offset 22) 0) ;; 2-byte padding (reserved for future use)
(buf/write-int buffer (+ offset 24) image-width) (buf/write-int buffer (+ offset 24) image-width)
(buf/write-int buffer (+ offset 28) image-height) (buf/write-int buffer (+ offset 28) image-height)
(buf/write-bool buffer (+ offset 32) keep-aspect-ratio)
(+ offset FILL-BYTE-SIZE))) (+ offset FILL-BYTE-SIZE)))
(defn- write-metadata (defn- write-metadata
@@ -202,10 +205,12 @@
:stops stops :stops stops
:type type}}) :type type}})
3 3 ;; image fill
(let [ratio (buf/read-bool dbuffer (+ doffset 32)) (let [id (buf/read-uuid dbuffer (+ doffset 4))
id (buf/read-uuid dbuffer (+ doffset 4)) alpha (buf/read-unsigned-byte dbuffer (+ doffset 20))
alpha (buf/read-float dbuffer (+ doffset 20)) opacity (mth/precision (/ alpha 0xff) 2)
flags (buf/read-unsigned-byte dbuffer (+ doffset 21))
ratio (boolean (bit-and flags 0x01))
width (buf/read-int dbuffer (+ doffset 24)) width (buf/read-int dbuffer (+ doffset 24))
height (buf/read-int dbuffer (+ doffset 28)) height (buf/read-int dbuffer (+ doffset 28))
mtype (buf/read-short mbuffer (+ moffset 2)) mtype (buf/read-short mbuffer (+ moffset 2))
@@ -215,7 +220,7 @@
0x03 "image/gif" 0x03 "image/gif"
0x04 "image/webp" 0x04 "image/webp"
0x05 "image/svg+xml")] 0x05 "image/svg+xml")]
{:fill-opacity alpha {:fill-opacity opacity
:fill-image {:id id :fill-image {:id id
:width width :width width
:height height :height height

13
render-wasm/src/wasm/fills/image.rs
View File

@@ -1,5 +1,7 @@
use crate::{shapes::ImageFill, utils::uuid_from_u32_quartet}; use crate::{shapes::ImageFill, utils::uuid_from_u32_quartet};
const FLAG_KEEP_ASPECT_RATIO: u8 = 1 << 0;
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
#[repr(C)] #[repr(C)]
#[repr(align(4))] #[repr(align(4))]
@@ -8,23 +10,24 @@ pub struct RawImageFillData {
b: u32, b: u32,
c: u32, c: u32,
d: u32, d: u32,
opacity: f32, opacity: u8,
flags: u8,
_padding: u16, // reserved for future use
width: i32, width: i32,
height: i32, height: i32,
keep_aspect_ratio: i32,
} }
impl From<RawImageFillData> for ImageFill { impl From<RawImageFillData> for ImageFill {
fn from(value: RawImageFillData) -> Self { fn from(value: RawImageFillData) -> Self {
let id = uuid_from_u32_quartet(value.a, value.b, value.c, value.d); let id = uuid_from_u32_quartet(value.a, value.b, value.c, value.d);
let opacity = (value.opacity * 255.).floor() as u8; let keep_aspect_ratio = value.flags & FLAG_KEEP_ASPECT_RATIO != 0;
Self::new( Self::new(
id, id,
opacity, value.opacity,
value.width, value.width,
value.height, value.height,
value.keep_aspect_ratio != 0, keep_aspect_ratio,
) )
} }
} }