@next2d/display 1.15.0 → 1.16.0

package/dist/BitmapData.d.ts

@@ -19,7 +19,7 @@ export declare class BitmapData {
     _$buffer: Uint8Array | null;
     private _$image;
     private _$canvas;
-    private _$pixelBuffer;
+    private _$texture;
     /**
      * @param {number} [width=0]
      * @param {number} [height=0]
@@ -67,6 +67,15 @@ export declare class BitmapData {
      * @public
      */
     get namespace(): string;
+    /**
+     * @description ビットマップイメージのID
+     *              Bitmap image ID.
+     *
+     * @return  {number}
+     * @readonly
+     * @public
+     */
+    get instanceId(): number;
     /**
      * @description ビットマップイメージの高さ（ピクセル単位）です。
      *              The height of the bitmap image in pixels.

package/dist/BitmapData.js

@@ -1,5 +1,5 @@
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
-import { $COLOR_ARRAY_IDENTITY, $getArray, $MATRIX_ARRAY_IDENTITY, $multiplicationMatrix, $poolArray } from "@next2d/share";
+import { $COLOR_ARRAY_IDENTITY, $getArray, $MATRIX_ARRAY_IDENTITY, $multiplicationMatrix, $poolArray, $cacheStore } from "@next2d/share";
 import { $getInstanceId, $bitmapDrawMap, $currentPlayer, $poolColorTransform, $poolMatrix, $postContainerWorker, $rendererWorker } from "@next2d/util";
 /**
  * BitmapData クラスを使用すると、Bitmap オブジェクトのデータ (ピクセル) を処理できます。
@@ -57,11 +57,11 @@ export class BitmapData {
          */
         this._$canvas = null;
         /**
-         * @type {WebGLBuffer}
+         * @type {WebGLTexture}
          * @type {null}
          * @private
          */
-        this._$pixelBuffer = null;
+        this._$texture = null;
     }
     /**
      * @description 指定されたクラスのストリングを返します。
@@ -111,6 +111,17 @@ export class BitmapData {
     get namespace() {
         return "next2d.display.BitmapData";
     }
+    /**
+     * @description ビットマップイメージのID
+     *              Bitmap image ID.
+     *
+     * @return  {number}
+     * @readonly
+     * @public
+     */
+    get instanceId() {
+        return this._$instanceId;
+    }
     /**
      * @description ビットマップイメージの高さ（ピクセル単位）です。
      *              The height of the bitmap image in pixels.
@@ -133,7 +144,17 @@ export class BitmapData {
         return this._$buffer;
     }
     set buffer(buffer) {
+        this._$canvas = null;
+        this._$image = null;
         this._$buffer = buffer;
+        if (this._$texture) {
+            const player = $currentPlayer();
+            const context = player.context;
+            if (context) {
+                context.frameBuffer.releaseTexture(this._$texture);
+            }
+            this._$texture = null;
+        }
     }
     /**
      * @description Imageクラスを利用して BitmapData を生成します。
@@ -147,7 +168,16 @@ export class BitmapData {
     }
     set image(image) {
         this._$canvas = null;
+        this._$buffer = null;
         this._$image = image;
+        if (this._$texture) {
+            const player = $currentPlayer();
+            const context = player.context;
+            if (context) {
+                context.frameBuffer.releaseTexture(this._$texture);
+            }
+            this._$texture = null;
+        }
         if (!image) {
             return;
         }
@@ -166,7 +196,16 @@ export class BitmapData {
     }
     set canvas(canvas) {
         this._$image = null;
+        this._$buffer = null;
         this._$canvas = canvas;
+        if (this._$texture) {
+            const player = $currentPlayer();
+            const context = player.context;
+            if (context) {
+                context.frameBuffer.releaseTexture(this._$texture);
+            }
+            this._$texture = null;
+        }
         if (!canvas) {
             return;
         }
@@ -197,9 +236,7 @@ export class BitmapData {
     clone() {
         const bitmapData = new BitmapData(this.width, this.height);
         if (this._$image !== null || this._$canvas !== null) {
-            const player = $currentPlayer();
-            const cacheStore = player.cacheStore;
-            const canvas = cacheStore.getCanvas();
+            const canvas = $cacheStore.getCanvas();
             canvas.width = this.width;
             canvas.height = this.height;
             const context = canvas.getContext("2d");
@@ -234,22 +271,25 @@ export class BitmapData {
         if (!context) {
             throw new Error("the context is null.");
         }
+        if (this._$texture !== null) {
+            return this._$texture;
+        }
         if (this._$image !== null) {
-            return context
+            this._$texture = context
                 .frameBuffer
                 .createTextureFromImage(this._$image);
         }
         if (this._$canvas !== null) {
-            return context
+            this._$texture = context
                 .frameBuffer
                 .createTextureFromCanvas(this._$canvas);
         }
         if (this._$buffer !== null) {
-            return context
+            this._$texture = context
                 .frameBuffer
                 .createTextureFromPixels(width, height, this._$buffer, true);
         }
-        return null;
+        return this._$texture;
     }
     /**
      * @param  {DisplayObject}     source
@@ -287,7 +327,7 @@ export class BitmapData {
             $poolMatrix(matrix);
         }
         if (!canvas) {
-            canvas = player.cacheStore.getCanvas();
+            canvas = $cacheStore.getCanvas();
         }
         if ($rendererWorker) {
             if (!source._$stage) {
@@ -343,23 +383,16 @@ export class BitmapData {
             if (!context) {
                 throw new Error("the context is null.");
             }
-            const manager = context.frameBuffer;
-            const currentAttachment = manager.currentAttachment;
-            context._$bind(player._$attachment);
             // reset
             context.reset();
             context.setTransform(1, 0, 0, 1, 0, 0);
             context.clearRect(0, 0, player._$width, player._$height);
             context.beginPath();
             source._$draw(context, tMatrix, colorTransform);
-            const texture = manager
-                .getTextureFromCurrentAttachment();
-            // reset and draw to main canvas
-            manager.unbind();
-            context.reset();
-            context.setTransform(1, 0, 0, 1, 0, 0);
-            context.clearRect(0, 0, texture.width + 1, texture.height + 1);
-            context.drawImage(texture, 0, 0, texture.width, texture.height);
+            context.drawInstacedArray();
+            context
+                .frameBuffer
+                .transferToMainTexture();
             canvas.width = width;
             canvas.height = height;
             const ctx = canvas.getContext("2d");
@@ -369,9 +402,6 @@ export class BitmapData {
             ctx.setTransform(1, 0, 0, 1, 0, 0);
             ctx.clearRect(0, 0, width, height);
             ctx.drawImage(player.canvas, 0, 0);
-            if (currentAttachment) {
-                context._$bind(currentAttachment);
-            }
             if (callback) {
                 callback(canvas);
             }

package/dist/DisplayObject.d.ts

@@ -3,7 +3,7 @@ import type { LoaderInfo } from "./LoaderInfo";
 import type { Sprite } from "./Sprite";
 import { EventDispatcher } from "@next2d/events";
 import { Transform, Rectangle, Point } from "@next2d/geom";
-import type { FilterArrayImpl, BlendModeImpl, ParentImpl, PlaceObjectImpl, BoundsImpl, DictionaryTagImpl, PropertyMessageMapImpl, DisplayObjectImpl } from "@next2d/interface";
+import type { FilterArrayImpl, BlendModeImpl, ParentImpl, PlaceObjectImpl, BoundsImpl, DictionaryTagImpl, PropertyMessageMapImpl, DisplayObjectImpl, CachePositionImpl } from "@next2d/interface";
 import type { CanvasToWebGLContext } from "@next2d/webgl";
 /**
  * DisplayObject クラスは、表示リストに含めることのできるすべてのオブジェクトに関する基本クラスです。
@@ -57,6 +57,7 @@ export declare class DisplayObject extends EventDispatcher {
     protected _$placeId: number;
     protected _$startFrame: number;
     protected _$endFrame: number;
+    protected _$postArray: Float32Array | null;
     /**
      * @constructor
      * @public
@@ -463,22 +464,22 @@ export declare class DisplayObject extends EventDispatcher {
     _$doChanged(): void;
     /**
      * @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: CanvasToWebGLContext, target_texture: WebGLTexture, matrix: Float32Array, filters: FilterArrayImpl, width: number, height: number): WebGLTexture;
+    _$drawFilter(context: CanvasToWebGLContext, matrix: Float32Array, filters: FilterArrayImpl, width: number, height: number, target_texture?: WebGLTexture | null): CachePositionImpl;
     /**
-     * @param   {array}  [matrix=null]
+     * @param   {Float32Array} multi_matrix
      * @returns {object}
      * @private
      */
