#147 固定値をConfigに集約

Next2D · Oct 16, 2023 · bac90e0 · bac90e0
1 parent a43461c
commit bac90e0
Show file tree

Hide file tree

Showing 46 changed files with 230 additions and 100 deletions.
diff --git a/src/js/const/Config.ts → src/js/config/Config.ts b/src/js/const/Config.ts → src/js/config/Config.ts
diff --git a/src/js/config/ControllerConfig.ts b/src/js/config/ControllerConfig.ts
diff --git a/src/js/config/LibraryConfig.ts b/src/js/config/LibraryConfig.ts
@@ -0,0 +1,7 @@
+/**
+ * @description ライブラリのプレビューエリアのElementのID
+ *
+ * @type {string}
+ * @constant
+ */
+export const $LIBRARY_PREVIEW_AREA_ID: string = "library-preview-area";
diff --git a/src/js/const/MenuConfig.ts → src/js/config/MenuConfig.ts b/src/js/const/MenuConfig.ts → src/js/config/MenuConfig.ts
diff --git a/src/js/config/ScreenConfig.ts b/src/js/config/ScreenConfig.ts
@@ -0,0 +1,26 @@
+/**
+ * @description ステージのElementのID
+ *              ID of the Element of the stage
+ *
+ * @type {string}
+ * @constant
+ */
+export const $SCREEN_STAGE_ID: string = "stage";
+
+/**
+ * @description ステージエリアのElementのID
+ *              ID of Element in Stage Area
+ *
+ * @type {string}
+ * @constant
+ */
+export const $SCREEN_STAGE_AREA_ID: string = "stage-area";
+
+/**
+ * @description スクリーンエリアのElementのID
+ *              ID of the Element in the screen area
+ *
+ * @type {string}
+ * @constant
+ */
+export const $SCREEN_ID: string = "screen";
diff --git a/src/js/config/StageSettingConfig.ts b/src/js/config/StageSettingConfig.ts
@@ -0,0 +1,80 @@
+/**
+ * @description ステージの横幅の初期値
+ *              Default stage width
+ *
+ * @type {number}
+ * @constant
+ */
+export const $STAGE_DEFAULT_WIDTH: number = 550;
+
+/**
+ * @description ステージの高さの初期値
+ *              Default stage height
+ *
+ * @type {number}
+ * @constant
+ */
+export const $STAGE_DEFAULT_HEIGHT: number = 400;
+
+/**
+ * @description ステージのフレームレートの初期値
+ *              Default stage frame rate
+ *
+ * @type {number}
+ * @constant
+ */
+export const $STAGE_DEFAULT_FPS: number = 24;
+
+/**
+ * @description ステージの初期背景色
+ *              Initial background color of the stage
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_DEFAULT_COLOR: string = "#ffffff";
+
+/**
+ * @description ステージの幅のElementのID
+ *              ID of Element of Stage Width
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_WIDTH_ID: string = "stage-width";
+
+/**
+ * @description ステージの高さのElementのID
+ *              ID of Element of Stage Height
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_HEIGHT_ID: string = "stage-height";
+
+/**
+ * @description ステージのFPS設定のElementのID
+ *              ID of the Element of the FPS setting of the stage
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_FPS_ID: string = "stage-fps";
+
+/**
+ * @description ステージの背景色のElementのID
+ *              ID of the Element of the stage background color
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_BG_COLOR_ID: string = "stage-bgColor";
+
+/**
+ * @description ステージの幅高さのロックのElementのID
+ *              ID of Element of Stage Width Height Lock
+ *
+ * @type {string}
+ * @constant
+ */
+export const $STAGE_LOCK_ID: string = "stage-lock";
diff --git a/src/js/config/TimelineConfig.ts b/src/js/config/TimelineConfig.ts
@@ -0,0 +1,17 @@
+/**
+ * @description タイムラインの高さの初期値
+ *              Default height of timeline
+ *
+ * @type {number}
+ * @constant
+ */
+export const $TIMELINE_DEFAULT_HEIGHT_SIZE: number = 280;
+
+/**
+ * @description タイムラインのラベル設定のElementのID
+ *              ID of the Element for the timeline label setting
+ *
+ * @type {string}
+ * @constant
+ */
+export const $TIMELINE_LABEL_NAME: string = "label-name";
diff --git a/src/js/const/ToolConfig.ts → src/js/config/ToolConfig.ts b/src/js/const/ToolConfig.ts → src/js/config/ToolConfig.ts
@@ -160,3 +160,11 @@ export const $TOOL_ZOOM_PLUS_NAME: string = "zoom-plus";
  */
 export const $TOOL_USER_SETTING_ID: string = `${$TOOL_PREFIX}-${$TOOL_USER_SETTING_NAME}`;
 
