@next2d/display 3.0.5 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/display",
-  "version": "3.0.5",
+  "version": "3.1.0",
   "description": "Next2D Display Package",
   "author": "Toshiyuki Ienaga<ienaga@next2d.app> (https://github.com/ienaga/)",
   "license": "MIT",
@@ -24,13 +24,13 @@
     "url": "git+https://github.com/Next2D/Player.git"
   },
   "dependencies": {
-    "@next2d/ui": "3.0.5",
-    "@next2d/text": "3.0.5",
-    "@next2d/geom": "3.0.5",
-    "@next2d/media": "3.0.5",
-    "@next2d/net": "3.0.5",
-    "@next2d/events": "3.0.5",
-    "@next2d/filters": "3.0.5",
-    "@next2d/render-queue": "3.0.5"
+    "@next2d/ui": "3.1.0",
+    "@next2d/text": "3.1.0",
+    "@next2d/geom": "3.1.0",
+    "@next2d/media": "3.1.0",
+    "@next2d/net": "3.1.0",
+    "@next2d/events": "3.1.0",
+    "@next2d/filters": "3.1.0",
+    "@next2d/render-queue": "3.1.0"
   }
 }

package/src/DisplayObject/usecase/DisplayObjectHitTestPointUseCase.js

@@ -6,7 +6,7 @@ import { execute as shapeHitTestUseCase } from "../../Shape/usecase/ShapeHitTest
 import { execute as textFieldHitTestUseCase } from "../../TextField/usecase/TextFieldHitTestUseCase";
 import { execute as videoHitTestUseCase } from "../../Video/usecase/VideoHitTestUseCase";
 import { Rectangle, Point } from "@next2d/geom";
-import { $MATRIX_ARRAY_IDENTITY, $poolBoundsArray, $colorContext } from "../../DisplayObjectUtil";
+import { $MATRIX_ARRAY_IDENTITY, $poolBoundsArray, $colorContext, $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @type {IPlayerHitObject}
  * @private
@@ -55,9 +55,23 @@ export const execute = (display_object, x, y, shape_flag = false) => {
     }
     const rawBounds = displayObjectGetRawBoundsUseCase(display_object);
     const martix = displayObjectGetRawMatrixUseCase(display_object);
-    const bounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], martix ? martix : $MATRIX_ARRAY_IDENTITY);
+    // cacheAsBitmap倍率をhitTest用のmatrixに適用
+    const cacheMatrix = display_object.cacheAsBitmap;
+    let hitMatrix = martix ? martix : $MATRIX_ARRAY_IDENTITY;
+    let scaledMatrix = null;
+    if (cacheMatrix && hitMatrix) {
+        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]);
+        scaledMatrix = $getFloat32Array6(hitMatrix[0] * csx, hitMatrix[1] * csx, hitMatrix[2] * csy, hitMatrix[3] * csy, hitMatrix[4], hitMatrix[5]);
+        hitMatrix = scaledMatrix;
+    }
+    const bounds = displayObjectCalcBoundsMatrixService(rawBounds[0], rawBounds[1], rawBounds[2], rawBounds[3], hitMatrix);
     // pool
     $poolBoundsArray(rawBounds);
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     const rectangle = new Rectangle(bounds[0], bounds[1], Math.abs(bounds[2] - bounds[0]), Math.abs(bounds[3] - bounds[1]));
     // pool
     $poolBoundsArray(bounds);

package/src/DisplayObject.d.ts

@@ -6,7 +6,8 @@ import type { IBlendMode } from "./interface/IBlendMode";
 import type { IFilterArray } from "./interface/IFilterArray";
 import type { MovieClip } from "./MovieClip";
 import type { ISprite } from "./interface/ISprite";
-import type { ColorTransform, Matrix, Rectangle, Point } from "@next2d/geom";
+import type { ColorTransform, Rectangle, Point } from "@next2d/geom";
+import { Matrix } from "@next2d/geom";
 import { EventDispatcher } from "@next2d/events";
 /**
  * @description DisplayObject クラスは、表示リストに含めることのできるすべてのオブジェクトに関する基本クラスです。
@@ -319,6 +320,20 @@ export declare class DisplayObject extends EventDispatcher {
      * @private
      */
     private _$visible;
