@next2d/display 3.0.5 → 3.1.0

package/src/Loader/worker/ZlibInflateWorker.js

@@ -1,20 +1,389 @@
 "use strict";
-import { decompressSync } from "fflate";
 /**
- * @description zilbの圧縮されたデータを解凍します。
- *              Unzips zlib-compressed data.
+ * @description fflate非依存の高速 zlib/DEFLATE 解凍ワーカー (RFC 1950 / RFC 1951)
+ *              High-performance zlib/DEFLATE decompression worker without fflate dependency.
+ */
+const _$LEN_BASE = new Uint16Array([
+    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
+]);
+const _$LEN_EXTRA = new Uint8Array([
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
+]);
+const _$DIST_BASE = new Uint16Array([
+    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577
+]);
+const _$DIST_EXTRA = new Uint8Array([
+    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+    7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13
+]);
+const _$CL_ORDER = new Uint8Array([
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+]);
+const _$MASK = new Uint32Array(17);
+for (let i = 1; i < 17; i++) {
+    _$MASK[i] = (1 << i) - 1;
+}
+const _$FIXED_LIT_CL = new Uint8Array(288);
+for (let i = 0; i <= 143; i++) {
+    _$FIXED_LIT_CL[i] = 8;
+}
+for (let i = 144; i <= 255; i++) {
+    _$FIXED_LIT_CL[i] = 9;
+}
+for (let i = 256; i <= 279; i++) {
+    _$FIXED_LIT_CL[i] = 7;
+}
+for (let i = 280; i <= 287; i++) {
+    _$FIXED_LIT_CL[i] = 8;
+}
+const _$FIXED_DIST_CL = new Uint8Array(32).fill(5);
+const _$decoder = new TextDecoder();
+let _$outBuf = new Uint8Array(65536);
+const _$blCount = new Uint16Array(16);
+const _$nextCode = new Uint16Array(16);
+const _$clLens = new Uint8Array(19);
+const _$codeLens = new Uint8Array(320);
+let _$dynClTbl = new Uint32Array(128);
+let _$dynLitTbl = new Uint32Array(2048);
+let _$dynDistTbl = new Uint32Array(1024);
+/**
+ * @description canonical Huffmanルックアップテーブルを構築する。
+ *              各エントリは (symbol << 4) | codeLength の形式で格納される。
+ *              Builds a canonical Huffman lookup table. Each entry stores (symbol << 4) | codeLength.
+ *
+ * @param  {Uint8Array}                  codeLens - シンボルごとのコード長配列
+ * @param  {number}                      n        - codeLensの有効要素数
+ * @param  {Uint32Array<ArrayBuffer>}    [reuse]  - 再利用するテーブルバッファ（GC回避用）
+ * @return {[Uint32Array<ArrayBuffer>, number]} [テーブル, 最大コード長]
+ * @method
+ * @private
+ */
+const _$buildTable = (codeLens, n, reuse) => {
+    let max = 0;
+    _$blCount.fill(0);
+    for (let i = 0; i < n; i++) {
+        const l = codeLens[i];
+        if (l) {
+            _$blCount[l]++;
+            if (l > max) {
+                max = l;
+            }
+        }
+    }
+    if (!max) {
+        if (reuse) {
+            reuse[0] = 0;
+            return [reuse, 1];
+        }
+        return [new Uint32Array(2), 1];
+    }
+    _$nextCode.fill(0);
+    for (let b = 1, c = 0; b <= max; b++) {
+        c = c + _$blCount[b - 1] << 1;
+        _$nextCode[b] = c;
+    }
+    const size = 1 << max;
+    let tbl;
+    if (reuse && reuse.length >= size) {
+        tbl = reuse;
+        tbl.fill(0, 0, size);
+    }
+    else {
+        tbl = new Uint32Array(size);
+    }
+    for (let s = 0; s < n; s++) {
+        const l = codeLens[s];
+        if (!l) {
+            continue;
+        }
+        let c = _$nextCode[l]++;
+        let r = 0;
+        for (let i = 0; i < l; i++) {
+            r = r << 1 | c & 1;
+            c >>= 1;
+        }
+        const entry = s << 4 | l;
+        for (let j = r; j < size; j += 1 << l) {
+            tbl[j] = entry;
+        }
+    }
+    return [tbl, max];
+};
+const [_$FIXED_LIT_TBL, _$FIXED_LIT_BITS] = _$buildTable(_$FIXED_LIT_CL, 288);
+const [_$FIXED_DIST_TBL, _$FIXED_DIST_BITS] = _$buildTable(_$FIXED_DIST_CL, 32);
+const _$FIXED_LIT_MASK = _$MASK[_$FIXED_LIT_BITS];
+const _$FIXED_DIST_MASK = _$MASK[_$FIXED_DIST_BITS];
+let _$src;
+let _$pos;
+let _$buf;
+let _$cnt;
+/**
+ * @description ビットストリームからnビットを読み取って返す。
+ *              Reads n bits from the bit stream and returns the value.
+ *
+ * @param  {number} n - 読み取るビット数
+ * @return {number} 読み取った値
+ * @method
+ * @private
+ */
+const _$bits = (n) => {
+    while (_$cnt < n) {
+        _$buf |= _$src[_$pos++] << _$cnt;
+        _$cnt += 8;
+    }
+    const v = _$buf & _$MASK[n];
+    _$buf >>>= n;
+    _$cnt -= n;
+    return v;
+};
+/**
+ * @description Huffmanルックアップテーブルから1シンボルをデコードする。
+ *              Decodes one symbol from the Huffman lookup table.
  *
- * @param  {MessageEvent} event
+ * @param  {Uint32Array} tbl     - Huffmanルックアップテーブル
+ * @param  {number}      maxBits - テーブルの最大コード長
+ * @param  {number}      mask    - ビットマスク ((1 << maxBits) - 1)
+ * @return {number} デコードされたシンボル値
+ * @method
+ * @private
+ */
+const _$huf = (tbl, maxBits, mask) => {
+    while (_$cnt < maxBits) {
+        _$buf |= _$src[_$pos++] << _$cnt;
+        _$cnt += 8;
+    }
+    const e = tbl[_$buf & mask];
+    _$buf >>>= e & 0xF;
+    _$cnt -= e & 0xF;
+    return e >> 4;
+};
+/**
+ * @description DEFLATEストリームを解凍する (RFC 1951)。
+ *              stored / fixed Huffman / dynamic Huffman の全ブロックタイプに対応。
+ *              Decompresses a DEFLATE stream. Supports all block types: stored, fixed and dynamic Huffman.
+ *
+ * @param  {Uint8Array} data   - 圧縮データ
+ * @param  {number}     offset - DEFLATEストリームの開始オフセット
+ * @return {Uint8Array} 解凍されたバイト列
+ * @method
+ * @private
+ */
+const _$inflate = (data, offset) => {
+    _$src = data;
+    _$pos = offset;
+    _$buf = 0;
+    _$cnt = 0;
+    const estimatedSize = Math.max(data.length * 6, 4096);
+    if (_$outBuf.length < estimatedSize) {
+        _$outBuf = new Uint8Array(estimatedSize);
+    }
+    let out = _$outBuf;
+    let op = 0;
+    let fin = 0;
+    while (!fin) {
+        fin = _$bits(1);
+        const bt = _$bits(2);
+        if (bt === 0) {
+            const skip = _$cnt & 7;
+            _$buf >>>= skip;
+            _$cnt -= skip;
+            const len = _$bits(16);
+            _$bits(16);
+            if (op + len > out.length) {
+                let sz = out.length;
+                while (sz < op + len) {
+                    sz <<= 1;
+                }
+                const nb = new Uint8Array(sz);
+                nb.set(out);
+                out = nb;
+            }
+            out.set(_$src.subarray(_$pos, _$pos + len), op);
+            _$pos += len;
+            op += len;
+        }
+        else if (bt === 3) {
+            throw new Error("Invalid DEFLATE block type");
+        }
+        else {
+            let lt, lm, lb;
+            let dt, dm, db;
+            if (bt === 1) {
+                lt = _$FIXED_LIT_TBL;
+                lb = _$FIXED_LIT_BITS;
+                lm = _$FIXED_LIT_MASK;
+                dt = _$FIXED_DIST_TBL;
+                db = _$FIXED_DIST_BITS;
+                dm = _$FIXED_DIST_MASK;
+            }
+            else {
+                const hlit = _$bits(5) + 257;
+                const hdist = _$bits(5) + 1;
+                const hclen = _$bits(4) + 4;
+                _$clLens.fill(0);
+                for (let i = 0; i < hclen; i++) {
+                    _$clLens[_$CL_ORDER[i]] = _$bits(3);
+                }
+                let clb;
+                [_$dynClTbl, clb] = _$buildTable(_$clLens, 19, _$dynClTbl);
+                const clm = _$MASK[clb];
+                const total = hlit + hdist;
+                _$codeLens.fill(0, 0, total);
+                for (let i = 0; i < total;) {
+                    const s = _$huf(_$dynClTbl, clb, clm);
+                    if (s < 16) {
+                        _$codeLens[i++] = s;
+                    }
+                    else if (s === 16) {
+                        const p = _$codeLens[i - 1];
+                        for (let r = _$bits(2) + 3; r > 0; r--) {
+                            _$codeLens[i++] = p;
+                        }
+                    }
+                    else if (s === 17) {
+                        i += _$bits(3) + 3;
+                    }
+                    else {
+                        i += _$bits(7) + 11;
+                    }
+                }
+                [_$dynLitTbl, lb] = _$buildTable(_$codeLens.subarray(0, hlit), hlit, _$dynLitTbl);
+                lm = _$MASK[lb];
+                lt = _$dynLitTbl;
+                [_$dynDistTbl, db] = _$buildTable(_$codeLens.subarray(hlit, total), hdist, _$dynDistTbl);
+                dm = _$MASK[db];
+                dt = _$dynDistTbl;
+            }
+            for (;;) {
+                while (_$cnt < lb) {
+                    _$buf |= _$src[_$pos++] << _$cnt;
+                    _$cnt += 8;
+                }
+                const le = lt[_$buf & lm];
+                const sl = le & 0xF;
+                _$buf >>>= sl;
+                _$cnt -= sl;
+                const sym = le >> 4;
+                if (sym < 256) {
+                    if (op >= out.length) {
+                        const nb = new Uint8Array(out.length << 1);
+                        nb.set(out);
+                        out = nb;
+                    }
+                    out[op++] = sym;
+                }
+                else if (sym === 256) {
+                    break;
+                }
+                else {
+                    const li = sym - 257;
+                    let length = _$LEN_BASE[li];
+                    const le2 = _$LEN_EXTRA[li];
+                    if (le2) {
+                        while (_$cnt < le2) {
+                            _$buf |= _$src[_$pos++] << _$cnt;
+                            _$cnt += 8;
+                        }
+                        length += _$buf & _$MASK[le2];
+                        _$buf >>>= le2;
+                        _$cnt -= le2;
+                    }
+                    while (_$cnt < db) {
+                        _$buf |= _$src[_$pos++] << _$cnt;
+                        _$cnt += 8;
+                    }
+                    const de = dt[_$buf & dm];
+                    const dl = de & 0xF;
+                    _$buf >>>= dl;
+                    _$cnt -= dl;
+                    const di = de >> 4;
+                    let dist = _$DIST_BASE[di];
+                    const de2 = _$DIST_EXTRA[di];
+                    if (de2) {
+                        while (_$cnt < de2) {
+                            _$buf |= _$src[_$pos++] << _$cnt;
+                            _$cnt += 8;
+                        }
+                        dist += _$buf & _$MASK[de2];
+                        _$buf >>>= de2;
+                        _$cnt -= de2;
+                    }
+                    if (op + length > out.length) {
+                        let sz = out.length;
+                        while (sz < op + length) {
+                            sz <<= 1;
+                        }
+                        const nb = new Uint8Array(sz);
+                        nb.set(out);
+                        out = nb;
+                    }
+                    const sp = op - dist;
+                    if (dist === 1) {
+                        out.fill(out[sp], op, op + length);
+                        op += length;
+                    }
+                    else if (dist >= length) {
+                        out.copyWithin(op, sp, sp + length);
+                        op += length;
+                    }
+                    else {
+                        out.copyWithin(op, sp, sp + dist);
+                        let copied = dist;
+                        while (copied < length) {
+                            const chunk = Math.min(copied, length - copied);
+                            out.copyWithin(op + copied, op, op + chunk);
+                            copied += chunk;
+                        }
+                        op += length;
+                    }
+                }
+            }
+        }
+    }
+    _$outBuf = out;
+    return out.subarray(0, op);
+};
+/**
+ * @description zlibラッパー付きデータを解凍する (RFC 1950)。
+ *              zlibヘッダーを検出した場合は2バイトスキップし、それ以外は生DEFLATEとして処理する。
+ *              Decompresses zlib-wrapped data. Skips the 2-byte zlib header if detected,
+ *              otherwise treats input as raw DEFLATE.
+ *
+ * @param  {Uint8Array} input - zlib圧縮データまたは生DEFLATEストリーム
+ * @return {Uint8Array} 解凍されたバイト列
+ * @method
+ * @private
+ */
+const _$zlibDecompress = (input) => {
+    const cmf = input[0];
+    const flg = input[1];
+    const isZlib = (cmf & 0x0F) === 8
+        && (cmf * 256 + flg) % 31 === 0
+        && !(flg & 0x20);
+    return _$inflate(input, isZlib ? 2 : 0);
+};
+/**
+ * @description zlibの圧縮されたデータを解凍し、JSONとしてパースして返すワーカーエントリポイント。
+ *              Worker entry point that decompresses zlib data, decodes as URI-encoded string,
+ *              parses as JSON and posts the result back.
+ *
+ * @param  {MessageEvent} event - 圧縮データ (Uint8Array) を含むメッセージイベント
  * @return {void}
  * @method
  * @public
  */
 self.addEventListener("message", (event) => {
-    const buffer = decompressSync(event.data);
-    let json = "";
-    for (let idx = 0; idx < buffer.length; idx += 4096) {
-        json += String.fromCharCode(...buffer.subarray(idx, idx + 4096));
+    try {
+        const buffer = _$zlibDecompress(event.data);
+        self.postMessage(JSON.parse(decodeURIComponent(_$decoder.decode(buffer))));
+    }
+    catch (e) {
+        self.postMessage({
+            "error": e instanceof Error ? e.message : "Unknown decompression error"
+        });
     }
-    self.postMessage(JSON.parse(decodeURIComponent(json)));
 });
 export default {};

package/src/Loader/worker/unzip.worker.inline.js

@@ -1 +1 @@
-export const workerInlineUrl = 'data:application/javascript;base64,dmFyIFVuemlwV29ya2VyPWZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3ZhciByPVVpbnQ4QXJyYXksbj1VaW50MTZBcnJheSxlPUludDMyQXJyYXksYT1uZXcgcihbMCwwLDAsMCwwLDAsMCwwLDEsMSwxLDEsMiwyLDIsMiwzLDMsMywzLDQsNCw0LDQsNSw1LDUsNSwwLDAsMCwwXSksdD1uZXcgcihbMCwwLDAsMCwxLDEsMiwyLDMsMyw0LDQsNSw1LDYsNiw3LDcsOCw4LDksOSwxMCwxMCwxMSwxMSwxMiwxMiwxMywxMywwLDBdKSxpPW5ldyByKFsxNiwxNywxOCwwLDgsNyw5LDYsMTAsNSwxMSw0LDEyLDMsMTMsMiwxNCwxLDE1XSksZj1mdW5jdGlvbihyLGEpe2Zvcih2YXIgdD1uZXcgbigzMSksaT0wO2k8MzE7KytpKXRbaV09YSs9MTw8cltpLTFdO3ZhciBmPW5ldyBlKHRbMzBdKTtmb3IoaT0xO2k8MzA7KytpKWZvcih2YXIgbz10W2ldO288dFtpKzFdOysrbylmW29dPW8tdFtpXTw8NXxpO3JldHVybntiOnQscjpmfX0sbz1mKGEsMiksdj1vLmIsbD1vLnI7dlsyOF09MjU4LGxbMjU4XT0yODtmb3IodmFyIHU9Zih0LDApLmIsZD1uZXcgbigzMjc2OCksYz0wO2M8MzI3Njg7KytjKXt2YXIgcz0oNDM2OTAmYyk+PjF8KDIxODQ1JmMpPDwxO3M9KDYxNjgwJihzPSg1MjQyOCZzKT4+MnwoMTMxMDcmcyk8PDIpKT4+NHwoMzg1NSZzKTw8NCxkW2NdPSgoNjUyODAmcyk+Pjh8KDI1NSZzKTw8OCk+PjF9dmFyIHc9ZnVuY3Rpb24ocixlLGEpe2Zvcih2YXIgdD1yLmxlbmd0aCxpPTAsZj1uZXcgbihlKTtpPHQ7KytpKXJbaV0mJisrZltyW2ldLTFdO3ZhciBvLHY9bmV3IG4oZSk7Zm9yKGk9MTtpPGU7KytpKXZbaV09dltpLTFdK2ZbaS0xXTw8MTtpZihhKXtvPW5ldyBuKDE8PGUpO3ZhciBsPTE1LWU7Zm9yKGk9MDtpPHQ7KytpKWlmKHJbaV0pZm9yKHZhciB1PWk8PDR8cltpXSxjPWUtcltpXSxzPXZbcltpXS0xXSsrPDxjLHc9c3woMTw8YyktMTtzPD13OysrcylvW2Rbc10+PmxdPXV9ZWxzZSBmb3Iobz1uZXcgbih0KSxpPTA7aTx0OysraSlyW2ldJiYob1tpXT1kW3ZbcltpXS0xXSsrXT4+MTUtcltpXSk7cmV0dXJuIG99LGI9bmV3IHIoMjg4KTtmb3IoYz0wO2M8MTQ0OysrYyliW2NdPTg7Zm9yKGM9MTQ0O2M8MjU2OysrYyliW2NdPTk7Zm9yKGM9MjU2O2M8MjgwOysrYyliW2NdPTc7Zm9yKGM9MjgwO2M8Mjg4OysrYyliW2NdPTg7dmFyIGc9bmV3IHIoMzIpO2ZvcihjPTA7YzwzMjsrK2MpZ1tjXT01O3ZhciBoPXcoYiw5LDEpLHA9dyhnLDUsMSkseT1mdW5jdGlvbihyKXtmb3IodmFyIG49clswXSxlPTE7ZTxyLmxlbmd0aDsrK2UpcltlXT5uJiYobj1yW2VdKTtyZXR1cm4gbn0sbT1mdW5jdGlvbihyLG4sZSl7dmFyIGE9bi84fDA7cmV0dXJuKHJbYV18clthKzFdPDw4KT4+KDcmbikmZX0saz1mdW5jdGlvbihyLG4pe3ZhciBlPW4vOHwwO3JldHVybihyW2VdfHJbZSsxXTw8OHxyW2UrMl08PDE2KT4+KDcmbil9LHg9ZnVuY3Rpb24ocil7cmV0dXJuKHIrNykvOHwwfSx6PVsidW5leHBlY3RlZCBFT0YiLCJpbnZhbGlkIGJsb2NrIHR5cGUiLCJpbnZhbGlkIGxlbmd0aC9saXRlcmFsIiwiaW52YWxpZCBkaXN0YW5jZSIsInN0cmVhbSBmaW5pc2hlZCIsIm5vIHN0cmVhbSBoYW5kbGVyIiwsIm5vIGNhbGxiYWNrIiwiaW52YWxpZCBVVEYtOCBkYXRhIiwiZXh0cmEgZmllbGQgdG9vIGxvbmciLCJkYXRlIG5vdCBpbiByYW5nZSAxOTgwLTIwOTkiLCJmaWxlbmFtZSB0b28gbG9uZyIsInN0cmVhbSBmaW5pc2hpbmciLCJpbnZhbGlkIHppcCBkYXRhIl0sRT1mdW5jdGlvbihyLG4sZSl7dmFyIGE9bmV3IEVycm9yKG58fHpbcl0pO2lmKGEuY29kZT1yLEVycm9yLmNhcHR1cmVTdGFja1RyYWNlJiZFcnJvci5jYXB0dXJlU3RhY2tUcmFjZShhLEUpLCFlKXRocm93IGE7cmV0dXJuIGF9LFQ9ZnVuY3Rpb24obixlLGYsbyl7dmFyIGw9bi5sZW5ndGg7aWYoIWx8fGUuZiYmIWUubClyZXR1cm4gZnx8bmV3IHIoMCk7dmFyIGQ9IWYsYz1kfHwyIT1lLmkscz1lLmk7ZCYmKGY9bmV3IHIoMypsKSk7dmFyIGI9ZnVuY3Rpb24obil7dmFyIGU9Zi5sZW5ndGg7aWYobj5lKXt2YXIgYT1uZXcgcihNYXRoLm1heCgyKmUsbikpO2Euc2V0KGYpLGY9YX19LGc9ZS5mfHwwLHo9ZS5wfHwwLFQ9ZS5ifHwwLFU9ZS5sLFM9ZS5kLEE9ZS5tLEM9ZS5uLE09OCpsO2Rve2lmKCFVKXtnPW0obix6LDEpO3ZhciBEPW0obix6KzEsMyk7aWYoeis9MywhRCl7dmFyIEY9blsoRz14KHopKzQpLTRdfG5bRy0zXTw8OCxJPUcrRjtpZihJPmwpe3MmJkUoMCk7YnJlYWt9YyYmYihUK0YpLGYuc2V0KG4uc3ViYXJyYXkoRyxJKSxUKSxlLmI9VCs9RixlLnA9ej04KkksZS5mPWc7Y29udGludWV9aWYoMT09RClVPWgsUz1wLEE9OSxDPTU7ZWxzZSBpZigyPT1EKXt2YXIgTz1tKG4seiwzMSkrMjU3LEo9bShuLHorMTAsMTUpKzQsTD1PK20obix6KzUsMzEpKzE7eis9MTQ7Zm9yKHZhciBOPW5ldyByKEwpLFI9bmV3IHIoMTkpLFc9MDtXPEo7KytXKVJbaVtXXV09bShuLHorMypXLDcpO3orPTMqSjt2YXIgaj15KFIpLHE9KDE8PGopLTEsQj13KFIsaiwxKTtmb3IoVz0wO1c8TDspe3ZhciBHLEg9QlttKG4seixxKV07aWYoeis9MTUmSCwoRz1IPj40KTwxNilOW1crK109RztlbHNle3ZhciBLPTAsUD0wO2ZvcigxNj09Rz8oUD0zK20obix6LDMpLHorPTIsSz1OW1ctMV0pOjE3PT1HPyhQPTMrbShuLHosNykseis9Myk6MTg9PUcmJihQPTExK20obix6LDEyNykseis9Nyk7UC0tOylOW1crK109S319dmFyIFE9Ti5zdWJhcnJheSgwLE8pLFY9Ti5zdWJhcnJheShPKTtBPXkoUSksQz15KFYpLFU9dyhRLEEsMSksUz13KFYsQywxKX1lbHNlIEUoMSk7aWYoej5NKXtzJiZFKDApO2JyZWFrfX1jJiZiKFQrMTMxMDcyKTtmb3IodmFyIFg9KDE8PEEpLTEsWT0oMTw8QyktMSxaPXo7O1o9eil7dmFyICQ9KEs9VVtrKG4seikmWF0pPj40O2lmKCh6Kz0xNSZLKT5NKXtzJiZFKDApO2JyZWFrfWlmKEt8fEUoMiksJDwyNTYpZltUKytdPSQ7ZWxzZXtpZigyNTY9PSQpe1o9eixVPW51bGw7YnJlYWt9dmFyIF89JC0yNTQ7aWYoJD4yNjQpe3ZhciBycj1hW1c9JC0yNTddO189bShuLHosKDE8PHJyKS0xKSt2W1ddLHorPXJyfXZhciBucj1TW2sobix6KSZZXSxlcj1ucj4+NDtucnx8RSgzKSx6Kz0xNSZucjtWPXVbZXJdO2lmKGVyPjMpe3JyPXRbZXJdO1YrPWsobix6KSYoMTw8cnIpLTEseis9cnJ9aWYoej5NKXtzJiZFKDApO2JyZWFrfWMmJmIoVCsxMzEwNzIpO3ZhciBhcj1UK187aWYoVDxWKXt2YXIgdHI9MC1WLGlyPU1hdGgubWluKFYsYXIpO2Zvcih0citUPDAmJkUoMyk7VDxpcjsrK1QpZltUXT1vW3RyK1RdfWZvcig7VDxhcjsrK1QpZltUXT1mW1QtVl19fWUubD1VLGUucD1aLGUuYj1ULGUuZj1nLFUmJihnPTEsZS5tPUEsZS5kPVMsZS5uPUMpfXdoaWxlKCFnKTtyZXR1cm4gVCE9Zi5sZW5ndGgmJmQ/ZnVuY3Rpb24obixlLGEpe3JldHVybihudWxsPT1hfHxhPm4ubGVuZ3RoKSYmKGE9bi5sZW5ndGgpLG5ldyByKG4uc3ViYXJyYXkoZSxhKSl9KGYsMCxUKTpmLnN1YmFycmF5KDAsVCl9LFU9bmV3IHIoMCk7ZnVuY3Rpb24gUyhuLGUpe3ZhciBhLHQsaT1mdW5jdGlvbihyKXszMT09clswXSYmMTM5PT1yWzFdJiY4PT1yWzJdfHxFKDYsImludmFsaWQgZ3ppcCBkYXRhIik7dmFyIG49clszXSxlPTEwOzQmbiYmKGUrPTIrKHJbMTBdfHJbMTFdPDw4KSk7Zm9yKHZhciBhPShuPj4zJjEpKyhuPj40JjEpO2E+MDthLT0hcltlKytdKTtyZXR1cm4gZSsoMiZuKX0obik7cmV0dXJuIGkrOD5uLmxlbmd0aCYmRSg2LCJpbnZhbGlkIGd6aXAgZGF0YSIpLFQobi5zdWJhcnJheShpLC04KSx7aToyfSxuZXcgcigodD0oYT1uKS5sZW5ndGgsKGFbdC00XXxhW3QtM108PDh8YVt0LTJdPDwxNnxhW3QtMV08PDI0KT4+PjApKSxlKX1mdW5jdGlvbiBBKHIsbil7cmV0dXJuIFQoci5zdWJhcnJheSgoKDghPSgxNSYoZT1yKVswXSl8fGVbMF0+PjQ+N3x8KGVbMF08PDh8ZVsxXSklMzEpJiZFKDYsImludmFsaWQgemxpYiBkYXRhIiksMT09KGVbMV0+PjUmMSkmJkUoNiwiaW52YWxpZCB6bGliIGRhdGE6ICIrKDMyJmVbMV0/Im5lZWQiOiJ1bmV4cGVjdGVkIikrIiBkaWN0aW9uYXJ5IiksMisoZVsxXT4+MyY0KSksLTQpLHtpOjJ9LG4sbik7dmFyIGV9ZnVuY3Rpb24gQyhyLG4pe3JldHVybiAzMT09clswXSYmMTM5PT1yWzFdJiY4PT1yWzJdP1MocixuKTo4IT0oMTUmclswXSl8fHJbMF0+PjQ+N3x8KHJbMF08PDh8clsxXSklMzE/ZnVuY3Rpb24ocixuKXtyZXR1cm4gVChyLHtpOjJ9LG4sbil9KHIsbik6QShyLG4pfXZhciBNPSJ1bmRlZmluZWQiIT10eXBlb2YgVGV4dERlY29kZXImJm5ldyBUZXh0RGVjb2Rlcjt0cnl7TS5kZWNvZGUoVSx7c3RyZWFtOiEwfSl9Y2F0Y2gocil7fXNlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIscj0+e2NvbnN0IG49QyhyLmRhdGEpO2xldCBlPSIiO2ZvcihsZXQgcj0wO3I8bi5sZW5ndGg7cis9NDA5NillKz1TdHJpbmcuZnJvbUNoYXJDb2RlKC4uLm4uc3ViYXJyYXkocixyKzQwOTYpKTtzZWxmLnBvc3RNZXNzYWdlKEpTT04ucGFyc2UoZGVjb2RlVVJJQ29tcG9uZW50KGUpKSl9KTtyZXR1cm57fX0oKTsK';
+export const workerInlineUrl = 'data:application/javascript;base64,dmFyIFVuemlwV29ya2VyPWZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO2NvbnN0IHQ9bmV3IFVpbnQxNkFycmF5KFszLDQsNSw2LDcsOCw5LDEwLDExLDEzLDE1LDE3LDE5LDIzLDI3LDMxLDM1LDQzLDUxLDU5LDY3LDgzLDk5LDExNSwxMzEsMTYzLDE5NSwyMjcsMjU4XSksZT1uZXcgVWludDhBcnJheShbMCwwLDAsMCwwLDAsMCwwLDEsMSwxLDEsMiwyLDIsMiwzLDMsMywzLDQsNCw0LDQsNSw1LDUsNSwwXSksbj1uZXcgVWludDE2QXJyYXkoWzEsMiwzLDQsNSw3LDksMTMsMTcsMjUsMzMsNDksNjUsOTcsMTI5LDE5MywyNTcsMzg1LDUxMyw3NjksMTAyNSwxNTM3LDIwNDksMzA3Myw0MDk3LDYxNDUsODE5MywxMjI4OSwxNjM4NSwyNDU3N10pLHI9bmV3IFVpbnQ4QXJyYXkoWzAsMCwwLDAsMSwxLDIsMiwzLDMsNCw0LDUsNSw2LDYsNyw3LDgsOCw5LDksMTAsMTAsMTEsMTEsMTIsMTIsMTMsMTNdKSxvPW5ldyBVaW50OEFycmF5KFsxNiwxNywxOCwwLDgsNyw5LDYsMTAsNSwxMSw0LDEyLDMsMTMsMiwxNCwxLDE1XSkscz1uZXcgVWludDMyQXJyYXkoMTcpO2ZvcihsZXQgdD0xO3Q8MTc7dCsrKXNbdF09KDE8PHQpLTE7Y29uc3QgbD1uZXcgVWludDhBcnJheSgyODgpO2ZvcihsZXQgdD0wO3Q8PTE0Mzt0KyspbFt0XT04O2ZvcihsZXQgdD0xNDQ7dDw9MjU1O3QrKylsW3RdPTk7Zm9yKGxldCB0PTI1Njt0PD0yNzk7dCsrKWxbdF09Nztmb3IobGV0IHQ9MjgwO3Q8PTI4Nzt0KyspbFt0XT04O2NvbnN0IGk9bmV3IFVpbnQ4QXJyYXkoMzIpLmZpbGwoNSksZj1uZXcgVGV4dERlY29kZXI7bGV0IGM9bmV3IFVpbnQ4QXJyYXkoNjU1MzYpO2NvbnN0IGE9bmV3IFVpbnQxNkFycmF5KDE2KSx5PW5ldyBVaW50MTZBcnJheSgxNiksdz1uZXcgVWludDhBcnJheSgxOSksVT1uZXcgVWludDhBcnJheSgzMjApO2xldCBBPW5ldyBVaW50MzJBcnJheSgxMjgpLGg9bmV3IFVpbnQzMkFycmF5KDIwNDgpLHU9bmV3IFVpbnQzMkFycmF5KDEwMjQpO2NvbnN0IGc9KHQsZSxuKT0+e2xldCByPTA7YS5maWxsKDApO2ZvcihsZXQgbj0wO248ZTtuKyspe2NvbnN0IGU9dFtuXTtlJiYoYVtlXSsrLGU+ciYmKHI9ZSkpfWlmKCFyKXJldHVybiBuPyhuWzBdPTAsW24sMV0pOltuZXcgVWludDMyQXJyYXkoMiksMV07eS5maWxsKDApO2ZvcihsZXQgdD0xLGU9MDt0PD1yO3QrKyllPWUrYVt0LTFdPDwxLHlbdF09ZTtjb25zdCBvPTE8PHI7bGV0IHM7biYmbi5sZW5ndGg+PW8/KHM9bixzLmZpbGwoMCwwLG8pKTpzPW5ldyBVaW50MzJBcnJheShvKTtmb3IobGV0IG49MDtuPGU7bisrKXtjb25zdCBlPXRbbl07aWYoIWUpY29udGludWU7bGV0IHI9eVtlXSsrLGw9MDtmb3IobGV0IHQ9MDt0PGU7dCsrKWw9bDw8MXwxJnIscj4+PTE7Y29uc3QgaT1uPDw0fGU7Zm9yKGxldCB0PWw7dDxvO3QrPTE8PGUpc1t0XT1pfXJldHVybltzLHJdfSxbZCxwXT1nKGwsMjg4KSxbYixtXT1nKGksMzIpLEU9c1twXSxrPXNbbV07bGV0IE0sVyx2LHg7Y29uc3QgRD10PT57Zm9yKDt4PHQ7KXZ8PU1bVysrXTw8eCx4Kz04O2NvbnN0IGU9diZzW3RdO3JldHVybiB2Pj4+PXQseC09dCxlfSxJPSh0LGUsbik9Pntmb3IoO3g8ZTspdnw9TVtXKytdPDx4LHgrPTg7Y29uc3Qgcj10W3Ymbl07cmV0dXJuIHY+Pj49MTUmcix4LT0xNSZyLHI+PjR9LEw9bD0+e2NvbnN0IGk9bFswXSxmPWxbMV07cmV0dXJuKChsLGkpPT57TT1sLFc9aSx2PTAseD0wO2NvbnN0IGY9TWF0aC5tYXgoNipsLmxlbmd0aCw0MDk2KTtjLmxlbmd0aDxmJiYoYz1uZXcgVWludDhBcnJheShmKSk7bGV0IGE9Yyx5PTAsTD0wO2Zvcig7IUw7KXtMPUQoMSk7Y29uc3QgbD1EKDIpO2lmKDA9PT1sKXtjb25zdCB0PTcmeDt2Pj4+PXQseC09dDtjb25zdCBlPUQoMTYpO2lmKEQoMTYpLHkrZT5hLmxlbmd0aCl7bGV0IHQ9YS5sZW5ndGg7Zm9yKDt0PHkrZTspdDw8PTE7Y29uc3Qgbj1uZXcgVWludDhBcnJheSh0KTtuLnNldChhKSxhPW59YS5zZXQoTS5zdWJhcnJheShXLFcrZSkseSksVys9ZSx5Kz1lfWVsc2V7aWYoMz09PWwpdGhyb3cgbmV3IEVycm9yKCJJbnZhbGlkIERFRkxBVEUgYmxvY2sgdHlwZSIpO3tsZXQgaSxmLGMsTCxULHo7aWYoMT09PWwpaT1kLGM9cCxmPUUsTD1iLHo9bSxUPWs7ZWxzZXtjb25zdCB0PUQoNSkrMjU3LGU9RCg1KSsxLG49RCg0KSs0O3cuZmlsbCgwKTtmb3IobGV0IHQ9MDt0PG47dCsrKXdbb1t0XV09RCgzKTtsZXQgcjtbQSxyXT1nKHcsMTksQSk7Y29uc3QgbD1zW3JdLGE9dCtlO1UuZmlsbCgwLDAsYSk7Zm9yKGxldCB0PTA7dDxhOyl7Y29uc3QgZT1JKEEscixsKTtpZihlPDE2KVVbdCsrXT1lO2Vsc2UgaWYoMTY9PT1lKXtjb25zdCBlPVVbdC0xXTtmb3IobGV0IG49RCgyKSszO24+MDtuLS0pVVt0KytdPWV9ZWxzZSB0Kz0xNz09PWU/RCgzKSszOkQoNykrMTF9W2gsY109ZyhVLnN1YmFycmF5KDAsdCksdCxoKSxmPXNbY10saT1oLFt1LHpdPWcoVS5zdWJhcnJheSh0LGEpLGUsdSksVD1zW3pdLEw9dX1mb3IoOzspe2Zvcig7eDxjOyl2fD1NW1crK108PHgseCs9ODtjb25zdCBvPWlbdiZmXSxsPTE1Jm87dj4+Pj1sLHgtPWw7Y29uc3Qgdz1vPj40O2lmKHc8MjU2KXtpZih5Pj1hLmxlbmd0aCl7Y29uc3QgdD1uZXcgVWludDhBcnJheShhLmxlbmd0aDw8MSk7dC5zZXQoYSksYT10fWFbeSsrXT13fWVsc2V7aWYoMjU2PT09dylicmVhazt7Y29uc3Qgbz13LTI1NztsZXQgbD10W29dO2NvbnN0IGk9ZVtvXTtpZihpKXtmb3IoO3g8aTspdnw9TVtXKytdPDx4LHgrPTg7bCs9diZzW2ldLHY+Pj49aSx4LT1pfWZvcig7eDx6Oyl2fD1NW1crK108PHgseCs9ODtjb25zdCBmPUxbdiZUXSxjPTE1JmY7dj4+Pj1jLHgtPWM7Y29uc3QgVT1mPj40O2xldCBBPW5bVV07Y29uc3QgaD1yW1VdO2lmKGgpe2Zvcig7eDxoOyl2fD1NW1crK108PHgseCs9ODtBKz12JnNbaF0sdj4+Pj1oLHgtPWh9aWYoeStsPmEubGVuZ3RoKXtsZXQgdD1hLmxlbmd0aDtmb3IoO3Q8eStsOyl0PDw9MTtjb25zdCBlPW5ldyBVaW50OEFycmF5KHQpO2Uuc2V0KGEpLGE9ZX1jb25zdCB1PXktQTtpZigxPT09QSlhLmZpbGwoYVt1XSx5LHkrbCkseSs9bDtlbHNlIGlmKEE+PWwpYS5jb3B5V2l0aGluKHksdSx1K2wpLHkrPWw7ZWxzZXthLmNvcHlXaXRoaW4oeSx1LHUrQSk7bGV0IHQ9QTtmb3IoO3Q8bDspe2NvbnN0IGU9TWF0aC5taW4odCxsLXQpO2EuY29weVdpdGhpbih5K3QseSx5K2UpLHQrPWV9eSs9bH19fX19fX1yZXR1cm4gYz1hLGEuc3ViYXJyYXkoMCx5KX0pKGwsOD09KDE1JmkpJiYoMjU2KmkrZiklMzE9PTAmJiEoMzImZik/MjowKX07c2VsZi5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIix0PT57dHJ5e2NvbnN0IGU9TCh0LmRhdGEpO3NlbGYucG9zdE1lc3NhZ2UoSlNPTi5wYXJzZShkZWNvZGVVUklDb21wb25lbnQoZi5kZWNvZGUoZSkpKSl9Y2F0Y2godCl7c2VsZi5wb3N0TWVzc2FnZSh7ZXJyb3I6dCBpbnN0YW5jZW9mIEVycm9yP3QubWVzc2FnZToiVW5rbm93biBkZWNvbXByZXNzaW9uIGVycm9yIn0pfX0pO3JldHVybnt9fSgpOwo=';

package/src/Shape/usecase/ShapeCalcBoundsMatrixUseCase.js

@@ -2,7 +2,7 @@ import { Matrix } from "@next2d/geom";
 import { execute as displayObjectCalcBoundsMatrixService } from "../../DisplayObject/service/DisplayObjectCalcBoundsMatrixService";
 import { execute as shapeGetRawBoundsService } from "../service/ShapeGetRawBoundsService";
 import { execute as displayObjectGetRawMatrixUseCase } from "../../DisplayObject/usecase/DisplayObjectGetRawMatrixUseCase";
-import { $poolBoundsArray } from "../../DisplayObjectUtil";
+import { $poolBoundsArray, $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @description Shapeの描画範囲を計算します。
  *              Calculate the drawing area of Shape.
@@ -15,7 +15,22 @@ import { $poolBoundsArray } from "../../DisplayObjectUtil";
  */
 export const execute = (shape, matrix = null) => {
     const rawBounds = shapeGetRawBoundsService(shape);
-    const rawMatrix = displayObjectGetRawMatrixUseCase(shape);
+    let rawMatrix = displayObjectGetRawMatrixUseCase(shape);
+    // cacheAsBitmap倍率をrawMatrixに適用
+    const cacheMatrix = shape.cacheAsBitmap;
+    let scaledMatrix = null;
+    if (cacheMatrix) {
+        const m = cacheMatrix.rawData;
+        const csx = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+        const csy = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+        if (rawMatrix) {
+            scaledMatrix = $getFloat32Array6(rawMatrix[0] * csx, rawMatrix[1] * csx, rawMatrix[2] * csy, rawMatrix[3] * csy, rawMatrix[4], rawMatrix[5]);
+        }
+        else {
+            scaledMatrix = $getFloat32Array6(csx, 0, 0, csy, 0, 0);
+        }
+        rawMatrix = scaledMatrix;
+    }
     if (!rawMatrix) {
         if (matrix) {
             const calcBounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], matrix);
@@ -25,6 +40,9 @@ export const execute = (shape, matrix = null) => {
         return rawBounds;
     }
     const calcBounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], matrix ? Matrix.multiply(matrix, rawMatrix) : rawMatrix);
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     $poolBoundsArray(rawBounds);
     return calcBounds;
 };

