@fmsim/machine 2.0.0-beta.70 → 2.0.0-beta.77

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "2.0.0-beta.70",
+  "version": "2.0.0-beta.77",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -26,7 +26,7 @@
     "migration": "things-factory-migration"
   },
   "dependencies": {
-    "@fmsim/api": "^2.0.0-beta.70",
+    "@fmsim/api": "^2.0.0-beta.75",
     "@hatiolab/things-scene": "^10.0.0-beta.1"
   },
   "devDependencies": {
@@ -55,5 +55,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "333bfecbee1ac6fd2f2c2d372912a9f62e3d0d4f"
+  "gitHead": "a733a8ec8d0ed643dc0079a68deaeb9913b39308"
 }

package/src/features/conveyor-mixin.ts

@@ -50,7 +50,7 @@ function pattern(component: any) {
   return component._pattern
 }
 
-export function ConveyorMixin<TBase extends Constructor<Component>>(Base: TBase) {
+export function ConveyorMixin<TBase extends new (...args: any[]) => any>(Base: TBase): any {
   const A = class extends Base {
     _pattern
 

package/src/features/mcs-status-mixin.ts

@@ -1,12 +1,13 @@
+import { Component } from '@hatiolab/things-scene'
+import { themesColorMap } from '@fmsim/api'
+import { LEGEND_NULL } from './mcs-status-default'
+
 type Constructor<T = {}> = new (...args: any[]) => T
 
 interface Legend {
   [key: string]: string
 }
 
-import { themesColorMap } from '@fmsim/api'
-import { LEGEND_NULL } from './mcs-status-default'
-
 export const MCSStatusMixinProperties = [
   {
     type: 'select',
@@ -18,7 +19,7 @@ export const MCSStatusMixinProperties = [
   }
 ]
 
-export function MCSStatusMixin<TBase extends Constructor>(Base: TBase) {
+export function MCSStatusMixin<TBase extends Constructor<Component>>(Base: TBase): any {
   return class extends Base {
     isLVComponent() {
       return true

package/src/features/mcs-zone-mixin.ts

@@ -10,7 +10,7 @@ export const MCSZoneMixinProperties = [
   }
 ]
 
-export function MCSZoneMixin<TBase extends Constructor<MCSUnit>>(Base: TBase) {
+export function MCSZoneMixin<TBase extends Constructor<MCSUnit>>(Base: TBase): any {
   return class extends Base {
     get zone(): string | undefined {
       return

package/src/features/parent-object-mixin.ts

@@ -12,7 +12,7 @@ export const ParentObjectMixinProperties = [
   }
 ]
 
-export function ParentObjectMixin<TBase extends Constructor<Component>>(Base: TBase) {
+export function ParentObjectMixin<TBase extends Constructor<Component>>(Base: TBase): any {
   return class extends Base {
     get parentObject(): MCSMachine | MCSUnit | undefined {
       const { id, parentObjectId } = this.state

package/src/floating-container.ts

@@ -42,6 +42,11 @@ const NATURE = {
 }
 @sceneComponent('FloatingContainer')
 export default class FloatingContainer extends Container {
+  // things-scene 의 `declare const Container_base` 패턴이 base 인스턴스 타입의 accessor
+  // 정보를 object-type property 로 평탄화하여 TS2611 발생. 동일 위치를 override 하는
+  // 케이스가 operato-scene 엔 없어 fmsim 만 영향. things-scene 측 mixin 타입 패턴이
+  // 개선되면 제거.
+  // @ts-expect-error TS2611
   get position() {
     return this.app?.isViewMode ? 'absolute' : 'static'
   }

package/src/mcs-unit.ts

@@ -1,4 +1,4 @@
-import { Component, ContainerAbstract } from '@hatiolab/things-scene'
+import { ContainerAbstract } from '@hatiolab/things-scene'
 import { getPopupData } from '@fmsim/api'
 
 import { MCSStatusMixin, MCSStatusMixinProperties } from './features/mcs-status-mixin'

package/src/scene/root-container-override.ts

@@ -197,6 +197,14 @@ Object.defineProperty(ModelLayer.prototype, 'nature', {
           property: {
             options: themesColorRange
           }
+        },
+        {
+          type: 'select',
+          label: 'light-preset',
+          name: 'lightPreset',
+          property: {
+            options: ['dark', 'medium', 'bright']
+          }
         }
       ],
       'value-property': 'text'
@@ -204,6 +212,35 @@ Object.defineProperty(ModelLayer.prototype, 'nature', {
   }
 })
 
+/**
+ * 조명 프리셋 — 3 단계 밝기 토글.
+ *
+ * fmsim 은 디테일 조명 옵션 UI 를 노출하지 않으므로 단일 select 로 단순화.
+ * medium = things-scene 의 현재 default 값과 동일 (외관 변화 없음).
+ * 사용자가 select 변경 시 onchange 가 exposure + hemiIntensity + dirLightIntensity
+ * 를 일괄 set → three-capability 의 변경 감지 핸들러가 즉시 갱신.
+ */
+const LIGHT_PRESETS: Record<string, { exposure: number; hemiIntensity: number; dirLightIntensity: number }> = {
+  dark: { exposure: 0.7, hemiIntensity: 2.0, dirLightIntensity: 1.0 },
+  medium: { exposure: 1.2, hemiIntensity: 4.0, dirLightIntensity: 2.0 },
+  bright: { exposure: 1.6, hemiIntensity: 6.0, dirLightIntensity: 3.0 }
+}
+
+const _origModelLayerOnchange = ModelLayer.prototype.onchange
+ModelLayer.prototype.onchange = function (after: any) {
+  if (after && Object.prototype.hasOwnProperty.call(after, 'lightPreset')) {
+    const preset = LIGHT_PRESETS[after.lightPreset as string]
+    if (preset) {
+      this.set({
+        exposure: preset.exposure,
+        hemiIntensity: preset.hemiIntensity,
+        dirLightIntensity: preset.dirLightIntensity
+      })
+    }
+  }
+  return _origModelLayerOnchange.call(this, after)
+}
+
 Object.defineProperty(RootContainer.prototype, 'equipmentLegendTheme', {
   get: function () {
     const { equipmentLegendName } = this.rootModel.state

package/src/static-container.ts

@@ -13,6 +13,11 @@ const NATURE = {
 
 @sceneComponent('container')
 export default class StaticContainer extends Container {
+  // things-scene 의 `declare const Container_base` 패턴이 base 인스턴스 타입의 accessor
+  // 정보를 object-type property 로 평탄화하여 TS2611 발생. operato-scene 은 position
+  // override 케이스가 없어 미발현, fmsim 만 해당. things-scene 측 mixin 타입 패턴이
+  // 개선되면 제거.
+  // @ts-expect-error TS2611
   get position() {
     return 'static'
   }

package/translations/en.json

@@ -50,6 +50,7 @@
   "label.conveyor-orientation": "Transfer Direction",
   "component.backdrop": "backdrop",
   "label.fit-to-board": "Fit to Board",
+  "label.see-through": "see-through",
   "label.east": "East",
   "label.west": "West",
   "label.north": "North",
@@ -61,5 +62,9 @@
   "label.rotation": "Rotation",
   "label.mirror": "Mirror",
   "label.copy-to-opposite": "Copy to opposite",
-  "label.copy-to-walls": "Copy to all walls"
+  "label.copy-to-walls": "Copy to all walls",
+  "label.light-preset": "light preset",
+  "label.dark": "dark",
+  "label.medium": "medium",
+  "label.bright": "bright"
 }

package/translations/ja.json

@@ -52,6 +52,7 @@
   "label.conveyor-orientation": "搬送方向",
   "component.backdrop": "バックドロップ",
   "label.fit-to-board": "ボードに合わせる",
+  "label.see-through": "透過",
   "label.east": "東壁",
   "label.west": "西壁",
   "label.north": "北壁",
@@ -63,5 +64,9 @@
   "label.rotation": "回転",
   "label.mirror": "鏡像",
   "label.copy-to-opposite": "反対側にコピー",
-  "label.copy-to-walls": "壁4面にコピー"
+  "label.copy-to-walls": "壁4面にコピー",
+  "label.light-preset": "照明プリセット",
+  "label.dark": "暗",
+  "label.medium": "中",
+  "label.bright": "明"
 }

package/translations/ko.json

@@ -53,6 +53,7 @@
   "label.conveyor-orientation": "이송방향",
   "component.backdrop": "배경",
   "label.fit-to-board": "보드에 맞춤",
+  "label.see-through": "투과",
   "label.east": "동측 벽",
   "label.west": "서측 벽",
   "label.north": "북측 벽",
@@ -64,5 +65,9 @@
   "label.rotation": "회전",
   "label.mirror": "거울상",
   "label.copy-to-opposite": "반대편에 복사",
-  "label.copy-to-walls": "벽 4면에 복사"
+  "label.copy-to-walls": "벽 4면에 복사",
+  "label.light-preset": "조명 프리셋",
+  "label.dark": "어두움",
+  "label.medium": "중간",
+  "label.bright": "밝음"
 }

package/translations/ms.json

@@ -52,6 +52,7 @@
   "label.conveyor-orientation": "Transfer Direction",
   "component.backdrop": "Backdrop",
   "label.fit-to-board": "Muat Papan",
+  "label.see-through": "tembus pandang",
   "label.east": "Timur",
   "label.west": "Barat",
   "label.north": "Utara",
@@ -63,5 +64,9 @@
   "label.rotation": "Putaran",
   "label.mirror": "Cermin",
   "label.copy-to-opposite": "Salin ke bertentangan",
-  "label.copy-to-walls": "Salin ke semua dinding"
+  "label.copy-to-walls": "Salin ke semua dinding",
+  "label.light-preset": "pratetapan cahaya",
+  "label.dark": "gelap",
+  "label.medium": "sederhana",
+  "label.bright": "cerah"
 }

package/translations/zh.json

@@ -52,6 +52,7 @@
   "label.conveyor-orientation": "输送方向",
   "component.backdrop": "背景",
   "label.fit-to-board": "适配画板",
+  "label.see-through": "透视",
   "label.east": "东墙",
   "label.west": "西墙",
   "label.north": "北墙",
@@ -63,5 +64,9 @@
   "label.rotation": "旋转",
   "label.mirror": "镜像",
   "label.copy-to-opposite": "复制到对面",
-  "label.copy-to-walls": "复制到4面墙"
+  "label.copy-to-walls": "复制到4面墙",
+  "label.light-preset": "灯光预设",
+  "label.dark": "昏暗",
+  "label.medium": "适中",
+  "label.bright": "明亮"
 }