Merge remote-tracking branch 'origin/staging-render' into niwinz-develop-merge

2025-12-11 22:14:05 +01:00 · 2025-12-10 13:53:15 +01:00
parent 0956b66281 a78477592b
commit eb1eeb4750
26 changed files with 784 additions and 190 deletions
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-CURRENT_VERSION=${CURRENT_VERSION:-develop};
+export CURRENT_VERSION=${CURRENT_VERSION:-develop};

 if [ "$NODE_ENV" = "production" ];  then
    export BUILD_MODE="release";
@@ -8,14 +8,16 @@ else
    export BUILD_MODE=${1:-debug};
 fi

-BUILD_NAME="${BUILD_NAME:-render-wasm}"
+export BUILD_NAME="${BUILD_NAME:-render-wasm}"
+export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}

 # 256 MB of initial heap to perform less
 # initial calls to memory grow.
-EM_INITIAL_HEAP=$((256 * 1024 * 1024))
+export EM_INITIAL_HEAP=$((256 * 1024 * 1024))

 # 1.0 doubles the heap on every growth.
-EM_MEMORY_GROWTH_GEOMETRIC_STEP="0.8"
+export EM_MEMORY_GROWTH_GEOMETRIC_STEP="0.8"

 # Malloc implementation to use.
 # - dlmalloc: a powerful general-purpose malloc.
@@ -25,38 +27,63 @@ EM_MEMORY_GROWTH_GEOMETRIC_STEP="0.8"
 # - emmalloc-verbose: use emmalloc with assertions + verbose logging.
 # - emmalloc-memvalidate-verbose: use emmalloc with assertions + heap consistency checking + verbose logging.
 # Default: dlmalloc
-EM_MALLOC="dlmalloc"
+export EM_MALLOC="dlmalloc"

-EMCC_CFLAGS="--no-entry \
+export EMCC_CFLAGS="--no-entry \
    --js-library src/js/wapi.js \
    -sASSERTIONS=1 \
    -sALLOW_TABLE_GROWTH=1 \
    -sALLOW_MEMORY_GROWTH=1 \
    -sINITIAL_HEAP=$EM_INITIAL_HEAP \
    -sMEMORY_GROWTH_GEOMETRIC_STEP=$EM_MEMORY_GROWTH_GEOMETRIC_STEP \
-    -sENVIRONMENT=web \
    -sERROR_ON_UNDEFINED_SYMBOLS=0 \
    -sMAX_WEBGL_VERSION=2 \
-    -sMODULARIZE=1 \
    -sEXPORT_NAME=createRustSkiaModule \
    -sEXPORTED_RUNTIME_METHODS=GL,stringToUTF8,HEAPU8,HEAP32,HEAPU32,HEAPF32 \
-    -sEXPORT_ES6=1"
+    -sENVIRONMENT=web \
+    -sMODULARIZE=1 \
+    -sEXPORT_ES6=1";

 export EM_CACHE="/tmp/emsdk_cache";

-CARGO_PARAMS="${@:2}";
+export CARGO_PARAMS="${@:2}";

 if [ "$BUILD_MODE" = "release" ]; then
-    CARGO_PARAMS="--release $CARGO_PARAMS"
-    EMCC_CFLAGS="-Os $EMCC_CFLAGS"
+    export CARGO_PARAMS="--release $CARGO_PARAMS"
+    export EMCC_CFLAGS="-Os $EMCC_CFLAGS"
 else
    # TODO: Extra parameters that could be good to look into:
    #        -gseparate-dwarf
    #        -gsplit-dwarf
    #        -gsource-map
-    EMCC_CFLAGS="-g $EMCC_CFLAGS -sVERBOSE=1 -sMALLOC=$EM_MALLOC"
+    export EMCC_CFLAGS="-g $EMCC_CFLAGS -sVERBOSE=1 -sMALLOC=$EM_MALLOC"
 fi

-export EMCC_CFLAGS;
-export CARGO_PARAMS;
+function clean {
+    cargo clean;
+}

