@fmsim/machine 2.0.0-beta.62 → 2.0.0-beta.64

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "2.0.0-beta.62",
+  "version": "2.0.0-beta.64",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -55,5 +55,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "f6f17ee84a9875c460df1383baf8d717b502ac43"
+  "gitHead": "5a69f5f54cea6183667429f6b7270d26a61ee893"
 }

package/src/carrier.ts

@@ -13,6 +13,20 @@ const NATURE: ComponentNature = {
   rotatable: false
 }
 
+/**
+ * Feature flag — keep status text (F / E / X) screen-axis-aligned even
+ * when the carrier (or its parent holder, or an in-flight reparent
+ * tween) is rotated. Counter-rotates ONLY the text; the polygon path
+ * still rotates with the carrier as before.
+ *
+ * ROLLBACK procedure (if customer decides to revert):
+ *   1. Flip this flag to `false`           — text rotates with carrier again.
+ *   2. Or delete this constant and the     — fully strip the feature: keep
+ *      `if (STATUS_TEXT_COUNTER_ROTATE)`     only the `else` branch in
+ *      branch in `render()`.                 `render()` (the original code).
+ */
+const STATUS_TEXT_COUNTER_ROTATE = true
+
 @sceneComponent('Carrier')
 export default class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {
   static get nature() {
@@ -284,7 +298,24 @@ export default class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {
         ctx.textAlign = 'center'
         ctx.textBaseline = 'middle'
 
-        ctx.fillText(text, cx - width / 8, cy + height / 8)
+        if (STATUS_TEXT_COUNTER_ROTATE) {
+          // Counter-rotate so the status label stays screen-axis-aligned
+          // even when the carrier (or its parent holder, or an in-flight
+          // reparent transition) is rotated. Reading the current cumulative
+          // rotation from the canvas transform handles all sources of
+          // rotation uniformly (state.rotation, parent transforms,
+          // animation tweens) — no need to enumerate them.
+          const m = ctx.getTransform()
+          const cumulRotation = Math.atan2(m.b, m.a)
+          ctx.save()
+          ctx.translate(cx, cy)
+          ctx.rotate(-cumulRotation)
+          ctx.fillText(text, -width / 8, height / 8)
+          ctx.restore()
+        } else {
+          // Original — text rotates with the carrier.
+          ctx.fillText(text, cx - width / 8, cy + height / 8)
+        }
       }
     }
   }

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

package/src/templates/backdrop.ts

@@ -0,0 +1,30 @@
+const icon = new URL('../../icons/backdrop.png', import.meta.url).href
+
+export default {
+  type: 'backdrop',
+  description: '3D scene backdrop — 6-sided envelope (4 walls + floor + ceiling)',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'backdrop',
+    top: 0,
+    left: 0,
+    width: 3000,
+    height: 2400,
+    // depth seeded on creation as min(width, height) by Backdrop's
+    // `_syncFromRoot(seedDepth=true)`. Editable via property panel
+    // afterward — board-resize syncs won't override it.
+    fitToBoard: true,
+    alpha: 1,
+    // 6면 합성 상태. 비어있으면 backdrop 컴포넌트의 default 가 적용됨
+    // (벽 4면 = #dde2e8/0.35, 바닥 = #9c9c9c/1.0, 천장 = #e8e8ec/1.0).
+    faces: {
+      east: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      west: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      north: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      south: { fillStyle: '#dde2e8', visible: true, alpha: 0.35 },
+      floor: { fillStyle: '#9c9c9c', visible: true, alpha: 1.0 },
+      ceiling: { fillStyle: '#e8e8ec', visible: true, alpha: 1.0 }
+    }
+  }
+}

package/src/templates/decal.ts

@@ -0,0 +1,21 @@
+const icon = new URL('../../icons/decal.png', import.meta.url).href
+
+export default {
+  type: 'decal',
+  description: 'flat surface decal (3D-only) — floor zone paint, path lanes, signage',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'decal',
+    top: 100,
+    left: 100,
+    width: 200,
+    height: 200,
+    zPos: 0,
+    depth: 0,
+    fillStyle: '#cccccc',
+    strokeStyle: '#999999',
+    lineWidth: 1,
+    alpha: 1
+  }
+}

package/src/templates/index.ts

@@ -21,6 +21,8 @@ import Scanner from './scanner'
 import Node from './node'
 import DataSubscription from './data-subscription'
 import FloatingContainer from './floating-container'
