@next2d/display 1.15.0 → 1.16.0

package/dist/DisplayObject.js

@@ -1,7 +1,7 @@
 import { Event as Next2DEvent, EventDispatcher } from "@next2d/events";
 import { Transform, Rectangle, Point } from "@next2d/geom";
-import { $getEvent, $getInstanceId, $currentMousePoint, $currentPlayer, $poolColorTransform, $rendererWorker, $poolMatrix, $hitContext, $variables } from "@next2d/util";
-import { $doUpdated, $clamp, $getArray, $boundsMatrix, $Math, $poolBoundsObject, $Infinity, $getBoundsObject, $isNaN, $Deg2Rad, $Number, $Rad2Deg, $SHORT_INT_MIN, $SHORT_INT_MAX, $MATRIX_ARRAY_IDENTITY, $multiplicationMatrix, $poolFloat32Array6, $getMap, $poolMap, $getFloat32Array6 } from "@next2d/share";
+import { $getEvent, $getInstanceId, $currentMousePoint, $poolColorTransform, $rendererWorker, $poolMatrix, $hitContext, $variables } from "@next2d/util";
+import { $doUpdated, $clamp, $getArray, $boundsMatrix, $Math, $poolBoundsObject, $Infinity, $getBoundsObject, $isNaN, $Deg2Rad, $Number, $Rad2Deg, $SHORT_INT_MIN, $SHORT_INT_MAX, $MATRIX_ARRAY_IDENTITY, $multiplicationMatrix, $poolFloat32Array6, $getMap, $poolMap, $getFloat32Array6, $devicePixelRatio, $poolArray, $cacheStore } from "@next2d/share";
 /**
  * DisplayObject クラスは、表示リストに含めることのできるすべてのオブジェクトに関する基本クラスです。
  * DisplayObject クラス自体は、画面上でのコンテンツの描画のための API を含みません。
@@ -107,6 +107,12 @@ export class DisplayObject extends EventDispatcher {
          * @private
          */
         this._$posted = false;
