@next2d/display 1.15.0 → 1.17.0

package/dist/Loader.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
 import { LoaderInfo } from "./LoaderInfo";
 import { MovieClip } from "./MovieClip";
@@ -148,6 +139,33 @@ export class Loader extends DisplayObjectContainer {
             }
         });
     }
+    /**
+     * @description NoCodeToolのJSONを直接読み込む
+     *              Read JSON directly from NoCodeTool
+     *
+     * @param  {string} json
+     * @return {void}
+     * @method
+     * @public
+     */
+    loadJSON(json) {
+        if (json.type === "zlib") {
+            if ($useUnzipWorker()) {
+                $unzipQueues.push(json);
+                return;
+            }
+            $updateUnzipWorkerStatus(true);
+            const unzipWorker = $getUnzipWorker();
+            const buffer = new Uint8Array(json.buffer);
+            unzipWorker.onmessage = (event) => {
+                this._$unzipHandler(event);
+            };
+            unzipWorker.postMessage(buffer, [buffer.buffer]);
+        }
+        else {
+            this._$build(json);
+        }
+    }
     /**
      * @param  {ProgressEvent} event
      * @return {void}
@@ -174,29 +192,12 @@ export class Loader extends DisplayObjectContainer {
         }
         if (199 < target.status && 400 > target.status) {
             if (loaderInfo.format === "json") {
-                const json = target.response;
-                if (json.type === "zlib") {
-                    if ($useUnzipWorker()) {
-                        $unzipQueues.push({
-                            "json": json,
-                            "scope": this
-                        });
-                        return;
-                    }
-                    $updateUnzipWorkerStatus(true);
-                    const unzipWorker = $getUnzipWorker();
-                    const buffer = new Uint8Array(json.buffer);
-                    unzipWorker.onmessage = (event) => __awaiter(this, void 0, void 0, function* () {
-                        this._$unzipHandler(event);
-                    });
-                    unzipWorker.postMessage(buffer, [buffer.buffer]);
-                }
-                else {
-                    this._$build(json);
-                }
+                this.loadJSON(target.response);
             }
             else {
-                throw new Error("LoaderInfo format is `json`");
+                if (loaderInfo.willTrigger(IOErrorEvent.IO_ERROR)) {
+                    loaderInfo.dispatchEvent(new IOErrorEvent(IOErrorEvent.IO_ERROR, false, false, "LoaderInfo format is `json`"));
+                }
             }
         }
         else {
@@ -218,10 +219,10 @@ export class Loader extends DisplayObjectContainer {
             if (!object) {
                 return;
             }
-            const buffer = new Uint8Array(object.json.buffer);
+            const buffer = new Uint8Array(object.buffer);
             const unzipWorker = $getUnzipWorker();
             unzipWorker.onmessage = (event) => {
-                object.scope._$unzipHandler(event);
+                this._$unzipHandler(event);
             };
             unzipWorker.postMessage(buffer, [buffer.buffer]);
         }

package/dist/MovieClip.js

@@ -249,7 +249,7 @@ export class MovieClip extends Sprite {
         if (this._$loopConfig) {
             return this._$loopConfig;
         }
-        const place = this._$getPlaceObject();
+        const place = this._$placeObject || this._$getPlaceObject();
         if (!place || !place.loop) {
             return null;
         }

package/dist/Shape.d.ts

@@ -15,8 +15,6 @@ import type { BoundsImpl, ShapeCharacterImpl, ParentImpl, DictionaryTagImpl, Pla
  */
 export declare class Shape extends DisplayObject {
     private _$graphics;
-    private _$bounds;
-    private _$bitmapId;
     private _$src;
     /**
      * @constructor
@@ -91,12 +89,6 @@ export declare class Shape extends DisplayObject {
      * @private
      */
     _$buildCharacter(character: Character<ShapeCharacterImpl>, loaderInfo: LoaderInfo): void;
-    /**
-     * @return {void}
-     * @method
-     * @private
-     */
-    _$createWorkerInstance(): void;
     /**
      * @param  {object} character
      * @return {void}
@@ -155,6 +147,12 @@ export declare class Shape extends DisplayObject {
      * @private
      */
     _$hit(context: CanvasRenderingContext2D, matrix: Float32Array, options: PlayerHitObjectImpl, is_clip?: boolean): boolean;
+    /**
+     * @return {void}
+     * @method
+     * @private
+     */
+    _$createWorkerInstance(): void;
     /**
      * @return {void}
      * @method

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 プロパティがあります。
@@ -28,18 +28,6 @@ export class Shape extends DisplayObject {
          * @private
          */
         this._$graphics = null;
-        /**
-         * @type {object}
-         * @default null
-         * @private
-         */
-        this._$bounds = null;
-        /**
-         * @type {number}
-         * @default 0
-         * @private
-         */
-        this._$bitmapId = 0;
         /**
          * @type {string}
          * @default ""
@@ -122,6 +110,9 @@ export class Shape extends DisplayObject {
         return this._$src;
     }
     set src(src) {
+        if (!src) {
+            return;
+        }
         const image = new Image();
         image.addEventListener("load", () => {
             const width = image.width;
@@ -137,6 +128,7 @@ export class Shape extends DisplayObject {
             }
         });
         this._$src = image.src = src;
+        this.graphics._$mode = "bitmap";
     }
     /**
      * @param  {object} character
@@ -154,7 +146,6 @@ export class Shape extends DisplayObject {
             switch (true) {
                 case character.bitmapId > 0:
                     {
-                        this._$bitmapId = character.bitmapId;
                         const bitmap = loaderInfo
                             ._$data
                             .characters[character.bitmapId];
@@ -172,6 +163,11 @@ export class Shape extends DisplayObject {
                         bitmapData.buffer = bitmap._$buffer.slice();
                         // setup
                         graphics._$recode = $getArray();
+                        if (width === character.bounds.xMax - character.bounds.xMin
+                            && height === character.bounds.yMax - character.bounds.yMin) {
+                            graphics._$bitmapId = character.bitmapId;
+                            graphics._$mode = "bitmap";
+                        }
                         // clone
                         const recodes = character.recodes;
                         if (recodes[recodes.length - 1] === Graphics.END_FILL) {
@@ -214,6 +210,11 @@ export class Shape extends DisplayObject {
                             graphics._$recode[idx++] = bitmapData;
                             const matrix = recodes[idx];
                             graphics._$recode[idx] = $getFloat32Array6(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
+                            if (value.width === character.bounds.xMax - character.bounds.xMin
+                                && value.height === character.bounds.yMax - character.bounds.yMin) {
+                                graphics._$bitmapId = character.bitmapId;
+                                graphics._$mode = "bitmap";
+                            }
                         }
                     }
                     break;
@@ -223,6 +224,7 @@ export class Shape extends DisplayObject {
             }
         }
         else {
+            graphics._$mode = "bitmap";
             const width = $Math.abs(character.bounds.xMax - character.bounds.xMin);
             const height = $Math.abs(character.bounds.yMax - character.bounds.yMin);
             const bitmapData = new BitmapData(width, height);
@@ -253,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}
@@ -473,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

@@ -1,6 +1,5 @@
 import { DisplayObjectContainer } from "./DisplayObjectContainer";
-import { $devicePixelRatio } from "@next2d/util";
-import { $clamp, $toColorInt, $uintToRGBA } from "@next2d/share";
+import { $clamp, $toColorInt, $uintToRGBA, $devicePixelRatio } from "@next2d/share";
 /**
  * Stage クラスはメイン描画領域を表します。
  * The Stage class represents the main drawing area.
@@ -246,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);
     }
 }