+import Decal from './decal'
+import Backdrop from './backdrop'
 
 export default [
   StockerCapacityBar,
@@ -45,5 +47,7 @@ export default [
   Scanner,
   Node,
   FloatingContainer,
-  DataSubscription
+  DataSubscription,
+  Decal,
+  Backdrop
 ]

package/translations/en.json

@@ -47,5 +47,19 @@
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
   "label.battery-rate-legend-name": "battery rate",
-  "label.conveyor-orientation": "Transfer Direction"
+  "label.conveyor-orientation": "Transfer Direction",
+  "component.backdrop": "backdrop",
+  "label.fit-to-board": "Fit to Board",
+  "label.east": "East",
+  "label.west": "West",
+  "label.north": "North",
+  "label.south": "South",
+  "label.floor": "Floor",
+  "label.ceiling": "Ceiling",
+  "label.visible": "Visible",
+  "label.alpha": "Alpha",
+  "label.rotation": "Rotation",
+  "label.mirror": "Mirror",
+  "label.copy-to-opposite": "Copy to opposite",
+  "label.copy-to-walls": "Copy to all walls"
 }

package/translations/ja.json

@@ -49,5 +49,19 @@
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
   "label.battery-rate-legend-name": "battery rate",
-  "label.conveyor-orientation": "搬送方向"
+  "label.conveyor-orientation": "搬送方向",
+  "component.backdrop": "バックドロップ",
+  "label.fit-to-board": "ボードに合わせる",
+  "label.east": "東壁",
+  "label.west": "西壁",
+  "label.north": "北壁",
+  "label.south": "南壁",
+  "label.floor": "床",
+  "label.ceiling": "天井",
+  "label.visible": "表示",
+  "label.alpha": "透明度",
+  "label.rotation": "回転",
+  "label.mirror": "鏡像",
+  "label.copy-to-opposite": "反対側にコピー",
+  "label.copy-to-walls": "壁4面にコピー"
 }

package/translations/ko.json

@@ -50,5 +50,19 @@
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
   "label.battery-rate-legend-name": "배터리 잔량",
-  "label.conveyor-orientation": "이송방향"
+  "label.conveyor-orientation": "이송방향",
+  "component.backdrop": "배경",
+  "label.fit-to-board": "보드에 맞춤",
+  "label.east": "동측 벽",
+  "label.west": "서측 벽",
+  "label.north": "북측 벽",
+  "label.south": "남측 벽",
+  "label.floor": "바닥",
+  "label.ceiling": "천장",
+  "label.visible": "표시",
+  "label.alpha": "투명도",
+  "label.rotation": "회전",
+  "label.mirror": "거울상",
+  "label.copy-to-opposite": "반대편에 복사",
+  "label.copy-to-walls": "벽 4면에 복사"
 }

package/translations/ms.json

@@ -49,5 +49,19 @@
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
   "label.battery-rate-legend-name": "battery rate",
-  "label.conveyor-orientation": "Transfer Direction"
+  "label.conveyor-orientation": "Transfer Direction",
+  "component.backdrop": "Backdrop",
+  "label.fit-to-board": "Muat Papan",
+  "label.east": "Timur",
+  "label.west": "Barat",
+  "label.north": "Utara",
+  "label.south": "Selatan",
+  "label.floor": "Lantai",
+  "label.ceiling": "Siling",
+  "label.visible": "Kelihatan",
+  "label.alpha": "Alfa",
+  "label.rotation": "Putaran",
+  "label.mirror": "Cermin",
+  "label.copy-to-opposite": "Salin ke bertentangan",
+  "label.copy-to-walls": "Salin ke semua dinding"
 }

package/translations/zh.json

@@ -49,5 +49,19 @@
   "label.nodes": "nodes",
   "label.vehicle-animation": "vehicle animation",
   "label.battery-rate-legend-name": "battery rate",
-  "label.conveyor-orientation": "输送方向"
+  "label.conveyor-orientation": "输送方向",
+  "component.backdrop": "背景",
+  "label.fit-to-board": "适配画板",
+  "label.east": "东墙",
+  "label.west": "西墙",
+  "label.north": "北墙",
+  "label.south": "南墙",
+  "label.floor": "地板",
+  "label.ceiling": "天花板",
+  "label.visible": "显示",
+  "label.alpha": "透明度",
+  "label.rotation": "旋转",
+  "label.mirror": "镜像",
+  "label.copy-to-opposite": "复制到对面",
+  "label.copy-to-walls": "复制到4面墙"
 }