@next2d/display 2.13.1 → 3.0.0

package/src/TextField/usecase/TextFieldCalcLayerBoundsUseCase.js

@@ -0,0 +1,32 @@
+import { execute as textFieldCalcBoundsMatrixUseCase } from "./TextFieldCalcBoundsMatrixUseCase";
+import { $getBoundsArray, $poolBoundsArray } from "../../DisplayObjectUtil";
+/**
+ * @description TextFieldのフィルター適用後の描画範囲を計算します。
+ *              Calculate the drawing area of TextField after applying filters.
+ *
+ * @param  {TextField} text_field
+ * @param  {Float32Array | null} [matrix=null]
+ * @return {Float32Array}
+ * @method
+ * @protected
+ */
+export const execute = (text_field, matrix = null) => {
+    const bounds = textFieldCalcBoundsMatrixUseCase(text_field, matrix);
+    const filters = text_field.filters;
+    if (filters) {
+        const filterBounds = $getBoundsArray(0, 0, 0, 0);
+        for (let idx = 0; idx < filters.length; idx++) {
+            const filter = filters[idx];
+            if (!filter || !filter.canApplyFilter()) {
+                continue;
+            }
+            filter.getBounds(filterBounds);
+        }
+        bounds[0] += filterBounds[0];
+        bounds[1] += filterBounds[1];
+        bounds[2] += filterBounds[2];
+        bounds[3] += filterBounds[3];
+        $poolBoundsArray(filterBounds);
+    }
+    return bounds;
+};

package/src/TextField/usecase/TextFieldGenerateRenderQueueUseCase.js

@@ -33,6 +33,10 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
     // transformed ColorTransform(tColorTransform)
     const rawColor = displayObjectGetRawColorTransformUseCase(text_field);
     const tColorTransform = rawColor
+        && (rawColor[0] !== 1 || rawColor[1] !== 1
+            || rawColor[2] !== 1 || rawColor[3] !== 1
+            || rawColor[4] !== 0 || rawColor[5] !== 0
+            || rawColor[6] !== 0 || rawColor[7] !== 0)
         ? ColorTransform.multiply(color_transform, rawColor)
         : color_transform;
     const alpha = $clamp(tColorTransform[3] + tColorTransform[7] / 255, 0, 1, 0);
@@ -46,6 +50,9 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
     // transformed matrix(tMatrix)
     const rawMatrix = displayObjectGetRawMatrixUseCase(text_field);
     const tMatrix = rawMatrix
+        && (rawMatrix[0] !== 1 || rawMatrix[1] !== 0
+            || rawMatrix[2] !== 0 || rawMatrix[3] !== 1
+            || rawMatrix[4] !== 0 || rawMatrix[5] !== 0)
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
     const bounds = displayObjectCalcBoundsMatrixService(text_field.xMin, text_field.yMin, text_field.xMax, text_field.yMax, tMatrix);
@@ -69,7 +76,6 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
             if (tMatrix !== matrix) {
                 Matrix.release(tMatrix);
             }
-            $poolBoundsArray(bounds);
             renderQueue.push(0);
             return;
         default:
@@ -85,7 +91,6 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
         if (tMatrix !== matrix) {
             Matrix.release(tMatrix);
         }
-        $poolBoundsArray(bounds);
         renderQueue.push(0);
         return;
     }
@@ -99,23 +104,26 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
             text_field.uniqueKey = `${text_field.instanceId}`;
         }
     }
-    const xScale = Math.round(Math.sqrt(tMatrix[0] * tMatrix[0]
-        + tMatrix[1] * tMatrix[1]) * 100) / 100;
-    const yScale = Math.round(Math.sqrt(tMatrix[2] * tMatrix[2]
-        + tMatrix[3] * tMatrix[3]) * 100) / 100;
+    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
         && !text_field.cacheKey
-        || text_field.cacheParams[0] !== xScale
-        || text_field.cacheParams[1] !== yScale
+        || text_field.cacheParams[0] !== xScaleRounded
+        || text_field.cacheParams[1] !== yScaleRounded
         || text_field.cacheParams[2] !== tColorTransform[7]) {
-        text_field.cacheKey = $cacheStore.generateKeys(xScale, yScale, tColorTransform[7]);
-        text_field.cacheParams[0] = xScale;
-        text_field.cacheParams[1] = yScale;
+        text_field.cacheKey = $cacheStore.generateKeys(xScaleRounded, yScaleRounded, tColorTransform[7]);
+        text_field.cacheParams[0] = xScaleRounded;
+        text_field.cacheParams[1] = yScaleRounded;
         text_field.cacheParams[2] = tColorTransform[7];
     }
     const cacheKey = text_field.cacheKey;
     // rennder on
-    renderQueue.push(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);
+    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 // フィルターキャッシュ用のユニークキー
+    );
     if (text_field.$cache && !text_field.$cache.has(text_field.uniqueKey)) {
         text_field.$cache = null;
     }