+/**
+ * @description スクリーンの拡大縮小値のElementのID
+ *              ID of the Element for the screen scaling value
+ *
+ * @type {string}
+ * @constant
+ */
+export const $SCREEN_SCALE_ID: string = "screen-scale";
diff --git a/src/js/const/StageConfig.ts b/src/js/const/StageConfig.ts
diff --git a/src/js/const/TimelineConfig.ts b/src/js/const/TimelineConfig.ts
diff --git a/src/js/controller/application/service/LibraryPreviewAreaChangeColor.ts b/src/js/controller/application/service/LibraryPreviewAreaChangeColor.ts
@@ -1,3 +1,5 @@
+import { $LIBRARY_PREVIEW_AREA_ID } from "../../../config/LibraryConfig";
+
 /**
  * @description ライブラリのプレビューエリアの背景色を更新
  *              Updated background color of library preview area
@@ -10,7 +12,7 @@
 export const execute = (color: string): void =>
 {
     const element: HTMLElement | null = document
-        .getElementById("library-preview-area");
+        .getElementById($LIBRARY_PREVIEW_AREA_ID);
 
     if (!element) {
         return ;

diff --git a/src/js/controller/application/service/StageSettingUpdate.ts b/src/js/controller/application/service/StageSettingUpdate.ts
@@ -1,4 +1,11 @@
 import { Stage } from "../../../core/model/Stage";
+import { 
+    $STAGE_BG_COLOR_ID,
+    $STAGE_FPS_ID,
+    $STAGE_HEIGHT_ID,
+    $STAGE_LOCK_ID,
+    $STAGE_WIDTH_ID
+} from "../../../config/StageSettingConfig";
 
 /**
  * @description ステージ設定の各値を更新
@@ -12,35 +19,35 @@ import { Stage } from "../../../core/model/Stage";
 export const execute = (stage: Stage): void =>
 {
     const stageWidth: HTMLInputElement | null = document
-        .getElementById("stage-width") as HTMLInputElement;
+        .getElementById($STAGE_WIDTH_ID) as HTMLInputElement;
 
     if (stageWidth) {
         stageWidth.value = `${stage.width}`;
     }
 
     const stageHeight: HTMLInputElement | null = document
-        .getElementById("stage-height") as HTMLInputElement;
+        .getElementById($STAGE_HEIGHT_ID) as HTMLInputElement;
 
     if (stageHeight) {
         stageHeight.value = `${stage.height}`;
     }
 
     const stageFps: HTMLInputElement | null = document
-        .getElementById("stage-fps") as HTMLInputElement;
+        .getElementById($STAGE_FPS_ID) as HTMLInputElement;
 
     if (stageFps) {
         stageFps.value = `${stage.fps}`;
     }
 
     const stageBgColor: HTMLInputElement | null = document
-        .getElementById("stage-bgColor") as HTMLInputElement;
+        .getElementById($STAGE_BG_COLOR_ID) as HTMLInputElement;
 
     if (stageBgColor) {
         stageBgColor.value = stage.bgColor;
     }
 
     const stageLock: HTMLElement | null = document
-        .getElementById("stage-lock");
+        .getElementById($STAGE_LOCK_ID);
 
     if (stageLock && stageLock.children.length) {
         stageLock

diff --git a/src/js/core/model/Layer.ts b/src/js/core/model/Layer.ts
@@ -0,0 +1,11 @@
+/**
+ * @description タイムラインのレイヤー状態管理クラス
+ *              Timeline layer state management class
+ *
+ * @class
+ * @public
+ */
+export class Layer
+{
+
+}
diff --git a/src/js/core/model/MovieClip.ts b/src/js/core/model/MovieClip.ts
@@ -1,5 +1,13 @@
 import { Instance } from "./Instance";
 