+    /**
+     * @description ビットマップキャッシュ用のMatrix。nullでない場合、指定Matrix × stageのrendererScaleで
+     *              Shape/TextFieldのベクター描画をキャッシュし、ステージのリサイズがあるまで再利用します。
+     *              先祖のMatrixの影響を受けず、キャッシュの品質は指定Matrixとstageスケールのみで決定されます。
+     *              Matrix for bitmap caching. When not null, caches Shape/TextField vector rendering
+     *              at the specified Matrix × stage rendererScale, reusing until stage resize.
+     *              Cache quality is determined only by the specified Matrix and stage scale,
+     *              independent of ancestor transforms.
+     *
+     * @type {Matrix | null}
+     * @default null
+     * @private
+     */
+    private _$cacheAsBitmap;
     /**
      * @description 表示オブジェクト単位の変数を保持するマップ
      *              Map that holds variables for display objects
@@ -347,6 +362,15 @@ export declare class DisplayObject extends EventDispatcher {
      * @public
      */
     parent: ISprite<any> | null;
+    /**
+     * @description キャッシュする際の指定Matrix、nullの場合は通常のMatrixで描画
+     *              Specified Matrix for caching, if null, draw with the normal Matrix
+     *
+     * @member {Matrix | null}
+     * @default null
+     * @public
+     */
+    cacheTransform: Matrix | null;
     /**
      * @constructor
      * @public
@@ -520,6 +544,21 @@ export declare class DisplayObject extends EventDispatcher {
      */
     get visible(): boolean;
     set visible(visible: boolean);
+    /**
+     * @description ビットマップキャッシュ用のMatrix。nullでない場合、指定Matrix × stageのrendererScaleで
+     *              Shape/TextFieldのベクター描画をキャッシュし、ステージのリサイズがあるまで再利用します。
+     *              先祖のMatrixの影響を受けず、キャッシュの品質は指定Matrixとstageスケールのみで決定されます。
+     *              Matrix for bitmap caching. When not null, caches Shape/TextField vector rendering
+     *              at the specified Matrix × stage rendererScale, reusing until stage resize.
+     *              Cache quality is determined only by the specified Matrix and stage scale,
+     *              independent of ancestor transforms.
+     *
+     * @member {Matrix | null}
+     * @default null
+     * @public
+     */
+    get cacheAsBitmap(): Matrix | null;
+    set cacheAsBitmap(cache_as_bitmap: Matrix | null);
     /**
      * @description 表示オブジェクトの幅を示します（ピクセル単位）。
      *              Indicates the width of the display object, in pixels.

package/src/DisplayObject.js

@@ -1,3 +1,4 @@
+import { Matrix } from "@next2d/geom";
 import { EventDispatcher } from "@next2d/events";
 import { execute as displayObjectApplyChangesService } from "./DisplayObject/service/DisplayObjectApplyChangesService";
 import { execute as displayObjectConcatenatedMatrixUseCase } from "./DisplayObject/usecase/DisplayObjectConcatenatedMatrixUseCase";
@@ -512,6 +513,25 @@ export class DisplayObject extends EventDispatcher {
             writable: true,
             value: void 0
         });
+        /**
+         * @description ビットマップキャッシュ用のMatrix。nullでない場合、指定Matrix × stageのrendererScaleで
+         *              Shape/TextFieldのベクター描画をキャッシュし、ステージのリサイズがあるまで再利用します。
+         *              先祖のMatrixの影響を受けず、キャッシュの品質は指定Matrixとstageスケールのみで決定されます。
+         *              Matrix for bitmap caching. When not null, caches Shape/TextField vector rendering
+         *              at the specified Matrix × stage rendererScale, reusing until stage resize.
+         *              Cache quality is determined only by the specified Matrix and stage scale,
+         *              independent of ancestor transforms.
+         *
+         * @type {Matrix | null}
+         * @default null
+         * @private
+         */
+        Object.defineProperty(this, "_$cacheAsBitmap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         /**
          * @description 表示オブジェクト単位の変数を保持するマップ
          *              Map that holds variables for display objects
@@ -555,6 +575,20 @@ export class DisplayObject extends EventDispatcher {
             writable: true,
             value: void 0
         });