-    _$getLayerBounds(matrix?: Float32Array | null): BoundsImpl;
+    _$getLayerBounds(multi_matrix: Float32Array): BoundsImpl;
     /**
      * @return {void}
      * @method
@@ -504,8 +505,6 @@ export declare class DisplayObject extends EventDispatcher {
      */
     _$canApply(filters?: FilterArrayImpl | null): boolean;
     /**
-     * @param  {number}       width
-     * @param  {number}       height
      * @param  {Float32Array} matrix
      * @param  {array}        [filters=null]
      * @param  {boolean}      [can_apply=false]
@@ -514,7 +513,7 @@ export declare class DisplayObject extends EventDispatcher {
      * @return {boolean}
      * @private
      */
-    _$isFilterUpdated(width: number, height: number, matrix: Float32Array, filters?: FilterArrayImpl | null, can_apply?: boolean, position_x?: number, position_y?: number): boolean;
+    _$isFilterUpdated(matrix: Float32Array, filters?: FilterArrayImpl | null, can_apply?: boolean): boolean;
     /**
      * @param  {CanvasToWebGLContext} context
      * @param  {array} filters
@@ -536,11 +535,11 @@ export declare class DisplayObject extends EventDispatcher {
     /**
      * @param  {CanvasToWebGLContext} context
      * @param  {Float32Array} matrix
-     * @return {Float32Array|boolean|null}
+     * @return {boolean}
      * @method
      * @private
      */
-    _$startClip(context: CanvasToWebGLContext, matrix: Float32Array): Float32Array | boolean | null;
+    _$startClip(context: CanvasToWebGLContext, matrix: Float32Array): boolean;
     /**
      * @return {void}
      * @method