#154 ディレクトリ構成を変更

Next2D · Aug 3, 2024 · 7386627 · 7386627
1 parent fd2d652
commit 7386627
Show file tree

Hide file tree

Showing 76 changed files with 302 additions and 611 deletions.
diff --git a/packages/core/src/Next2D/LoadService.ts b/packages/core/src/Next2D/LoadService.ts
@@ -75,8 +75,12 @@ export const execute = async (url: string, options: PlayerOptionsImpl | null = n
     // resize
     playerResizeEventService();
 
-    // load complete
+    // remove loading
     playerRemoveLoadingElementService();
+
+    // append canvas
     playerAppendCanvasElementService();
+
+    // TODO: ready complete
     playerReadyCompleteService();
 };
diff --git a/packages/display/src/BlendMode.test.ts b/packages/display/src/BlendMode.test.ts
@@ -1,30 +1,11 @@
 import { BlendMode } from "./BlendMode";
 import { describe, expect, it } from "vitest";
 
-describe("BlendMode.js toString test", () =>
-{
-    it("toString test case1", () =>
-    {
-        const blendMode = new BlendMode();
-        expect(blendMode.toString())
-            .toBe("[object BlendMode]");
-    });
-});
-
-describe("BlendMode.js static toString test", () =>
-{
-    it("static toString test", () =>
-    {
-        expect(BlendMode.toString()).toBe("[class BlendMode]");
-    });
-});
-
 describe("BlendMode.js namespace test", () =>
 {
     it("namespace test public", () =>
     {
-        const blendMode = new BlendMode();
-        expect(blendMode.namespace).toBe("next2d.display.BlendMode");
+        expect(new BlendMode().namespace).toBe("next2d.display.BlendMode");
     });
 
     it("namespace test static", () =>

diff --git a/packages/display/src/BlendMode.ts b/packages/display/src/BlendMode.ts
@@ -9,21 +9,6 @@
  */
 export class BlendMode
 {
-
-    /**
-     * @description 指定されたクラスのストリングを返します。
-     *              Returns the string representation of the specified class.
-     *
-     * @return  {string}
-     * @default "[class BlendMode]"
-     * @method
-     * @static
-     */
-    static toString (): string
-    {
-        return "[class BlendMode]";
-    }
-
     /**
      * @description 指定されたクラスの空間名を返します。
      *              Returns the space name of the specified class.
@@ -38,20 +23,6 @@ export class BlendMode
         return "next2d.display.BlendMode";
     }
 
-    /**
-     * @description 指定されたオブジェクトのストリングを返します。
-     *              Returns the string representation of the specified object.
-     *
-     * @return  {string}
-     * @default "[object BlendMode]"
-     * @method
-     * @public
-     */
-    toString (): string
-    {
-        return "[object BlendMode]";
-    }
-
     /**
      * @description 指定されたオブジェクトの空間名を返します。
      *              Returns the space name of the specified object.
@@ -268,4 +239,4 @@ export class BlendMode
     {
         return "subtract";
     }
-}
+}
diff --git a/packages/display/src/DisplayObject.ts b/packages/display/src/DisplayObject.ts
@@ -2,7 +2,9 @@ import type { Stage } from "./Stage";
 import type { LoaderInfo } from "./LoaderInfo";
 import type { Sprite } from "./Sprite";
 import type { ParentImpl } from "./interface/ParentImpl";
-
+import type { CharacterImpl } from "./interface/CharacterImpl";
+import type { DisplayObjectContainer } from "./DisplayObjectContainer";
+import type { DictionaryTagImpl } from "./interface/DictionaryTagImpl";
 import {
     Event as Next2DEvent,
     EventDispatcher
@@ -22,7 +24,6 @@ import {
     $getInstanceId
 } from "./DisplayObjectUtil";
 
-
 /**
  * @description DisplayObject クラスは、表示リストに含めることのできるすべてのオブジェクトに関する基本クラスです。
  *              DisplayObject クラス自体は、画面上でのコンテンツの描画のための API を含みません。
@@ -2125,4 +2126,36 @@ export class DisplayObject extends EventDispatcher
     //     return true;
     // }
 
+    /**
+     * @description 指定されたタグ情報を元に、表示オブジェクトを構築します。
+     *              Based on the specified tag information, the display object is constructed.
+     *
+     * @param  {object} tag
+     * @param  {DisplayObjectContainer} parent
+     * @return {object}
+     * @method
+     * @protected
+     */
+    _$baseBuild<C extends CharacterImpl, P extends DisplayObjectContainer> (tag: DictionaryTagImpl, parent: P): C
+    {
+        const loaderInfo = parent._$loaderInfo as LoaderInfo;
+        if (!loaderInfo || !loaderInfo.data) {
+            throw new Error("the loaderInfo or data is nul.");
+        }
+
+        // set parent data
+        this._$parent     = parent;
+        this._$root       = parent._$root;
+        this._$stage      = parent._$stage;
+        this._$loaderInfo = loaderInfo;
+
+        // bind tag data
+        this._$characterId = tag.characterId | 0;
+        this._$clipDepth   = tag.clipDepth | 0;
+        this._$startFrame  = tag.startFrame | 0;
+        this._$endFrame    = tag.endFrame | 0;
+        this._$name        = tag.name || "";
+
+        return loaderInfo.data.characters[tag.characterId];
+    }
 }
diff --git a/packages/display/src/DisplayObject/DisplayObjectBaseBuildService.ts b/packages/display/src/DisplayObject/DisplayObjectBaseBuildService.ts
diff --git a/...ect/DisplayObjectGetPlaceObjectService.ts → ...ice/DisplayObjectGetPlaceObjectService.ts b/...ect/DisplayObjectGetPlaceObjectService.ts → ...ice/DisplayObjectGetPlaceObjectService.ts
@@ -1,6 +1,6 @@
-import type { DisplayObjectImpl } from "../interface/DisplayObjectImpl";
-import type { PlaceObjectImpl } from "../interface/PlaceObjectImpl";
-import type { ParentImpl } from "../interface/ParentImpl";
+import type { DisplayObjectImpl } from "../../interface/DisplayObjectImpl";
+import type { PlaceObjectImpl } from "../../interface/PlaceObjectImpl";
+import type { ParentImpl } from "../../interface/ParentImpl";
 
 /**
  * @description DisplayObjectのPlaceObjectを返却、存在しない場合はnullを返却

diff --git a/...bject/DisplayObjectGetRawMatrixService.ts → ...rvice/DisplayObjectGetRawMatrixService.ts b/...bject/DisplayObjectGetRawMatrixService.ts → ...rvice/DisplayObjectGetRawMatrixService.ts
@@ -1,8 +1,8 @@
 import type { Matrix } from "@next2d/geom";
-import type { PlaceObjectImpl } from "../interface/PlaceObjectImpl";
-import type { DisplayObjectImpl } from "../interface/DisplayObjectImpl";
+import type { PlaceObjectImpl } from "../../interface/PlaceObjectImpl";
+import type { DisplayObjectImpl } from "../../interface/DisplayObjectImpl";
 import { execute as displayObjectGetPlaceObjectService } from "./DisplayObjectGetPlaceObjectService";
-import { $getFloat32Array6 } from "../DisplayObjectUtil";
+import { $getFloat32Array6 } from "../../DisplayObjectUtil";
 
 /**
  * @type {Float32Array}

diff --git a/packages/display/src/DisplayObjectContainer.ts b/packages/display/src/DisplayObjectContainer.ts
@@ -159,11 +159,11 @@ export class DisplayObjectContainer extends InteractiveObject
      */
     addChild<T extends DisplayObject> (display_object: T): T
     {
-        // if (child._$parent) {
-        //     child._$parent._$remove(child,
-        //         !(child._$parent._$instanceId === this._$instanceId)
-        //     );
-        // }
+        if (display_object._$parent) {
+            child._$parent._$remove(child,
+                !(child._$parent._$instanceId === this._$instanceId)
+            );
+        }
 
         // this._$getChildren().push(child);
 
@@ -1009,26 +1009,6 @@ export class DisplayObjectContainer extends InteractiveObject
     //         child.removeAllEventListener(Next2DEvent.ENTER_FRAME);
     //     }
 
-    //     if (child.hasEventListener(Next2DEvent.EXIT_FRAME)) {
-    //         child.removeAllEventListener(Next2DEvent.EXIT_FRAME);
-    //     }
-
-    //     if (child.hasEventListener(Next2DEvent.FRAME_CONSTRUCTED)) {
-    //         child.removeAllEventListener(Next2DEvent.FRAME_CONSTRUCTED);
-    //     }
-
-    //     if (child.hasEventListener(Next2DEvent.RENDER)) {
-    //         child.removeAllEventListener(Next2DEvent.RENDER);
-    //     }
-
-    //     if (child.hasEventListener(Next2DEvent.ACTIVATE)) {
-    //         child.removeAllEventListener(Next2DEvent.ACTIVATE);
-    //     }
-
-    //     if (child.hasEventListener(Next2DEvent.DEACTIVATE)) {
-    //         child.removeAllEventListener(Next2DEvent.DEACTIVATE);
-    //     }
-
     //     if (child.hasEventListener("keyDown")) {
     //         child.removeAllEventListener("keyDown");
     //     }

diff --git a/packages/display/src/Loader.ts b/packages/display/src/Loader.ts
@@ -7,10 +7,10 @@ import { LoaderInfo } from "./LoaderInfo";
 import { MovieClip } from "./MovieClip";
 import { URLRequest } from "@next2d/net";
 import { $ajax } from "./DisplayObjectUtil";
-import { execute as loaderLoadstartEventService } from "./Loader/LoaderLoadStartEventService";
-import { execute as loaderProgressEventService } from "./Loader/LoaderProgressEventService";
-import { execute as loaderLoadEndEventService } from "./Loader/LoaderLoadEndEventService";
-import { execute as loaderLoadJsonService } from "./Loader/LoaderLoadJsonService";
+import { execute as loaderLoadstartEventService } from "./Loader/service/LoaderLoadStartEventService";
+import { execute as loaderProgressEventService } from "./Loader/service/LoaderProgressEventService";
+import { execute as loaderLoadEndEventService } from "./Loader/service/LoaderLoadEndEventService";
+import { execute as loaderLoadJsonService } from "./Loader/service/LoaderLoadJsonService";
 
 /**
  * @description Loader クラスは、JSON ファイルを読み込むために使用します。
@@ -40,26 +40,11 @@ export class Loader extends DisplayObjectContainer
         this._$loaderInfo = new LoaderInfo();
     }
 
-    /**
-     * @description 指定されたクラスのストリングを返します。
-     *              Returns the string representation of the specified class.
-     *
-     * @return  {string}
-     * @default "[class Loader]"
-     * @method
-     * @static
-     */
-    static toString (): string
-    {
-        return "[class Loader]";
-    }
-
     /**
      * @description 指定されたクラスの空間名を返します。
      *              Returns the space name of the specified class.
      *
-     * @return  {string}
-     * @default "next2d.display.Loader"
+     * @return {string}
      * @const
      * @static
      */
@@ -68,26 +53,11 @@ export class Loader extends DisplayObjectContainer
         return "next2d.display.Loader";
     }
 
-    /**
-     * @description 指定されたオブジェクトのストリングを返します。
-     *              Returns the string representation of the specified object.
-     *
-     * @return  {string}
-     * @default "[object Loader]"
-     * @method
-     * @public
-     */
-    toString (): string
-    {
-        return "[object Loader]";
-    }
-
     /**
      * @description 指定されたオブジェクトの空間名を返します。
      *              Returns the space name of the specified object.
      *
-     * @return  {string}
-     * @default "next2d.display.Loader"
+     * @return {string}
      * @const
      * @public
      */

diff --git a/.../display/src/Loader/LoaderBuildService.ts → .../src/Loader/service/LoaderBuildService.ts b/.../display/src/Loader/LoaderBuildService.ts → .../src/Loader/service/LoaderBuildService.ts
@@ -1,7 +1,6 @@
-import type { NoCodeDataImpl } from "../interface/NoCodeDataImpl";
-import type { Loader } from "../Loader";
-import { MovieClip } from "../MovieClip";
-import { execute as movieClipBuildService } from "../MovieClip/MovieClipBuildService";
+import type { NoCodeDataImpl } from "../../interface/NoCodeDataImpl";
+import type { Loader } from "../../Loader";
+import { MovieClip } from "../../MovieClip";
 
 /**
  * @description 読み込んだJSONオブジェクトからMovieClipを作成
@@ -34,7 +33,8 @@ export const execute = async (loader: Loader, object: NoCodeDataImpl): Promise<v
 
     // build root content
     const movieClip = new MovieClip();
-    await movieClipBuildService(movieClip, {
+
+    await movieClip._$build<Loader>({
         "characterId": 0,
         "name": "main",
         "clipDepth": 0,
@@ -44,4 +44,5 @@ export const execute = async (loader: Loader, object: NoCodeDataImpl): Promise<v
     }, loader);
 
     loaderInfo.content = movieClip;
+    console.log(movieClip);
 };
diff --git a/.../Loader/LoaderLoadEndEventService.test.ts → ...service/LoaderLoadEndEventService.test.ts b/.../Loader/LoaderLoadEndEventService.test.ts → ...service/LoaderLoadEndEventService.test.ts
@@ -1,4 +1,4 @@
-import { Loader } from "../Loader";
+import { Loader } from "../../Loader";
 import { execute } from "./LoaderLoadEndEventService";
 import {
     Event,

diff --git a/...y/src/Loader/LoaderLoadEndEventService.ts → ...ader/service/LoaderLoadEndEventService.ts b/...y/src/Loader/LoaderLoadEndEventService.ts → ...ader/service/LoaderLoadEndEventService.ts
@@ -1,5 +1,5 @@
-import { Loader } from "../Loader";
-import { $headerStringToArray } from "../DisplayObjectUtil";
+import { Loader } from "../../Loader";
+import { $headerStringToArray } from "../../DisplayObjectUtil";
 import { execute as loaderLoadJsonService } from "./LoaderLoadJsonService";
 import {
     Event,

diff --git a/...splay/src/Loader/LoaderLoadJsonService.ts → ...c/Loader/service/LoaderLoadJsonService.ts b/...splay/src/Loader/LoaderLoadJsonService.ts → ...c/Loader/service/LoaderLoadJsonService.ts
@@ -1,10 +1,10 @@
-import type { NoCodeDataImpl } from "../interface/NoCodeDataImpl";
-import type { NoCodeDataZlibImpl } from "../interface/NoCodeDataZlibImpl";
-import type { Loader } from "../Loader";
+import type { NoCodeDataImpl } from "../../interface/NoCodeDataImpl";
+import type { NoCodeDataZlibImpl } from "../../interface/NoCodeDataZlibImpl";
+import type { Loader } from "../../Loader";
 import { execute as loaderBuildService } from "./LoaderBuildService";
 
 // @ts-ignore
-import ZlibInflateWorker from "./ZlibInflateWorker?worker&inline";
+import ZlibInflateWorker from "../worker/ZlibInflateWorker?worker&inline";
 
 /**
  * @type {Worker}

diff --git a/...oader/LoaderLoadStartEventService.test.ts → ...rvice/LoaderLoadStartEventService.test.ts b/...oader/LoaderLoadStartEventService.test.ts → ...rvice/LoaderLoadStartEventService.test.ts
@@ -1,4 +1,4 @@
-import { Loader } from "../Loader";
+import { Loader } from "../../Loader";
 import { execute } from "./LoaderLoadStartEventService";
 import {
     Event,