@next2d/display 3.0.5 → 3.1.0

package/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.js

@@ -5,7 +5,8 @@ import { execute as displayObjectBlendToNumberService } from "../../DisplayObjec
 import { execute as displayObjectGenerateHashService } from "../../DisplayObject/service/DisplayObjectGenerateHashService";
 import { $cacheStore } from "@next2d/cache";
 import { renderQueue } from "@next2d/render-queue";
-import { $clamp, $RENDERER_TEXT_TYPE, $getArray, $poolArray, $poolBoundsArray, $getBoundsArray } from "../../DisplayObjectUtil";
+import { stage } from "../../Stage";
+import { $clamp, $RENDERER_TEXT_TYPE, $getArray, $poolArray, $poolBoundsArray, $getBoundsArray, $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 import { ColorTransform, Matrix } from "@next2d/geom";
 /**
  * @type {TextEncoder}
@@ -56,10 +57,10 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
     const bounds = displayObjectCalcBoundsMatrixService(text_field.xMin, text_field.yMin, text_field.xMax, text_field.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));
@@ -104,13 +105,51 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
             text_field.uniqueKey = `${text_field.instanceId}`;
         }
     }
-    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 (text_field.changed
+    // cacheAsBitmap: 指定Matrix × 自身のスケール × stageのrendererScaleでキャッシュ品質を決定
+    // 1.0基準: Matrix(1,0,0,1)はdisplayObjectの等倍スケールを意味する
+    const cacheMatrix = text_field.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(text_field.xMin, text_field.yMin, text_field.xMax, text_field.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 && text_field.cacheKey
+        && text_field.cacheParams[0] === xScaleRounded
+        && text_field.cacheParams[1] === yScaleRounded) {
+        // cacheAsBitmap: スケール未変更のためキャッシュキーを維持
+    }
+    else if (text_field.changed
         && !text_field.cacheKey
         || text_field.cacheParams[0] !== xScaleRounded
         || text_field.cacheParams[1] !== yScaleRounded
@@ -122,7 +161,7 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
     }
     const cacheKey = text_field.cacheKey;
     // rennder on
-    renderQueue.pushTextFieldBuffer(1, $RENDERER_TEXT_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, text_field.xMin, text_field.yMin, text_field.xMax, text_field.yMax, +text_field.uniqueKey, cacheKey, +text_field.changed, xScale, yScale, text_field.instanceId // フィルターキャッシュ用のユニークキー
+    renderQueue.pushTextFieldBuffer(1, $RENDERER_TEXT_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, text_field.xMin, text_field.yMin, text_field.xMax, text_field.yMax, +text_field.uniqueKey, cacheKey, +text_field.changed | (cacheMatrix ? 2 : 0), renderXScale, renderYScale, text_field.instanceId // フィルターキャッシュ用のユニークキー
     );
     if (text_field.$cache && !text_field.$cache.has(text_field.uniqueKey)) {
         text_field.$cache = null;

package/src/TextField/usecase/TextFieldHitTestUseCase.js

@@ -1,5 +1,6 @@
 import { Matrix } from "@next2d/geom";
 import { execute as displayObjectGetRawMatrixUseCase } from "../../DisplayObject/usecase/DisplayObjectGetRawMatrixUseCase";
+import { $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @description TextField のヒット判定
  *              Hit judgment of TextField
@@ -18,10 +19,28 @@ export const execute = (text_field, hit_context, matrix, hit_object) => {
     if (width <= 0 || height <= 0) {
         return false;
     }
-    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;
+    }
     const tMatrix = rawMatrix
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     hit_context.setTransform(tMatrix[0], tMatrix[1], tMatrix[2], tMatrix[3], tMatrix[4], tMatrix[5]);
     hit_context.beginPath();
     hit_context.moveTo(0, 0);