package/src/Shape/usecase/ShapeGenerateRenderQueueUseCase.js

@@ -58,10 +58,10 @@ export const execute = (shape, matrix, color_transform, renderer_width, renderer
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
     const bounds = displayObjectCalcBoundsMatrixService(graphics.xMin, graphics.yMin, graphics.xMax, graphics.yMax, tMatrix);
-    const xMin = bounds[0];
-    const yMin = bounds[1];
-    const xMax = bounds[2];
-    const yMax = bounds[3];
+    let xMin = bounds[0];
+    let yMin = bounds[1];
+    let xMax = bounds[2];
+    let yMax = bounds[3];
     $poolBoundsArray(bounds);
     const width = Math.ceil(Math.abs(xMax - xMin));
     const height = Math.ceil(Math.abs(yMax - yMin));
@@ -111,13 +111,51 @@ export const execute = (shape, matrix, color_transform, renderer_width, renderer
                 : `${displayObjectGenerateHashService(graphics.buffer)}`;
         }
     }
-    const xScale = Math.sqrt(tMatrix[0] * tMatrix[0]
-        + tMatrix[1] * tMatrix[1]);
-    const yScale = Math.sqrt(tMatrix[2] * tMatrix[2]
-        + tMatrix[3] * tMatrix[3]);
-    const xScaleRounded = Math.round(xScale * 100) / 100;
-    const yScaleRounded = Math.round(yScale * 100) / 100;
-    if (!shape.isBitmap
+    // cacheAsBitmap: 指定Matrix × 自身のスケール × stageのrendererScaleでキャッシュ品質を決定
+    // 1.0基準: Matrix(1,0,0,1)はdisplayObjectの等倍スケールを意味する
+    const cacheMatrix = shape.cacheAsBitmap;
+    let renderXScale;
+    let renderYScale;
+    let cacheScaleX = 1;
+    let cacheScaleY = 1;
+    if (cacheMatrix) {
+        const m = cacheMatrix.rawData;
+        cacheScaleX = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+        cacheScaleY = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+        const ownScaleX = rawMatrix
+            ? Math.sqrt(rawMatrix[0] * rawMatrix[0] + rawMatrix[1] * rawMatrix[1])
+            : 1;
+        const ownScaleY = rawMatrix
+            ? Math.sqrt(rawMatrix[2] * rawMatrix[2] + rawMatrix[3] * rawMatrix[3])
+            : 1;
+        renderXScale = cacheScaleX * ownScaleX * stage.rendererScale;
+        renderYScale = cacheScaleY * ownScaleY * stage.rendererScale;
+        // cacheMatrix倍率をスクリーン座標のboundsにも反映
+        if (cacheScaleX !== 1 || cacheScaleY !== 1) {
+            const modMatrix = $getFloat32Array6(tMatrix[0] * cacheScaleX, tMatrix[1] * cacheScaleX, tMatrix[2] * cacheScaleY, tMatrix[3] * cacheScaleY, tMatrix[4], tMatrix[5]);
+            const modBounds = displayObjectCalcBoundsMatrixService(graphics.xMin, graphics.yMin, graphics.xMax, graphics.yMax, modMatrix);
+            xMin = modBounds[0];
+            yMin = modBounds[1];
+            xMax = modBounds[2];
+            yMax = modBounds[3];
+            $poolBoundsArray(modBounds);
+            $poolFloat32Array6(modMatrix);
+        }
+    }
+    else {
+        renderXScale = Math.sqrt(tMatrix[0] * tMatrix[0]
+            + tMatrix[1] * tMatrix[1]);
+        renderYScale = Math.sqrt(tMatrix[2] * tMatrix[2]
+            + tMatrix[3] * tMatrix[3]);
+    }
+    const xScaleRounded = Math.round(renderXScale * 100) / 100;
+    const yScaleRounded = Math.round(renderYScale * 100) / 100;
+    if (cacheMatrix && shape.cacheKey
+        && shape.cacheParams[0] === xScaleRounded
+        && shape.cacheParams[1] === yScaleRounded) {
+        // cacheAsBitmap: スケール未変更のためキャッシュキーを維持
+    }
+    else if (!shape.isBitmap
         && !shape.cacheKey
         || shape.cacheParams[0] !== xScaleRounded
         || shape.cacheParams[1] !== yScaleRounded
@@ -131,7 +169,7 @@ export const execute = (shape, matrix, color_transform, renderer_width, renderer
         ? 0
         : shape.cacheKey;
     // rennder on
-    renderQueue.pushShapeBuffer(1, $RENDERER_SHAPE_TYPE, tMatrix[0], tMatrix[1], tMatrix[2], tMatrix[3], tMatrix[4], tMatrix[5], tColorTransform[0], tColorTransform[1], tColorTransform[2], tColorTransform[3], tColorTransform[4], tColorTransform[5], tColorTransform[6], tColorTransform[7], xMin, yMin, xMax, yMax, graphics.xMin, graphics.yMin, graphics.xMax, graphics.yMax, +isGridEnabled, +isDrawable, +shape.isBitmap, +shape.uniqueKey, cacheKey, xScale, yScale, shape.instanceId // フィルターキャッシュ用のユニークキー
+    renderQueue.pushShapeBuffer(1, $RENDERER_SHAPE_TYPE, tMatrix[0] * cacheScaleX, tMatrix[1] * cacheScaleX, tMatrix[2] * cacheScaleY, tMatrix[3] * cacheScaleY, tMatrix[4], tMatrix[5], tColorTransform[0], tColorTransform[1], tColorTransform[2], tColorTransform[3], tColorTransform[4], tColorTransform[5], tColorTransform[6], tColorTransform[7], xMin, yMin, xMax, yMax, graphics.xMin, graphics.yMin, graphics.xMax, graphics.yMax, +isGridEnabled, +isDrawable, shape.isBitmap ? 1 : cacheMatrix ? 2 : 0, +shape.uniqueKey, cacheKey, renderXScale, renderYScale, shape.instanceId // フィルターキャッシュ用のユニークキー
     );
     if (shape.$cache && !shape.$cache.has(shape.uniqueKey)) {
         shape.$cache = null;

package/src/Shape/usecase/ShapeHitTestUseCase.js

@@ -1,6 +1,7 @@
 import { Matrix } from "@next2d/geom";
 import { execute as displayObjectGetRawMatrixUseCase } from "../../DisplayObject/usecase/DisplayObjectGetRawMatrixUseCase";
 import { execute as graphicsHitTestService } from "../../Graphics/service/GraphicsHitTestService";
+import { $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @description Shape のヒット判定
  *              Hit judgment of Shape
@@ -20,10 +21,28 @@ export const execute = (shape, hit_context, matrix, hit_object) => {
     if (width <= 0 || height <= 0) {
         return false;
     }
-    const rawMatrix = displayObjectGetRawMatrixUseCase(shape);
+    let rawMatrix = displayObjectGetRawMatrixUseCase(shape);
+    // cacheAsBitmap倍率をrawMatrixに適用
+    const cacheMatrix = shape.cacheAsBitmap;
+    let scaledMatrix = null;
+    if (cacheMatrix) {
+        const m = cacheMatrix.rawData;
+        const csx = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+        const csy = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+        if (rawMatrix) {
+            scaledMatrix = $getFloat32Array6(rawMatrix[0] * csx, rawMatrix[1] * csx, rawMatrix[2] * csy, rawMatrix[3] * csy, rawMatrix[4], rawMatrix[5]);
+        }
+        else {
+            scaledMatrix = $getFloat32Array6(csx, 0, 0, csy, 0, 0);
+        }
+        rawMatrix = scaledMatrix;
+    }
     const tMatrix = rawMatrix
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     hit_context.beginPath();
     hit_context.setTransform(tMatrix[0], tMatrix[1], tMatrix[2], tMatrix[3], tMatrix[4], tMatrix[5]);
     let hit = false;

package/src/TextField/usecase/TextFieldCalcBoundsMatrixUseCase.js

@@ -2,7 +2,7 @@ import { Matrix } from "@next2d/geom";
 import { execute as displayObjectCalcBoundsMatrixService } from "../../DisplayObject/service/DisplayObjectCalcBoundsMatrixService";
 import { execute as textFieldGetRawBoundsService } from "../service/TextFieldGetRawBoundsService";
 import { execute as displayObjectGetRawMatrixUseCase } from "../../DisplayObject/usecase/DisplayObjectGetRawMatrixUseCase";
-import { $poolBoundsArray } from "../../DisplayObjectUtil";
+import { $poolBoundsArray, $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @description TextFieldの描画範囲を計算します。
  *              Calculate the drawing area of Shape.
@@ -15,7 +15,22 @@ import { $poolBoundsArray } from "../../DisplayObjectUtil";
  */
 export const execute = (text_field, matrix = null) => {
     const rawBounds = textFieldGetRawBoundsService(text_field);
-    const rawMatrix = displayObjectGetRawMatrixUseCase(text_field);
+    let rawMatrix = displayObjectGetRawMatrixUseCase(text_field);
+    // cacheAsBitmap倍率をrawMatrixに適用
+    const cacheMatrix = text_field.cacheAsBitmap;
+    let scaledMatrix = null;
+    if (cacheMatrix) {
+        const m = cacheMatrix.rawData;
+        const csx = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+        const csy = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+        if (rawMatrix) {
+            scaledMatrix = $getFloat32Array6(rawMatrix[0] * csx, rawMatrix[1] * csx, rawMatrix[2] * csy, rawMatrix[3] * csy, rawMatrix[4], rawMatrix[5]);
+        }
+        else {
+            scaledMatrix = $getFloat32Array6(csx, 0, 0, csy, 0, 0);
+        }
+        rawMatrix = scaledMatrix;
+    }
     if (!rawMatrix) {
         if (matrix) {
             const calcBounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], matrix);
@@ -25,6 +40,9 @@ export const execute = (text_field, matrix = null) => {
         return rawBounds;
     }
     const calcBounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], matrix ? Matrix.multiply(matrix, rawMatrix) : rawMatrix);
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     $poolBoundsArray(rawBounds);
     return calcBounds;
 };