@fmsim/machine 2.0.0-beta.61 → 2.0.0-beta.63

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "2.0.0-beta.61",
+  "version": "2.0.0-beta.63",
   "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.61",
+    "@fmsim/api": "^2.0.0-beta.62",
     "@hatiolab/things-scene": "^10.0.0-beta.1"
   },
   "devDependencies": {
@@ -55,5 +55,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "cba60c7300ddd5f4ac4f458db32fa0bd1dfa7055"
+  "gitHead": "eaeeb4d9db1886ca2aa6a191bc120184ea446006"
 }

package/src/factories/machine-3d.ts

@@ -79,17 +79,26 @@ class MCSRealObject3D extends RealObjectGroup {
   // width, height 절대값 (음수 값은 양수로 취급).
   // `resizable:false` 컴포넌트(예: Scanner)는 state.width/height 가 없고
   // bounds 만 있을 수 있으므로 bounds 를 fallback 으로 사용.
+  //
+  // `??` only catches null/undefined — a property-panel input that produced
+  // NaN would slip through and corrupt every downstream Math.* call. Use a
+  // finite check so NaN falls through to bounds → 10 like missing values do.
   protected get absSize(): { w: number; h: number } {
     const state = (this.component.state || {}) as any
     const bounds = (this.component.bounds || {}) as any
-    const width = state.width ?? bounds.width ?? 10
-    const height = state.height ?? bounds.height ?? 10
+    const width = pickFinite(state.width, bounds.width, 10)
+    const height = pickFinite(state.height, bounds.height, 10)
     return { w: Math.abs(width), h: Math.abs(height) }
   }
 
   get effectiveDepth(): number {
     const { depth } = this.component.state
-    if (depth) return depth
+    // Truthy `if (depth)` already rejected NaN/0/undefined, but be explicit
+    // so the intent (and the resolution chain) reads cleanly: only an
+    // explicit positive finite number wins; everything else → defaults.
+    if (typeof depth === 'number' && Number.isFinite(depth) && depth > 0) {
+      return depth
+    }
     if (this._config.defaultDepth) return this._config.defaultDepth
     const { w, h } = this.absSize
     return Math.min(w, h) * this._config.depthRatio
@@ -463,6 +472,20 @@ class MCSRealObject3D extends RealObjectGroup {
   }
 }
 
+// ── 헬퍼 ────────────────────────────────────────────────
+
+/**
+ * Returns the first argument that is a finite number. NaN slips past `??`
+ * (which only catches null/undefined), so without this a property-panel
+ * input producing NaN would corrupt absSize and cascade through Math.*.
+ */
+function pickFinite(...candidates: unknown[]): number {
+  for (const c of candidates) {
+    if (typeof c === 'number' && Number.isFinite(c)) return c
+  }
+  return 0
+}
+
 // ── 팩토리 등록 헬퍼 ─────────────────────────────────────
 
 function register(type: string, overrides: Partial<MCS3DConfig> = {}) {

package/src/mcs-machine.ts

@@ -70,6 +70,35 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
     return LEGEND_MACHINE
   }
 
+  /**
+   * In 2D, ignore `state.alpha`; preserve everything else.
+   *
+   * things-scene's base prerender (component-drawing.ts:31, 44) does:
+   *   const fade = (alpha || 1) - this._delta.fade
+   *   if (fade) context.globalAlpha = fade
+   *
+   * It *overwrites* `globalAlpha` (not multiplies), so the inherited
+   * parent alpha is also lost — that's a base-layer quirk we match the
+   * recovery for. Then at line 48 it applies editMode+hidden dimming
+   * with a *= 0.5.
+   *
+   * Our recovery:
+   *   1. Capture the inherited `globalAlpha` *before* super runs.
+   *   2. Let super do its work (transforms / shadow / dim flags).
+   *   3. Restore globalAlpha to inherited × editMode-hidden dim factor —
+   *      i.e., what super would have produced if our state.alpha were 1.
+   *
+   * 3D path is unaffected: 3D factories read `state.alpha` directly via
+   * their `updateAlpha()` implementations and continue to honor it (with
+   * per-config opacity fallback).
+   */
+  prerender(ctx: any) {
+    const inherited = ctx.globalAlpha
+    super.prerender(ctx)
+    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
+    ctx.globalAlpha = inherited * dim
+  }
+
   render(ctx) {
     var { round = 0, lineWidth } = this.state
     var { left, top, width, height } = this.bounds

package/src/mcs-unit.ts

@@ -49,6 +49,17 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
     return LEGEND_UNIT
   }
 
+  /**
+   * In 2D, ignore `state.alpha`; preserve inherited alpha + editMode-hidden dim.
+   * See MCSMachine.prerender for the full rationale.
+   */
+  prerender(ctx: any) {
+    const inherited = ctx.globalAlpha
+    super.prerender(ctx)
+    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
+    ctx.globalAlpha = inherited * dim
+  }
+
   contains(x, y) {
     var { left, top, width, height, lineWidth = 0 } = this.state
     var extend = lineWidth / 2