@@ -184,6 +192,9 @@ export const execute = (text_field, matrix, color_transform, renderer_width, ren
             renderQueue.push(+useFilfer, +updated, bounds[0], bounds[1], bounds[2], bounds[3], params.length);
             renderQueue.set(new Float32Array(params));
         }
+        else {
+            renderQueue.push(0);
+        }
         $poolBoundsArray(bounds);
     }
     else {

package/src/Video/usecase/VideoCalcLayerBoundsUseCase.d.ts

@@ -0,0 +1,12 @@
+import type { Video } from "@next2d/media";
+/**
+ * @description Videoのフィルター適用後の描画範囲を計算します。
+ *              Calculate the drawing area of Video after applying filters.
+ *
+ * @param  {Video} video
+ * @param  {Float32Array | null} [matrix=null]
+ * @return {Float32Array}
+ * @method
+ * @protected
+ */
+export declare const execute: (video: Video, matrix?: Float32Array | null) => Float32Array;

package/src/Video/usecase/VideoCalcLayerBoundsUseCase.js

@@ -0,0 +1,32 @@
+import { execute as videoCalcBoundsMatrixUseCase } from "./VideoCalcBoundsMatrixUseCase";
+import { $getBoundsArray, $poolBoundsArray } from "../../DisplayObjectUtil";
+/**
+ * @description Videoのフィルター適用後の描画範囲を計算します。
+ *              Calculate the drawing area of Video after applying filters.
+ *
+ * @param  {Video} video
+ * @param  {Float32Array | null} [matrix=null]
+ * @return {Float32Array}
+ * @method
+ * @protected
+ */
+export const execute = (video, matrix = null) => {
+    const bounds = videoCalcBoundsMatrixUseCase(video, matrix);
+    const filters = video.filters;
+    if (filters) {
+        const filterBounds = $getBoundsArray(0, 0, 0, 0);
+        for (let idx = 0; idx < filters.length; idx++) {
+            const filter = filters[idx];
+            if (!filter || !filter.canApplyFilter()) {
+                continue;
+            }
+            filter.getBounds(filterBounds);
+        }
+        bounds[0] += filterBounds[0];
+        bounds[1] += filterBounds[1];
+        bounds[2] += filterBounds[2];
+        bounds[3] += filterBounds[3];
+        $poolBoundsArray(filterBounds);
+    }
+    return bounds;
+};

package/src/Video/usecase/VideoGenerateRenderQueueUseCase.js

@@ -32,6 +32,10 @@ export const execute = (video, image_bitmaps, matrix, color_transform, renderer_
     // transformed ColorTransform(tColorTransform)
     const rawColor = displayObjectGetRawColorTransformUseCase(video);
     const tColorTransform = rawColor
+        && (rawColor[0] !== 1 || rawColor[1] !== 1
+            || rawColor[2] !== 1 || rawColor[3] !== 1
+            || rawColor[4] !== 0 || rawColor[5] !== 0
+            || rawColor[6] !== 0 || rawColor[7] !== 0)
         ? ColorTransform.multiply(color_transform, rawColor)
         : color_transform;
     const alpha = $clamp(tColorTransform[3] + tColorTransform[7] / 255, 0, 1, 0);
@@ -45,6 +49,9 @@ export const execute = (video, image_bitmaps, matrix, color_transform, renderer_
     // transformed matrix(tMatrix)
     const rawMatrix = displayObjectGetRawMatrixUseCase(video);
     const tMatrix = rawMatrix
+        && (rawMatrix[0] !== 1 || rawMatrix[1] !== 0
+            || rawMatrix[2] !== 0 || rawMatrix[3] !== 1
+            || rawMatrix[4] !== 0 || rawMatrix[5] !== 0)
         ? Matrix.multiply(matrix, rawMatrix)
         : matrix;
     // draw text
@@ -98,7 +105,8 @@ export const execute = (video, image_bitmaps, matrix, color_transform, renderer_
         }
     }
     // rennder on
-    renderQueue.push(1, $RENDERER_VIDEO_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, 0, 0, video.videoWidth, video.videoHeight, +video.uniqueKey, +video.changed);
+    renderQueue.pushVideoBuffer(1, $RENDERER_VIDEO_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, 0, 0, video.videoWidth, video.videoHeight, +video.uniqueKey, +video.changed, video.instanceId // フィルターキャッシュ用のユニークキー
+    );
     if (video.$cache && !video.$cache.has(video.uniqueKey)) {
         video.$cache = null;
     }
@@ -161,6 +169,9 @@ export const execute = (video, image_bitmaps, matrix, color_transform, renderer_
             renderQueue.push(+useFilfer, +updated, bounds[0], bounds[1], bounds[2], bounds[3], params.length);
             renderQueue.set(new Float32Array(params));
         }
+        else {
+            renderQueue.push(0);
+        }
         $poolBoundsArray(bounds);
     }
     else {