+function build {
+    cargo build $CARGO_PARAMS;
+}
+
+function copy_artifacts {
+    DEST=$1;
+
+    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js $DEST/$BUILD_NAME.js;
+    cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm $DEST/$BUILD_NAME.wasm;
+
+    sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$CURRENT_VERSION/g" $DEST/$BUILD_NAME.js;
+
+    npx esbuild target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \
+        --log-level=error \
+        --outfile=$DEST/worker/render.js \
+        --platform=neutral \
+        --format=iife \
+        --global-name=WasmModule;
+}
+
+function copy_shared_artifact {
+    SHARED_FILE=$(find target/wasm32-unknown-emscripten -name render_wasm_shared.js | head -n 1);
+    cp $SHARED_FILE ../frontend/src/app/render_wasm/api/shared.js;
+}
--- a/render-wasm/build
+++ b/render-wasm/build
@@ -7,19 +7,12 @@ pushd $_SCRIPT_DIR;

 . ./_build_env

-set -x
+set -x;

-export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
+build;
+copy_artifacts "../frontend/resources/public/js";
+copy_shared_artifact;

-cargo build $CARGO_PARAMS
-
-_SHARED_FILE=$(find target/wasm32-unknown-emscripten -name render_wasm_shared.js | head -n 1);
-
-cat target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js "$_SHARED_FILE" > ../frontend/resources/public/js/$BUILD_NAME.js
-cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm ../frontend/resources/public/js/$BUILD_NAME.wasm
-sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$CURRENT_VERSION/g" ../frontend/resources/public/js/$BUILD_NAME.js;
-
-exit $?
+exit $?;

 popd
--- a/render-wasm/src/render/text.rs
+++ b/render-wasm/src/render/text.rs
@@ -253,11 +253,12 @@ fn draw_text(

    let layer_rec = SaveLayerRec::default();
    canvas.save_layer(&layer_rec);
-    let mut normalized_line_height = text_content.normalized_line_height();
+    let mut previous_line_height = text_content.normalized_line_height();

    for paragraph_builder_group in paragraph_builder_groups {
-        let mut group_offset_y = global_offset_y;
+        let group_offset_y = global_offset_y;
        let group_len = paragraph_builder_group.len();
+        let mut paragraph_offset_y = previous_line_height;

        for (paragraph_index, paragraph_builder) in paragraph_builder_group.iter_mut().enumerate() {
            let mut paragraph = paragraph_builder.build();
@@ -266,12 +267,13 @@ fn draw_text(
            paragraph.paint(canvas, xy);

            let line_metrics = paragraph.get_line_metrics();
+
            if paragraph_index == group_len - 1 {
                if line_metrics.is_empty() {
-                    group_offset_y += normalized_line_height;
+                    paragraph_offset_y = paragraph.ideographic_baseline();
                } else {
-                    normalized_line_height = paragraph.ideographic_baseline();
-                    group_offset_y += paragraph.ideographic_baseline() * line_metrics.len() as f32;
+                    paragraph_offset_y = paragraph.height();
+                    previous_line_height = paragraph.ideographic_baseline();
                }
            }

@@ -280,7 +282,7 @@ fn draw_text(
            }
        }

-        global_offset_y = group_offset_y;
+        global_offset_y += paragraph_offset_y;
    }
 }

--- a/render-wasm/test
+++ b/render-wasm/test
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 set -x

+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"}
+export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
+
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;

 . ./_build_env

-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"}
-export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
-
 cargo test --bin render_wasm -- --show-output

 # Exit with the same status code as cargo test
--- a/render-wasm/watch
+++ b/render-wasm/watch
@@ -6,21 +6,15 @@ pushd $_SCRIPT_DIR;
 . ./_build_env

 set -x
-
-export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
-
-SHARED_FILE=$(find target/wasm32-unknown-emscripten -name render_wasm_shared.js | head -n 1);
-
-cat target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js "$SHARED_FILE" > ../frontend/resources/public/js/$BUILD_NAME.js
-cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm ../frontend/resources/public/js/$BUILD_NAME.wasm
+build;
+copy_artifacts "../frontend/resources/public/js";
+copy_shared_artifact;

 pushd $_SCRIPT_DIR;
+
 cargo watch \
      -x "build $CARGO_PARAMS" \
-      -s "cat target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \"$SHARED_FILE\" > ../frontend/resources/public/js/$BUILD_NAME.js" \
-      -s "cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm ../frontend/resources/public/js/$BUILD_NAME.wasm" \
-      -s "sed -i 's/render_wasm.wasm/$BUILD_NAME.wasm?version=$CURRENT_VERSION/g' ../frontend/resources/public/js/$BUILD_NAME.js" \
+      -s "./build" \
      -s "echo 'DONE\n'";

 popd