@fmsim/machine 2.0.0-beta.99 → 2.0.1

package/src/mcs-machine.ts

@@ -84,32 +84,13 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
   }
 
   /**
-   * 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).
+   * 2D 에서는 `state.alpha`(3D material 전용)를 무시한다. hidden/모델링 dim 흐림은 **코어(draw)가
+   * 일괄 처리**하므로 여기서 손대지 않는다 (component-drawing.ts draw 가 prerender 직후 faint 적용).
+   * fade 애니메이션은 보존. 3D 는 factory `updateAlpha()` 가 state.alpha 를 별도로 존중.
    */
   prerender(ctx: any) {
-    const inherited = ctx.globalAlpha
     super.prerender(ctx)
-    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
-    ctx.globalAlpha = inherited * dim
+    ctx.globalAlpha = 1 - this._delta.fade
   }
 
   render(ctx) {

package/src/mcs-unit.ts

@@ -62,14 +62,11 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
   }
 
   /**
-   * In 2D, ignore `state.alpha`; preserve inherited alpha + editMode-hidden dim.
-   * See MCSMachine.prerender for the full rationale.
+   * 2D 에서는 state.alpha 무시. hidden/모델링 dim 흐림은 코어(draw)가 일괄 처리 (MCSMachine 동일).
    */
   prerender(ctx: any) {
-    const inherited = ctx.globalAlpha
     super.prerender(ctx)
-    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
-    ctx.globalAlpha = inherited * dim
+    ctx.globalAlpha = 1 - this._delta.fade
   }
 
   contains(x, y) {

package/src/mcs-vehicle.ts

@@ -110,7 +110,9 @@ export default class MCSVehicle extends MCSCarrierHolder {
 
     const afterNode = findNode(this, NodeId, NodeMachine)
     if (!afterNode) {
-      console.warn(`Node not found. NodeId: ${NodeId}, NodeMachine: ${NodeMachine}`)
+      // 보드는 전체 노드의 부분 뷰 — 모든 노드를 그리지 않는다. 위치 NODEID 가 이 보드에
+      // 없는 노드를 가리키는 건 오류가 아니라 정상(그 노드는 이 보드에 미표시)이므로,
+      // 경고 없이 조용히 배치를 생략한다. (데이터 갱신마다 도는 hot path — 거짓 경보 방지.)
       return
     }
 

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

@@ -217,6 +217,7 @@ Object.defineProperty(ModelLayer.prototype, 'nature', {
           type: 'legend',
           label: '',
           name: 'MOOD',
+          requires3d: true,
           property: {
             label: 'MOOD'
           }
@@ -225,6 +226,7 @@ Object.defineProperty(ModelLayer.prototype, 'nature', {
           type: 'select',
           label: 'light-preset',
           name: 'lightPreset',
+          requires3d: true,
           property: {
             options: ['dark', 'medium', 'bright']
           }
@@ -367,8 +369,9 @@ RootContainer.prototype._refreshStockerGauges = function () {
       if (type === 'STOCKER') {
         // 3D 게이지는 스토커 자신의 real-object 가 그린다 → 재빌드 (2D 모드면 _realObject 없음)
         c._realObject?.update?.()
-      } else if (type === 'StockerCapacityBar' || type === 'MCSGaugeCapacityBar') {
-        // 2D 게이지는 자식 컴포넌트가 그린다 → 리드로우
+      } else if (type === 'StockerCapacityBar' || type === 'MCSGaugeCapacityBar' || type === 'ZoneCapacityBar') {
+        // 2D 게이지(스토커·존)는 자식 컴포넌트가 그린다 → 리드로우.
+        // 존 게이지도 스토커 게이지와 같은 stockerGaugeMode 스위치로 함께 전환된다.
         c.invalidate?.()
       }
       walk(c)

package/src/stocker-capacity-bar.ts

@@ -1,138 +1,32 @@
-import {
-  Component,
-  ComponentNature,
-  POSITION,
-  Properties,
-  RectPath,
-  Shape,
-  sceneComponent
-} from '@hatiolab/things-scene'
-import { themesColorRange } from '@fmsim/api'
+import { ComponentNature, RectPath, Shape, sceneComponent } from '@hatiolab/things-scene'
 import { MCSStatusMixin } from './features/mcs-status-mixin'
 import { LEGEND_CAPACITY, Legend } from './features/mcs-status-default'
-import { safeRound } from './utils/safe-round'
-import { getValueOnRanges } from './utils/get-value-on-ranges'
 import { ParentObjectMixin, ParentObjectMixinProperties } from './features/parent-object-mixin'
-import { carrierSegments, abnormalSegments, GaugeSegment } from './utils/stocker-gauge'
+import { CapacityGaugeMixin, CapacityGaugeMixinProperties } from './features/capacity-gauge-mixin'
 
 /**
  * 스토커 게이지 (통합).
  *
- * 하나의 컴포넌트가 mode 에 따라 3가지 게이지를 표현한다:
- *  - 'capacity'  : 용량 사용률(usage%) 채움 게이지 + high/low watermark (기본)
- *  - 'carrier'   : 캐리어 상태비율 세그먼트 (Full / Empty / EmptyEmpty)
- *  - 'abnormal'  : 캐리어 정상/비정상 비율 세그먼트 (Normal / Abnormal)
+ * mode 에 따라 capacity / carrier / abnormal 3가지 게이지를 표현한다. 그리는 규칙은
+ * CapacityGaugeMixin 에 있으며 ZoneCapacityBar 와 완전히 공유한다(단일 소스). 스토커는
+ * STOCKER 내부에 놓이는 Shape 로, 부모 STOCKER 가 데이터를 push 한다(isIdentifiable=false).
  *
- * mode 소스: root.stockerGaugeMode (기본 'capacity').
- * RootContainer 의 **런타임 전용 transient 속성** — 모델에 저장하지 않고 항상 'capacity'
- * 로 시작하며 실행 중 동적으로만 변경된다(root-container-override.ts 정의). 3D 표현
- * (machine-3d.ts buildGauge)과 동일 소스라 2D/3D 게이지가 항상 일치한다.
- *
- * 데이터 필드(2D 기준, canonical):
- *  - capacity : CURRENTCAPACITY / MAXCAPACITY / HIGHWATERMARK / LOWWATERMARK / FULLUP
- *  - carrier  : CARRIER_FULL / CARRIER_EMPTY / CARRIER_EMPTY_EMPTY
- *  - abnormal : CARRIER_NORMAL / CARRIER_ABNORMAL
+ * mode 소스: root.stockerGaugeMode. 3D(machine-3d buildGauge)와 동일 소스라 2D/3D 가 일치한다.
  */
 
 const NATURE: ComponentNature = {
   mutable: false,
   resizable: true,
   rotatable: true,
-  properties: [
-    ...ParentObjectMixinProperties,
-    {
-      type: 'select',
-      label: 'legend-name',
-      name: 'legendName',
-      property: {
-        options: themesColorRange
-      }
-    },
-    {
-      type: 'number',
-      name: 'currentUsage',
-      label: 'current-usage'
-    },
-    {
-      type: 'number',
-      name: 'highWatermark',
-      label: 'high-watermark'
-    },
-    {
-      type: 'number',
-      name: 'lowWatermark',
-      label: 'low-watermark'
-    },
-    {
-      type: 'number',
-      name: 'maxCapacity',
-      label: 'max-capacity'
-    },
-    {
-      type: 'boolean',
-      name: 'fullup',
-      label: 'fullup'
-    },
-    {
-      type: 'number',
-      name: 'carrierFull',
-      label: 'carrier-full'
-    },
-    {
-      type: 'number',
-      name: 'carrierEmpty',
-      label: 'carrier-empty'
-    },
-    {
-      type: 'number',
-      name: 'carrierEmptyEmpty',
-      label: 'carrier-empty-empty'
-    },
-    {
-      type: 'number',
-      name: 'carrierNormal',
-      label: 'carrier-normal'
-    },
-    {
-      type: 'number',
-      name: 'carrierAbnormal',
-      label: 'carrier-abnormal'
-    },
-    {
-      type: 'number',
-      label: 'round',
-      name: 'round',
-      property: {
-        min: 0
-      }
-    },
-    {
-      type: 'hidden',
-      name: 'usage',
-      label: 'usage'
-    }
-  ],
+  properties: [...ParentObjectMixinProperties, ...CapacityGaugeMixinProperties],
   'value-property': 'usage'
 }
 
-var controlHandler = {
-  ondragmove: function (point: POSITION, index: number, component: Component) {
-    var { left, top, width, height } = component.model
-
-    var transcoorded = component.transcoordP2S(point.x, point.y)
-    var round = ((transcoorded.x - left) / (width / 2)) * 100
-
-    round = safeRound(round, width, height)
-
-    component.set({
-      round
-    })
-  }
-}
-
 @sceneComponent('StockerCapacityBar')
 @sceneComponent('MCSGaugeCapacityBar')
-export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin(RectPath(Shape))) {
+export default class StockerCapacityBar extends CapacityGaugeMixin(
+  ParentObjectMixin(MCSStatusMixin(RectPath(Shape)))
+) {
   static get nature() {
     return NATURE
   }
@@ -142,377 +36,22 @@ export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin
     return ['STOCKER']
   }
 
-  /** 게이지 모드: RootContainer 런타임 transient 속성. 3D(machine-3d) 와 동일 소스. */
-  get gaugeMode(): string {
-    return (this.root as any)?.stockerGaugeMode || 'capacity'
-  }
-
-  get controls() {
-    var { left, top, width, round, height } = this.state
-    round = round == undefined ? 0 : safeRound(round, width, height)
-
-    return [
-      {
-        x: left + (width / 2) * (round / 100),
-        y: top,
-        handler: controlHandler
-      }
-    ]
-  }
-
+  /** 게이지는 자체 id 로 매핑하지 않는다 — 부모 STOCKER 가 데이터를 push. */
   isIdentifiable() {
     return false
   }
 
-  getTheme() {
-    const { legendName } = this.state
-
-    if (legendName) {
-      return (this.root as any)?.style?.[legendName]
-    }
-  }
-
-  get legend(): Legend {
-    return this.getTheme() || this.getLegendFallback()
-  }
-
-  getLegendFallback() {
+  getLegendFallback(): Legend {
     return (this.root as any).stockerCapacityLegendTheme || LEGEND_CAPACITY
   }
 
-  get statusColor() {
-    const { fullup } = this.state
-    return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
-  }
-
-  get text() {
-    // usage% 값은 capacity 모드에서만 표시. carrier/abnormal 은 세그먼트별 자체 라벨을 그리므로
-    // base 의 value 텍스트(value-property=usage)를 억제한다.
-    if (this.gaugeMode !== 'capacity') {
-      return ''
-    }
-    return this.usage + '%'
-  }
-
-  render(context: CanvasRenderingContext2D) {
-    const mode = this.gaugeMode
-
-    if (mode === 'carrier' || mode === 'abnormal') {
-      this.renderSegmentGauge(context, this.segments(mode))
-      return
-    }
-
-    // capacity (기본)
-    const { width, height } = this.bounds
-    if (width >= height) {
-      this.renderLandscape(context)
-    } else {
-      this.renderPortrait(context)
-    }
-  }
-
   /**
    * Shape.postrender 의 drawFill/drawStroke 를 건너뛴다.
-   * 각 모드 render 가 자체 배경(fillStyle)·외곽선(strokeStyle)을 이미 그리므로, base 가
-   * fillStyle 로 게이지 전체를 다시 덮어(각 모드 표현이 사라지는) 것을 방지한다.
+   * render 가 자체 배경(fillStyle)·외곽선(strokeStyle)을 이미 그리므로, base 가
+   * fillStyle 로 게이지 전체를 다시 덮는(각 모드 표현이 사라지는) 것을 방지한다.
    * 값 텍스트(drawText)는 Component.postrender 와 동일하게 유지한다.
    */
   postrender(context: CanvasRenderingContext2D) {
-    this.drawText(context)
-  }
-
-  /**
-   * carrier/abnormal mode 의 세그먼트 목록 (공유 유틸 = 3D 와 동일 계산).
-   * 배열 순서 = portrait 아래→위 / landscape 왼→오.
-   */
-  segments(mode: string): GaugeSegment[] {
-    if (mode === 'abnormal') {
-      const { carrierNormal = 0, carrierAbnormal = 0 } = this.state
-      return abnormalSegments(carrierNormal, carrierAbnormal)
-    }
-    const { carrierFull = 0, carrierEmpty = 0, carrierEmptyEmpty = 0 } = this.state
-    return carrierSegments(carrierFull, carrierEmpty, carrierEmptyEmpty)
-  }
-
-  /** 세그먼트 게이지 렌더 (carrier/abnormal 공통). bounds 방향으로 landscape/portrait 자동. */
-  renderSegmentGauge(context: CanvasRenderingContext2D, segments: GaugeSegment[]) {
-    const { left, top, width, height } = this.bounds
-    const { lineWidth, strokeStyle, round, fillStyle = 'white' } = this.state
-    const landscape = width >= height
-
-    context.save()
-    context.translate(left, top)
-
-    // background
-    context.beginPath()
-    context.fillStyle = fillStyle
-    context.roundRect(0, 0, width, height, round)
-    context.fill()
-    context.clip()
-
-    if (landscape) {
-      // 왼→오
-      let x = 0
-      for (const seg of segments) {
-        const segWidth = width * seg.ratio
-        if (segWidth <= 0) continue
-
-        context.beginPath()
-        context.fillStyle = seg.color
-        context.rect(x, 0, segWidth, height)
-        context.fill()
-
-        this._drawSegmentLabel(context, seg, x, 0, segWidth, height)
-        x += segWidth
-      }
-    } else {
-      // 아래→위 (배열 첫 세그먼트가 바닥)
-      let y = height
-      for (const seg of segments) {
-        const segHeight = height * seg.ratio
-        if (segHeight <= 0) continue
-
-        y -= segHeight
-
-        context.beginPath()
-        context.fillStyle = seg.color
-        context.rect(0, y, width, segHeight)
-        context.fill()
-
-        this._drawSegmentLabel(context, seg, 0, y, width, segHeight)
-      }
-    }
-
-    // outline
-    context.beginPath()
-    context.setLineDash([])
-    context.strokeStyle = strokeStyle
-    context.lineWidth = lineWidth
-    context.roundRect(0, 0, width, height, round)
-    context.stroke()
-
-    context.translate(-left, -top)
-    context.restore()
-  }
-
-  private _drawSegmentLabel(
-    context: CanvasRenderingContext2D,
-    seg: GaugeSegment,
-    x: number,
-    y: number,
-    w: number,
-    h: number
-  ) {
-    // 이름 라벨(Full/Empty/Abnormal…)은 그리지 않는다. 각 세그먼트 영역 중심에 숫자(%)만 표시.
-    // value 텍스트와 동일하게 state.fontSize 를 따른다 (기본 15). 속성 하나로 함께 조절.
-    const fontSize = this.state.fontSize || 15
-    context.font = `bold ${fontSize}px sans-serif`
-
-    // 공간에 따라 단계적 축소: 넉넉하면 '값%', 좁으면 '%' 떼고 값만, 더 좁으면 생략.
-    const value = `${Math.round(seg.ratio * 100)}`
-    const fits = (t: string) => fontSize <= h && context.measureText(t).width <= w
-
-    let text: string | null = null
-    if (fits(`${value}%`)) {
-      text = `${value}%`
-    } else if (fits(value)) {
-      text = value
-    }
-    if (text === null) {
-      return
-    }
-
-    context.fillStyle = '#333'
-    context.textAlign = 'center'
-    context.textBaseline = 'middle'
-    context.fillText(text, x + w / 2, y + h / 2)
-  }
-
-  renderLandscape(context: CanvasRenderingContext2D) {
-    const { left, top, width, height } = this.bounds
-    const { highWatermark, lowWatermark, lineWidth, strokeStyle, round, fillStyle = 'white' } = this.state
-
-    context.save()
-    context.translate(left, top)
-
-    // gauge background
-    context.beginPath()
-
-    context.fillStyle = fillStyle
-    context.roundRect(0, 0, width, height, round)
-
-    context.fill()
-
-    context.clip()
-
-    // gauge foreground
-    context.beginPath()
-
-    context.fillStyle = this.statusColor!
-
-    context.rect(0, 0, (width / 100) * this.usage, height)
-    context.fill()
-
-    // high-watermark level
-
-    if (highWatermark && highWatermark > 0 && highWatermark < 100) {
-      context.beginPath()
-
-      context.strokeStyle = 'black'
-      context.lineWidth = 1
-      context.setLineDash([3])
-
-      const x = (width / 100) * highWatermark
-      context.moveTo(x, 0)
-      context.lineTo(x, height)
-
-      context.stroke()
-    }
-
-    // low-watermark level
-
-    if (lowWatermark && lowWatermark > 0 && lowWatermark < 100) {
-      context.beginPath()
-
-      context.strokeStyle = 'black'
-      context.lineWidth = 1
-      context.setLineDash([3])
-
-      const x = (width / 100) * lowWatermark
-      context.moveTo(x, 0)
-      context.lineTo(x, height)
-
-      context.stroke()
-    }
-
-    // gauge outline
-    context.beginPath()
-
-    context.setLineDash([])
-    context.strokeStyle = strokeStyle
-    context.lineWidth = lineWidth
-    context.roundRect(0, 0, width, height, round)
-    context.stroke()
-
-    context.beginPath()
-
-    context.translate(-left, -top)
-    context.restore()
-  }
-
-  renderPortrait(context: CanvasRenderingContext2D) {
-    const { left, top, width, height } = this.bounds
-    const { highWatermark, lowWatermark, lineWidth, strokeStyle, round, fillStyle = 'white' } = this.state
-
-    context.save()
-    context.translate(left, top)
-
-    // gauge background
-    context.beginPath()
-
-    context.fillStyle = fillStyle
-    context.roundRect(0, 0, width, height, round)
-
-    context.fill()
-
-    context.clip()
-
-    // gauge foreground
-    context.beginPath()
-
-    context.fillStyle = this.statusColor!
-
-    context.rect(0, height - (height / 100) * this.usage, width, (height / 100) * this.usage)
-    context.fill()
-
-    // high-watermark level
-
-    if (highWatermark && highWatermark > 0 && highWatermark < 100) {
-      context.beginPath()
-
-      context.strokeStyle = 'black'
-      context.lineWidth = 1
-      context.setLineDash([3])
-
-      const y = height - (height / 100) * highWatermark
-      context.moveTo(0, y)
-      context.lineTo(width, y)
-
-      context.stroke()
-    }
-
-    // low-watermark level
-
-    if (lowWatermark && lowWatermark > 0 && lowWatermark < 100) {
-      context.beginPath()
-
-      context.strokeStyle = 'black'
-      context.lineWidth = 1
-      context.setLineDash([3])
-
-      const y = height - (height / 100) * lowWatermark
-      context.moveTo(0, y)
-      context.lineTo(width, y)
-
-      context.stroke()
-    }
-
-    // gauge outline
-    context.beginPath()
-
-    context.setLineDash([])
-    context.strokeStyle = strokeStyle
-    context.lineWidth = lineWidth
-    context.roundRect(0, 0, width, height, round)
-    context.stroke()
-
-    context.beginPath()
-
-    context.translate(-left, -top)
-    context.restore()
-  }
-
-  get usage() {
-    const { currentUsage = 0, maxCapacity = 100 } = this.state
-    return Math.round((currentUsage / maxCapacity) * 100)
-  }
-
-  set usage(usage: number) {
-    // intentionally have done nothing
-  }
-
-  onchangeData(after: Record<string, any>, before: Record<string, any>): void {
-    const data = this.data && typeof this.data == 'object' ? this.data : {}
-    const {
-      CURRENTCAPACITY = 0,
-      MAXCAPACITY = 100,
-      HIGHWATERMARK = 100,
-      LOWWATERMARK = 0,
-      FULLUP = 'F',
-      CARRIER_FULL = 0,
-      CARRIER_EMPTY = 0,
-      CARRIER_EMPTY_EMPTY = 0,
-      CARRIER_NORMAL = 0,
-      CARRIER_ABNORMAL = 0
-    } = data
-
-    const currentUsage = Number(CURRENTCAPACITY) || 0
-    const maxCapacity = Number(MAXCAPACITY) || 100
-    const highWatermark = Number(HIGHWATERMARK) || 100
-    const lowWatermark = Number(LOWWATERMARK) || 0
-
-    this.setState({
-      currentUsage,
-      maxCapacity,
-      highWatermark,
-      lowWatermark,
-      fullup: FULLUP == 'T',
-      usage: Math.round((currentUsage / maxCapacity) * 100),
-      carrierFull: Number(CARRIER_FULL) || 0,
-      carrierEmpty: Number(CARRIER_EMPTY) || 0,
-      carrierEmptyEmpty: Number(CARRIER_EMPTY_EMPTY) || 0,
-      carrierNormal: Number(CARRIER_NORMAL) || 0,
-      carrierAbnormal: Number(CARRIER_ABNORMAL) || 0
-    })
+    ;(this as any).drawText(context)
   }
 }

package/src/stocker.ts

@@ -5,7 +5,35 @@ const NATURE: ComponentNature = {
   mutable: false,
   resizable: true,
   rotatable: true,
-  properties: [...MCSTransport.properties]
+  properties: [
+    ...MCSTransport.properties,
+    /* 이 스토커의 *내부 좌표계* 규약 — 외부 시스템이 보내는 X/Y 를 footprint 의 어느
+     * 축·어느 방향에 대응시킬지 정한다(크레인 위치 데이터 CRANEPOSITION 등이 이를 따른다).
+     * 미설정이면 종전 폴백(긴 변 = X축, 원점 = 좌상단). 모두 *로컬 프레임* 기준이라
+     * 스토커 회전(rotation)과는 무관하다. Z(높이)는 바닥 기준이 물리적으로 고정이라 설정 없음. */
+    {
+      type: 'select',
+      label: 'coord-axis-x',
+      name: 'coordAxisX',
+      property: {
+        options: [
+          { display: 'auto (longer side)', value: '' },
+          { display: 'width', value: 'width' },
+          { display: 'height', value: 'height' }
+        ]
+      }
+    },
+    {
+      type: 'checkbox',
+      label: 'coord-invert-x',
+      name: 'coordInvertX'
+    },
+    {
+      type: 'checkbox',
+      label: 'coord-invert-y',
+      name: 'coordInvertY'
+    }
+  ]
 }
 
 // const capacity = { ko: 'Capacity', en: 'Capacity', zh_CN: '容量' }