+        /**
+         * @type {Float32Array}
+         * @default null
+         * @private
+         */
+        this._$postArray = null;
         /**
          * @type {number}
          * @default 0
@@ -249,14 +255,22 @@ export class DisplayObject extends EventDispatcher {
     }
     set alpha(alpha) {
         alpha = $clamp(alpha, 0, 1, 0);
+        const transform = this._$transform;
         // clone
-        const colorTransform = this
-            ._$transform
-            .colorTransform;
-        colorTransform._$colorTransform[3] = alpha;
-        colorTransform._$colorTransform[7] = 0;
-        this._$transform.colorTransform = colorTransform;
-        $poolColorTransform(colorTransform);
+        if (!transform._$colorTransform) {
+            const colorTransform = transform.colorTransform;
+            colorTransform._$colorTransform[3] = alpha;
+            colorTransform._$colorTransform[7] = 0;
+            transform.colorTransform = colorTransform;
+            $poolColorTransform(colorTransform);
+        }
+        else {
+            const colorTransform = transform._$colorTransform;
+            colorTransform._$colorTransform[3] = alpha;
+            colorTransform._$colorTransform[7] = 0;
+            this._$doChanged();
+            $doUpdated();
+        }
     }
     /**
      * @description 使用するブレンドモードを指定する BlendMode クラスの値です。
@@ -277,7 +291,7 @@ export class DisplayObject extends EventDispatcher {
             this._$blendMode = transform._$blendMode;
             return transform._$blendMode;
         }
-        const placeObject = this._$getPlaceObject();
+        const placeObject = this._$placeObject || this._$getPlaceObject();
         if (placeObject && placeObject.blendMode) {
             // cache
             this._$blendMode = placeObject.blendMode;
@@ -288,7 +302,15 @@ export class DisplayObject extends EventDispatcher {
         return "normal";
     }
     set blendMode(blend_mode) {
-        this._$transform._$transform(null, null, null, blend_mode);
+        const transform = this._$transform;
+        if (!transform._$blendMode) {
+            transform._$transform(null, null, null, blend_mode);
+        }
+        else {
+            transform._$blendMode = blend_mode;
+            this._$doChanged();
+            $doUpdated();
+        }
         this._$blendMode = blend_mode;
     }
     /**
@@ -323,7 +345,7 @@ export class DisplayObject extends EventDispatcher {
             this._$filters = clone;
             return filters;
         }
-        const placeObject = this._$getPlaceObject();
+        const placeObject = this._$placeObject || this._$getPlaceObject();
         if (placeObject && placeObject.surfaceFilterList) {
             // create filter
             if (!placeObject.filters) {
@@ -553,7 +575,10 @@ export class DisplayObject extends EventDispatcher {
             return;
         }
         const transform = this._$transform;
-        const matrix = transform.matrix;
+        const hasMatrix = transform._$matrix !== null;
+        const matrix = hasMatrix
+            ? transform._$matrix
+            : transform.matrix;
         const scaleX = $Math.sqrt(matrix.a * matrix.a + matrix.b * matrix.b);
         const scaleY = $Math.sqrt(matrix.c * matrix.c + matrix.d * matrix.d);
         if (rotation === 0) {
@@ -583,8 +608,14 @@ export class DisplayObject extends EventDispatcher {
                 matrix.d = scaleY * $Math.cos(radianY);
             }
         }
-        transform.matrix = matrix;
-        $poolMatrix(matrix);
+        if (hasMatrix) {
+            this._$doChanged();
+            $doUpdated();
+        }
+        else {
+            transform.matrix = matrix;
+            $poolMatrix(matrix);
+        }
         this._$rotation = rotation;
     }
     /**
@@ -643,7 +674,10 @@ export class DisplayObject extends EventDispatcher {
             return;
         }
         const transform = this._$transform;
-        const matrix = transform.matrix;
+        const hasMatrix = transform._$matrix !== null;
+        const matrix = hasMatrix
+            ? transform._$matrix
+            : transform.matrix;
         if (matrix.b === 0 || $isNaN(matrix.b)) {
             matrix.a = scale_x;
         }
@@ -655,8 +689,14 @@ export class DisplayObject extends EventDispatcher {
             matrix.b = scale_x * $Math.sin(radianX);
             matrix.a = scale_x * $Math.cos(radianX);
         }
-        transform.matrix = matrix;
-        $poolMatrix(matrix);
+        if (hasMatrix) {
+            this._$doChanged();
+            $doUpdated();
+        }
+        else {
+            transform.matrix = matrix;
+            $poolMatrix(matrix);
+        }
         this._$scaleX = scale_x;
     }
     /**
@@ -698,7 +738,10 @@ export class DisplayObject extends EventDispatcher {
             return;
         }
         const transform = this._$transform;
-        const matrix = transform.matrix;
+        const hasMatrix = transform._$matrix !== null;
+        const matrix = hasMatrix
+            ? transform._$matrix
+            : transform.matrix;
         if (matrix.c === 0 || $isNaN(matrix.c)) {
             matrix.d = scale_y;
         }
@@ -710,8 +753,14 @@ export class DisplayObject extends EventDispatcher {
             matrix.c = -scale_y * $Math.sin(radianY);
             matrix.d = scale_y * $Math.cos(radianY);
         }
-        transform.matrix = matrix;
-        $poolMatrix(matrix);
+        if (hasMatrix) {
+            this._$doChanged();
+            $doUpdated();
+        }
+        else {
+            transform.matrix = matrix;
+            $poolMatrix(matrix);
+        }
         this._$scaleY = scale_y;
     }
     /**
@@ -831,10 +880,17 @@ export class DisplayObject extends EventDispatcher {
     }
     set x(x) {
         const transform = this._$transform;
-        const matrix = transform.matrix;
-        matrix.tx = x;
-        transform.matrix = matrix;
-        $poolMatrix(matrix);
+        if (!transform._$matrix) {
+            const matrix = transform.matrix;
+            matrix.tx = x;
+            transform.matrix = matrix;
+            $poolMatrix(matrix);
+        }
+        else {
+            transform._$matrix.tx = x;
+            this._$doChanged();
+            $doUpdated();
+        }
     }
     /**
      * @description 親 DisplayObjectContainer のローカル座標を基準にした
@@ -851,10 +907,17 @@ export class DisplayObject extends EventDispatcher {
     }
     set y(y) {
         const transform = this._$transform;
-        const matrix = transform.matrix;
-        matrix.ty = y;
-        transform.matrix = matrix;
-        $poolMatrix(matrix);
+        if (!transform._$matrix) {
+            const matrix = transform.matrix;
+            matrix.ty = y;
+            transform.matrix = matrix;
+            $poolMatrix(matrix);
+        }
+        else {
+            transform._$matrix.ty = y;
+            this._$doChanged();
+            $doUpdated();
+        }
     }
     /**
      * @description targetCoordinateSpace オブジェクトの座標系を基準にして、
@@ -1240,72 +1303,76 @@ export class DisplayObject extends EventDispatcher {
     }
     /**
      * @param  {CanvasToWebGLContext} context
-     * @param  {WebGLTexture}         target_texture
      * @param  {Float32Array}         matrix
      * @param  {array}                filters
      * @param  {number}               width
      * @param  {number}               height
-     * @return {WebGLTexture}
+     * @param  {WebGLTexture}         [target_texture = null]
+     * @return {object}
      * @method
      * @private
      */