+        /**
+         * @description キャッシュする際の指定Matrix、nullの場合は通常のMatrixで描画
+         *              Specified Matrix for caching, if null, draw with the normal Matrix
+         *
+         * @member {Matrix | null}
+         * @default null
+         * @public
+         */
+        Object.defineProperty(this, "cacheTransform", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         this.instanceId = $getInstanceId();
         this.dictionaryId = -1;
         this.uniqueKey = "";
@@ -587,6 +621,7 @@ export class DisplayObject extends EventDispatcher {
         this.$filters = null;
         this.$blendMode = null;
         this._$visible = true;
+        this._$cacheAsBitmap = null;
         this._$scale9Grid = null;
         this._$variables = null;
         // キャッシュ
@@ -800,9 +835,14 @@ export class DisplayObject extends EventDispatcher {
      * @public
      */
     get scaleX() {
-        return this.$scaleX === null
+        const base = this.$scaleX === null
             ? displayObjectGetScaleXUseCase(this)
             : this.$scaleX;
+        if (this._$cacheAsBitmap) {
+            const m = this._$cacheAsBitmap.rawData;
+            return base * Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+        }
+        return base;
     }
     set scaleX(scale_x) {
         displayObjectSetScaleXUseCase(this, scale_x);
@@ -816,9 +856,14 @@ export class DisplayObject extends EventDispatcher {
      * @public
      */
     get scaleY() {
-        return this.$scaleY === null
+        const base = this.$scaleY === null
             ? displayObjectGetScaleYUseCase(this)
             : this.$scaleY;
+        if (this._$cacheAsBitmap) {
+            const m = this._$cacheAsBitmap.rawData;
+            return base * Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+        }
+        return base;
     }
     set scaleY(scale_y) {
         displayObjectSetScaleYUseCase(this, scale_y);
@@ -841,6 +886,32 @@ export class DisplayObject extends EventDispatcher {
         this._$visible = visible;
         displayObjectApplyChangesService(this);
     }
+    /**
+     * @description ビットマップキャッシュ用のMatrix。nullでない場合、指定Matrix × stageのrendererScaleで
+     *              Shape/TextFieldのベクター描画をキャッシュし、ステージのリサイズがあるまで再利用します。
+     *              先祖のMatrixの影響を受けず、キャッシュの品質は指定Matrixとstageスケールのみで決定されます。
+     *              Matrix for bitmap caching. When not null, caches Shape/TextField vector rendering
+     *              at the specified Matrix × stage rendererScale, reusing until stage resize.
+     *              Cache quality is determined only by the specified Matrix and stage scale,
+     *              independent of ancestor transforms.
+     *
+     * @member {Matrix | null}
+     * @default null
+     * @public
+     */
+    get cacheAsBitmap() {
+        return this._$cacheAsBitmap;
+    }
+    set cacheAsBitmap(cache_as_bitmap) {
+        if (cache_as_bitmap !== null && !(cache_as_bitmap instanceof Matrix)) {
+            return;
+        }
+        if (this._$cacheAsBitmap === cache_as_bitmap) {
+            return;
+        }
+        this._$cacheAsBitmap = cache_as_bitmap;
+        displayObjectApplyChangesService(this);
+    }
     /**
      * @description 表示オブジェクトの幅を示します（ピクセル単位）。
      *              Indicates the width of the display object, in pixels.

package/src/DisplayObjectContainer/usecase/DisplayObjectContainerCalcBoundsMatrixUseCase.js

@@ -3,7 +3,7 @@ import { execute as displayObjectGetRawMatrixUseCase } from "../../DisplayObject
 import { execute as shapeCalcBoundsMatrixUseCase } from "../../Shape/usecase/ShapeCalcBoundsMatrixUseCase";
 import { execute as videoCalcBoundsMatrixUseCase } from "../../Video/usecase/VideoCalcBoundsMatrixUseCase";
 import { execute as textFieldCalcBoundsMatrixUseCase } from "../../TextField/usecase/TextFieldCalcBoundsMatrixUseCase";
-import { $getBoundsArray, $poolBoundsArray } from "../../DisplayObjectUtil";
+import { $getBoundsArray, $poolBoundsArray, $getFloat32Array6, $poolFloat32Array6 } from "../../DisplayObjectUtil";
 /**
  * @description DisplayObjectContainerのバウンディングボックスを計算
  *              Calculate the bounding box of the DisplayObjectContainer
@@ -18,7 +18,22 @@ export const execute = (display_object_container, matrix = null) => {
     if (!children.length) {
         return $getBoundsArray(0, 0, 0, 0);
     }
-    const rawMatrix = displayObjectGetRawMatrixUseCase(display_object_container);
+    let rawMatrix = displayObjectGetRawMatrixUseCase(display_object_container);
+    // cacheAsBitmap倍率をrawMatrixに適用（ShapeCalcBoundsMatrixUseCaseと同様）
+    const cacheMatrix = display_object_container.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
             ? Matrix.multiply(matrix, rawMatrix)
@@ -58,5 +73,8 @@ export const execute = (display_object_container, matrix = null) => {
         yMax = Math.max(yMax, bounds[3]);
         $poolBoundsArray(bounds);
     }
+    if (scaledMatrix) {
+        $poolFloat32Array6(scaledMatrix);
+    }
     return $getBoundsArray(xMin, yMin, xMax, yMax);
 };