@next2d/display 1.16.0 → 1.17.0

package/dist/Shape.js

@@ -3,7 +3,7 @@ import { Graphics } from "./Graphics";
 import { BitmapData } from "./BitmapData";
 import { Rectangle } from "@next2d/geom";
 import { Event } from "@next2d/events";
-import { $MATRIX_HIT_ARRAY_IDENTITY, $rendererWorker } from "@next2d/util";
+import { $MATRIX_HIT_ARRAY_IDENTITY, $getRenderBufferArray, $getRenderMessageObject, $poolRenderMessageObject, $rendererWorker } from "@next2d/util";
 import { $getArray, $poolArray, $getFloat32Array6, $getBoundsObject, $poolBoundsObject, $multiplicationMatrix, $boundsMatrix, $poolFloat32Array6, $multiplicationColor, $clamp, $poolFloat32Array8, $Math, $COLOR_ARRAY_IDENTITY } from "@next2d/share";
 /**
  * Shape クラスには、Graphics クラスからメソッドにアクセスできる graphics プロパティがあります。
@@ -255,57 +255,6 @@ export class Shape extends DisplayObject {
             this._$createWorkerInstance();
         }
     }
-    /**
-     * @return {void}
-     * @method
-     * @private
-     */
-    _$createWorkerInstance() {
-        if (this._$created || !$rendererWorker) {
-            return;
-        }
-        this._$created = true;
-        const options = $getArray();
-        const bounds = this._$getBounds();
-        const message = {
-            "command": "createShape",
-            "instanceId": this._$instanceId,
-            "parentId": this._$parent ? this._$parent._$instanceId : -1,
-            "maxAlpha": 0,
-            "canDraw": false,
-            "xMin": bounds.xMin,
-            "yMin": bounds.yMin,
-            "xMax": bounds.xMax,
-            "yMax": bounds.yMax
-        };
-        const graphics = this._$graphics;
-        if (graphics) {
-            const recodes = graphics._$getRecodes();
-            if (recodes.length
-                && graphics._$maxAlpha > 0
-                && graphics._$canDraw) {
-                message.maxAlpha = graphics._$maxAlpha;
-                message.canDraw = graphics._$canDraw;
-                message.recodes = recodes;
-                options.push(recodes.buffer);
-            }
-        }
-        if (this._$characterId > -1) {
-            message.characterId = this._$characterId;
-        }
-        if (this._$loaderInfo) {
-            message.loaderInfoId = this._$loaderInfo._$id;
-        }
-        if (this._$scale9Grid) {
-            message.grid = {
-                "x": this._$scale9Grid.x,
-                "y": this._$scale9Grid.y,
-                "w": this._$scale9Grid.width,
-                "h": this._$scale9Grid.height
-            };
-        }
-        $rendererWorker.postMessage(message, options);
-    }
     /**
      * @param  {object} character
      * @return {void}
@@ -475,18 +424,75 @@ export class Shape extends DisplayObject {
         }
         return hit;
     }
+    /**
+     * @return {void}
+     * @method
+     * @private
+     */
+    _$createWorkerInstance() {
+        if (this._$created || !$rendererWorker) {
+            return;
+        }
+        // update flag
+        this._$created = true;
+        this._$posted = true;
+        this._$updated = false;
+        const buffer = $getRenderBufferArray();
+        let index = 0;
+        buffer[index++] = this._$instanceId;
+        buffer[index++] = this._$parent ? this._$parent._$instanceId : -1;
+        buffer[index++] = 0; // maxAlpha
+        buffer[index++] = 0; // canDraw
+        // graphics
+        const graphics = this._$graphics;
+        if (graphics
+            && !graphics._$posted
+            && graphics._$maxAlpha > 0
+            && graphics._$canDraw) {
+            graphics._$posted = true;
+            const message = $getRenderMessageObject();
+            const recodes = graphics._$getRecodes();
+            message.command = `shapeRecodes@${this._$instanceId}`;
+            message.buffer = recodes;
+            const options = $getArray(recodes.buffer);
+            $rendererWorker.postMessage(message, options);
+            $poolRenderMessageObject(message);
+            $poolArray(options);
+            buffer[2] = graphics._$maxAlpha;
+            buffer[3] = +graphics._$canDraw;
+        }
+        // bounds
+        const bounds = this._$getBounds();
+        buffer[index++] = bounds.xMin;
+        buffer[index++] = bounds.yMin;
+        buffer[index++] = bounds.xMax;
+        buffer[index++] = bounds.yMax;
+        // characterId
+        buffer[index++] = this._$characterId > -1 ? this._$characterId : -1;
+        // loaderInfoId
+        buffer[index++] = this._$loaderInfo ? this._$loaderInfo._$id : -1;
+        // property
+        this._$registerProperty(buffer, index);
+        const message = $getRenderMessageObject();
+        message.command = "createShape";
+        message.buffer = buffer;
+        const options = $getArray(buffer.buffer);
+        $rendererWorker.postMessage(message, options);
+        $poolRenderMessageObject(message);
+        $poolArray(options);
+    }
     /**
      * @return {void}
      * @method
      * @private
      */
     _$postProperty() {
-        if (!$rendererWorker) {
+        if (!this._$created || !$rendererWorker) {
             return;
         }
         const message = this._$createMessage();
         const graphics = this._$graphics;
-        if (graphics && !graphics._$buffer) {
+        if (graphics && !graphics._$posted) {
             message.maxAlpha = graphics._$maxAlpha;
             message.canDraw = graphics._$canDraw;
             const recodes = graphics._$getRecodes();

package/dist/Sprite.d.ts

@@ -1,5 +1,4 @@
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
-import { Graphics } from "./Graphics";
 import { SoundTransform } from "@next2d/media";
 import type { Rectangle, Point } from "@next2d/geom";
 import type { SpriteImpl, DropTargetImpl, DictionaryTagImpl, ParentImpl, MovieClipCharacterImpl } from "@next2d/interface";
@@ -18,7 +17,6 @@ export declare class Sprite extends DisplayObjectContainer {
     protected _$buttonMode: boolean;
     protected _$hitArea: SpriteImpl<any> | null;
     protected _$soundTransform: SoundTransform | null;
-    protected _$graphics: Graphics | null;
     protected _$useHandCursor: boolean;
     /**
      * @constructor
@@ -85,16 +83,6 @@ export declare class Sprite extends DisplayObjectContainer {
      * @public
      */
     get dropTarget(): DropTargetImpl;
-    /**
-     * @description ベクターの描画コマンドが発生するこのスプライトに属する Graphics オブジェクトを指定します。
-     *              Specifies the Graphics object that belongs to this sprite
-     *              where vector drawing commands can occur.
-     *
-     * @member  {Graphics}
-     * @readonly
-     * @public
-     */
-    get graphics(): Graphics;
     /**
      * @description スプライトのヒット領域となる別のスプライトを指定します。
      *              Designates another sprite to serve as the hit area for a sprite.

package/dist/Sprite.js

@@ -1,5 +1,4 @@
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
-import { Graphics } from "./Graphics";
 import { SoundTransform } from "@next2d/media";
 import { $currentMousePoint, $dragRules, $dropTarget, $rendererWorker, $setDropTarget } from "@next2d/util";
 /**
@@ -44,12 +43,6 @@ export class Sprite extends DisplayObjectContainer {
          * @private
          */
         this._$useHandCursor = true;
-        /**
-         * @type {Graphics|null}
-         * @default null
-         * @private
-         */
-        this._$graphics = null;
     }
     /**
      * @description 指定されたクラスのストリングを返します。
@@ -125,21 +118,6 @@ export class Sprite extends DisplayObjectContainer {
     get dropTarget() {
         return $dropTarget;
     }
-    /**
-     * @description ベクターの描画コマンドが発生するこのスプライトに属する Graphics オブジェクトを指定します。
-     *              Specifies the Graphics object that belongs to this sprite
-     *              where vector drawing commands can occur.
-     *
-     * @member  {Graphics}
-     * @readonly
-     * @public
-     */
-    get graphics() {
-        if (!this._$graphics) {
-            this._$graphics = new Graphics(this);
-        }
-        return this._$graphics;
-    }
     /**
      * @description スプライトのヒット領域となる別のスプライトを指定します。
      *              Designates another sprite to serve as the hit area for a sprite.

package/dist/Stage.js

@@ -245,6 +245,8 @@ export class Stage extends DisplayObjectContainer {
     _$addChild(child) {
         child._$stage = this;
         child._$root = child;
+        // worker flag updated
+        this._$created = true;
         return super._$addChild(child);
     }
 }