-    _$drawFilter(context, target_texture, matrix, filters, width, height) {
-        const player = $currentPlayer();
-        const cacheStore = player.cacheStore;
-        const cacheKeys = [this._$instanceId, "f"];
-        const cache = cacheStore.get(cacheKeys);
-        const updated = this._$isFilterUpdated(width, height, matrix, filters, true);
-        if (cache && !updated) {
-            return cache;
+    _$drawFilter(context, matrix, filters, width, height, target_texture = null) {
+        const cacheKeys = $getArray(this._$instanceId, "f");
+        let position = $cacheStore.get(cacheKeys);
+        const updated = this._$isFilterUpdated(matrix, filters, true);
+        if (position && !updated) {
+            context.cachePosition = position;
+            return position;
         }
         // cache clear
-        if (cache) {
-            cacheStore.set(cacheKeys, null);
-            cache.layerWidth = 0;
-            cache.layerHeight = 0;
-            cache._$offsetX = 0;
-            cache._$offsetY = 0;
-            cache.matrix = null;
-            cache.colorTransform = null;
-            context
-                .frameBuffer
-                .releaseTexture(cache);
-        }
-        if (!cache || updated) {
-            const texture = this._$applyFilter(context, filters, target_texture, matrix, width, height);
-            cacheStore.set(cacheKeys, texture);
-            return texture;
-        }
-        return cache;
+        if (position) {
+            $cacheStore.set(cacheKeys, null);
+        }
+        const manager = context.frameBuffer;
+        const targetTexture = target_texture
+            ? target_texture
+            : context.getTextureFromRect(context.cachePosition);
+        const texture = this._$applyFilter(context, filters, targetTexture, matrix, width, height);
+        manager.textureManager.release(targetTexture);
+        const bounds = this._$getLayerBounds(matrix);
+        position = manager.createCachePosition($Math.ceil($Math.abs(bounds.xMax - bounds.xMin)), $Math.ceil($Math.abs(bounds.yMax - bounds.yMin)));
+        $poolBoundsObject(bounds);
+        position.filterState = true;
+        position.matrix = `${matrix[0]}_${matrix[1]}_${matrix[2]}_${matrix[3]}_0_0`;
+        position.offsetX = texture.offsetX;
+        position.offsetY = texture.offsetY;
+        // 関数先でtextureがreleaseされる
+        context.drawTextureFromRect(texture, position);
+        $cacheStore.set(cacheKeys, position);
+        $poolArray(cacheKeys);
+        return position;
     }
     /**
-     * @param   {array}  [matrix=null]
+     * @param   {Float32Array} multi_matrix
      * @returns {object}
      * @private
      */
-    _$getLayerBounds(matrix = null) {
+    _$getLayerBounds(multi_matrix) {
         const baseBounds = "_$getBounds" in this && typeof this._$getBounds === "function"
-            ? this._$getBounds(matrix)
+            ? this._$getBounds()
             : $getBoundsObject();
-        if (!matrix) {
-            return baseBounds;
-        }
+        const bounds = $boundsMatrix(baseBounds, multi_matrix);
+        $poolBoundsObject(baseBounds);
         const filters = this._$filters || this.filters;
         if (!filters.length) {
-            return baseBounds;
+            return bounds;
         }
-        let filterBounds = $getBoundsObject(baseBounds.xMin, baseBounds.yMin, baseBounds.xMax - baseBounds.xMin, baseBounds.yMax - baseBounds.yMin);
-        $poolBoundsObject(baseBounds);
+        let filterBounds = $getBoundsObject(0, $Math.abs(bounds.xMax - bounds.xMin), 0, $Math.abs(bounds.yMax - bounds.yMin));
+        $poolBoundsObject(bounds);
+        let xScale = +$Math.sqrt(multi_matrix[0] * multi_matrix[0]
+            + multi_matrix[1] * multi_matrix[1]);
+        let yScale = +$Math.sqrt(multi_matrix[2] * multi_matrix[2]
+            + multi_matrix[3] * multi_matrix[3]);
+        xScale /= $devicePixelRatio;
+        yScale /= $devicePixelRatio;
+        xScale *= 2;
+        yScale *= 2;
         for (let idx = 0; idx < filters.length; ++idx) {
             filterBounds = filters[idx]
-                ._$generateFilterRect(filterBounds, 0, 0);
+                ._$generateFilterRect(filterBounds, xScale, yScale);
         }
-        const xMin = filterBounds.xMin;
-        const xMax = filterBounds.xMin + filterBounds.xMax;
-        const yMin = filterBounds.yMin;
-        const yMax = filterBounds.yMin + filterBounds.yMax;
-        $poolBoundsObject(filterBounds);
-        return $getBoundsObject(xMin, xMax, yMin, yMax);
+        return filterBounds;
     }
     /**
      * @return {void}
@@ -1372,8 +1439,6 @@ export class DisplayObject extends EventDispatcher {
         return false;
     }
     /**
-     * @param  {number}       width
-     * @param  {number}       height
      * @param  {Float32Array} matrix
      * @param  {array}        [filters=null]
      * @param  {boolean}      [can_apply=false]
@@ -1382,7 +1447,7 @@ export class DisplayObject extends EventDispatcher {
      * @return {boolean}
      * @private
      */
-    _$isFilterUpdated(width, height, matrix, filters = null, can_apply = false, position_x = 0, position_y = 0) {
+    _$isFilterUpdated(matrix, filters = null, can_apply = false) {
         // cache flag
         if (this._$isUpdated()) {
             return true;
@@ -1397,19 +1462,15 @@ export class DisplayObject extends EventDispatcher {
             }
         }
         // check status
-        const player = $currentPlayer();
-        const cache = player.cacheStore.get([this._$instanceId, "f"]);
-        switch (true) {
-            case cache === null:
-            case cache.filterState !== can_apply:
-            case cache.layerWidth !== $Math.ceil(width):
-            case cache.layerHeight !== $Math.ceil(height):
-            case cache.matrix !==
-                matrix[0] + "_" + matrix[1] + "_" + matrix[2] + "_" + matrix[3] + "_" +
-                    position_x + "_" + position_y:
-                return true;
-            default:
-                break;
+        const cache = $cacheStore.get([this._$instanceId, "f"]);
+        if (!cache) {
+            return true;
+        }
+        if (cache.filterState !== can_apply) {
+            return true;
+        }
+        if (cache.matrix !== `${matrix[0]}_${matrix[1]}_${matrix[2]}_${matrix[3]}`) {
+            return true;
         }
         return false;
     }
@@ -1462,15 +1523,8 @@ export class DisplayObject extends EventDispatcher {
         context._$offsetX = 0;
         context._$offsetY = 0;
         // set offset
-        texture._$offsetX = offsetX;
-        texture._$offsetY = offsetY;
-        // cache texture
-        texture.matrix =
-            matrix[0] + "_" + matrix[1] + "_"
-                + matrix[2] + "_" + matrix[3];
-        texture.filterState = true;
-        texture.layerWidth = width;
-        texture.layerHeight = height;
+        texture.offsetX = offsetX;
+        texture.offsetY = offsetY;
         context._$bind(currentAttachment);
         manager.releaseAttachment(attachment, false);
         return texture;
@@ -1494,35 +1548,20 @@ export class DisplayObject extends EventDispatcher {
     /**
      * @param  {CanvasToWebGLContext} context
      * @param  {Float32Array} matrix
-     * @return {Float32Array|boolean|null}
+     * @return {boolean}
      * @method
      * @private
      */
     _$startClip(context, matrix) {
-        let clipMatrix = null;
-        // ネストしてない初回のマスクだけ実行
-        // ネストしてる場合は初回に作られたbufferを流用
-        if (!context.cacheAttachment) {
-            let multiMatrix = matrix;
-            const rawMatrix = this._$transform._$rawMatrix();
-            if (rawMatrix[0] !== 1 || rawMatrix[1] !== 0
-                || rawMatrix[2] !== 0 || rawMatrix[3] !== 1
-                || rawMatrix[4] !== 0 || rawMatrix[5] !== 0) {
-                multiMatrix = $multiplicationMatrix(matrix, rawMatrix);
-            }
-            const baseBounds = "_$getBounds" in this && typeof this._$getBounds === "function"
-                ? this._$getBounds()
-                : $getBoundsObject();
-            const bounds = $boundsMatrix(baseBounds, multiMatrix);
-            $poolBoundsObject(baseBounds);
-            clipMatrix = context._$startClip(matrix, bounds);
-            $poolBoundsObject(bounds);
-            if (multiMatrix !== matrix) {
-                $poolFloat32Array6(multiMatrix);
-            }
-            if (!clipMatrix) {
-                return false;
-            }
+        context.drawInstacedArray();
+        // マスクの描画反映を限定
+        const bounds = "_$getBounds" in this && typeof this._$getBounds === "function"
+            ? this._$getBounds(matrix)
+            : $getBoundsObject();
+        const result = context._$startClip(bounds);
+        $poolBoundsObject(bounds);
+        if (!result) {
+            return false;
         }
         // start clip
         context._$enterClip();
@@ -1534,7 +1573,7 @@ export class DisplayObject extends EventDispatcher {
             context._$updateContainerClipFlag(true);
         }
         // @ts-ignore
-        this._$clip(context, clipMatrix || matrix);
+        this._$clip(context, matrix);
         this._$updated = false;
         // container clip
         if (containerClip) {
@@ -1545,7 +1584,7 @@ export class DisplayObject extends EventDispatcher {
         }
         // mask end
         context._$endClipDef();
-        return clipMatrix;
+        return true;
     }
     /**
      * @return {void}

package/dist/DisplayObjectContainer.d.ts

@@ -191,11 +191,11 @@ export declare class DisplayObjectContainer extends InteractiveObject {
      */
     _$getBounds(matrix?: Float32Array | null): BoundsImpl;
     /**
-     * @param  {array} [matrix=null]
+     * @param  {Float32Array} multi_matrix
      * @return {object}
      * @private
      */
-    _$getLayerBounds(matrix?: Float32Array | null): BoundsImpl;
+    _$getLayerBounds(multi_matrix: Float32Array): BoundsImpl;
     /**
      * @return {array}
      * @private