+/**
+ * @description MovieClipの状態管理クラス
+ *              MovieClip state management class
+ *
+ * @class
+ * @public
+ * @extends {Instance}
+ */
 export class MovieClip extends Instance
 {
 

diff --git a/src/js/core/model/Stage.ts b/src/js/core/model/Stage.ts
@@ -1,12 +1,12 @@
 import { StageObjectImpl } from "../../interface/StageObjectImpl";
-import { execute as stageInitializeUseCase } from "../usecase/StageInitializeUsecase";
+import { execute as stageInitializeUseCase } from "../usecase/StageInitializeUseCase";
 import { $clamp } from "../../util/Global";
 import {
-    STAGE_DEFAULT_FPS,
-    STAGE_DEFAULT_HEIGHT,
-    STAGE_DEFAULT_WIDTH,
-    STAGE_DEFAULT_COLOR
-} from "../../const/StageConfig";
+    $STAGE_DEFAULT_FPS,
+    $STAGE_DEFAULT_HEIGHT,
+    $STAGE_DEFAULT_WIDTH,
+    $STAGE_DEFAULT_COLOR
+} from "../../config/StageSettingConfig";
 
 /**
  * @description スクリーンエリアのステージの管理クラス
@@ -31,35 +31,35 @@ export class Stage
     {
         /**
          * @type {number}
-         * @default STAGE_DEFAULT_WIDTH
+         * @default $STAGE_DEFAULT_WIDTH
          * @private
          */
-        this._$width = STAGE_DEFAULT_WIDTH;
+        this._$width = $STAGE_DEFAULT_WIDTH;
 
         /**
          * @type {number}
-         * @default STAGE_DEFAULT_HEIGHT
+         * @default $STAGE_DEFAULT_HEIGHT
          * @private
          */
-        this._$height = STAGE_DEFAULT_HEIGHT;
+        this._$height = $STAGE_DEFAULT_HEIGHT;
 
         /**
          * @type {number}
-         * @default STAGE_DEFAULT_FPS
+         * @default $STAGE_DEFAULT_FPS
          * @private
          */
-        this._$fps = STAGE_DEFAULT_FPS;
+        this._$fps = $STAGE_DEFAULT_FPS;
 
         /**
          * @type {number}
-         * @default STAGE_DEFAULT_COLOR
+         * @default $STAGE_DEFAULT_COLOR
          * @private
          */
-        this._$bgColor = STAGE_DEFAULT_COLOR;
+        this._$bgColor = $STAGE_DEFAULT_COLOR;
 
         /**
          * @type {boolean}
-         * @default STAGE_DEFAULT_WIDTH
+         * @default false
          * @private
          */
         this._$lock = false;
@@ -70,7 +70,7 @@ export class Stage
      *              Stage display width
      *
      * @member {number}
-     * @default STAGE_DEFAULT_WIDTH
+     * @default $STAGE_DEFAULT_WIDTH
      * @public
      */
     get width (): number
@@ -87,7 +87,7 @@ export class Stage
      *              Stage display height
      *
      * @member {number}
-     * @default STAGE_DEFAULT_HEIGHT
+     * @default $STAGE_DEFAULT_HEIGHT
      * @public
      */
     get height (): number
@@ -104,7 +104,7 @@ export class Stage
      *              Set the stage drawing speed.
      *
      * @member {number}
-     * @default STAGE_DEFAULT_FPS
+     * @default $STAGE_DEFAULT_FPS
      * @public
      */
     get fps (): number
@@ -121,7 +121,7 @@ export class Stage
      *              Setting the background color of the stage
      *
      * @return {string}
-     * @default STAGE_DEFAULT_COLOR
+     * @default $STAGE_DEFAULT_COLOR
      * @public
      */
     get bgColor (): string