@fmsim/machine 3.0.0-beta.2 → 3.0.0-beta.4

package/jest.config.js

@@ -4,7 +4,7 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
   transform: {
     '^.+\\.tsx?$': 'babel-jest',
-    // 공통 계산(@hatiolab/figure-model)과 things-scene 의 node 판(공통 아이템 믹스인)은 ESM 이라 babel 로 바꿔 읽는다
+    // 공통 계산(@hatiolab/figure-model)과 things-scene 의 node 버전(공통 아이템 믹스인)은 ESM 이라 babel 로 바꿔 읽는다
     '^.+\\.m?js$': 'babel-jest'
   },
   transformIgnorePatterns: ['/node_modules/(?!@hatiolab/(figure-model|things-scene)/)'],

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@fmsim/api": "^3.0.0-beta.2",
-    "@fmsim/figure-capabilities": "^3.0.0-beta.2",
+    "@fmsim/figure-capabilities": "^3.0.0-beta.4",
     "@hatiolab/figure-model": "^0.12.0",
     "@hatiolab/things-scene": "^10.1.90",
     "@operato/slot-layout-editor": "^10.29.33"
@@ -58,5 +58,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "23b7fedf8bb2b70b1150b963bd0f75d77a26052d"
+  "gitHead": "95b704a73e326b7be3bbd1ef3db5ee31f7ef7184"
 }

package/src/features/vehicle-travel.ts

@@ -0,0 +1,82 @@
+import type Node from '../node'
+
+/** The node a vehicle's data names: a `Node` of the board with that id and node machine. */
+function findNode(vehicle: any, nodeId: string, nodeMachine: string): Node | null {
+  if (!nodeId || !nodeMachine) {
+    return null
+  }
+
+  const nodes = (vehicle.root.findAllById?.(nodeId) || []).filter((node: any) => node.state.type == 'Node') as Node[]
+
+  return nodes.find((node: Node) => node.nodeMachine === nodeMachine) ?? null
+}
+
+/**
+ * A vehicle's travel between the nodes of the board (`fmsim.Vehicle`, ADR-0167 decision 18): it goes to the centre of
+ * the Node its NODEID and NODEMACHINE name, turned the way it came, or -- the board's vehicle animation on -- it is drawn
+ * on the way (waypoint). One mixin worn by fmsim's own AGV and OHT and by a figure alike. A figure's front need not be
+ * its travel's: `vehicleHeading` (degrees) turns it, 0 for fmsim's own.
+ */
+export function VehicleTravel<T extends new (...args: any[]) => any>(Base: T) {
+  return class extends Base {
+    _lastWaypoint: { NodeId: string; NodeMachine: string } | null = null
+
+    /** The angle, in radians, the vehicle's front makes with the way it travels. */
+    get travelHeading(): number {
+      return ((Number((this as any).state?.vehicleHeading) || 0) * Math.PI) / 180
+    }
+
+    onchangeData(after: Record<string, any>, before: Record<string, any>): void {
+      super.onchangeData(after, before)
+
+      const { NODEID: beforeNodeId, NODEMACHINE: beforeNodeMachine } = before.data || {}
+      const { NODEID: NodeId, NODEMACHINE: NodeMachine } = after.data || {}
+
+      if (
+        NodeId === undefined ||
+        NodeMachine === undefined ||
+        (beforeNodeId === NodeId && beforeNodeMachine === NodeMachine) ||
+        (this._lastWaypoint && this._lastWaypoint.NodeId === NodeId && this._lastWaypoint.NodeMachine === NodeMachine)
+      ) {
+        return // not changed
+      }
+
+      const afterNode = findNode(this, NodeId, NodeMachine)
+      if (!afterNode) {
+        // 보드는 전체 노드의 부분 뷰 — 모든 노드를 그리지 않는다. 위치 NODEID 가 이 보드에
+        // 없는 노드를 가리키는 건 오류가 아니라 정상(그 노드는 이 보드에 미표시)이므로,
+        // 경고 없이 조용히 배치를 생략한다. (데이터 갱신마다 도는 hot path — 거짓 경보 방지.)
+        return
+      }
+
+      const beforeNode = this._lastWaypoint ? findNode(this, this._lastWaypoint.NodeId, this._lastWaypoint.NodeMachine) : afterNode
+
+      // 실제 존재하는 노드 중 가장 최근에 이동한 노드
+      this._lastWaypoint = { NodeId, NodeMachine }
+
+      if ((this as any).root.vehicleAnimation) {
+        ;(this as any).trigger('waypoint', {
+          from: beforeNode || afterNode,
+          to: afterNode,
+          duration: 5000
+        })
+      } else if (beforeNode) {
+        const fromCenter = beforeNode.center
+        const toCenter = afterNode.center
+
+        const { x: startX, y: startY } = beforeNode.transcoordS2T(fromCenter.x, fromCenter.y)
+        const { x: endX, y: endY } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
+
+        const theta = Math.atan2(endY - startY, endX - startX) + Math.PI / 2
+
+        ;(this as any).location = { x: endX, y: endY }
+        ;(this as any).setState('rotation', theta + this.travelHeading)
+      } else {
+        // beforeNode 없음: afterNode 위치로 즉시 이동
+        const toCenter = afterNode.center
+        const { x, y } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
+        ;(this as any).location = { x, y }
+      }
+    }
+  }
+}

package/src/mcs-carrier-holder.ts

@@ -227,10 +227,10 @@ export function CarrierHolder<T extends new (...args: any[]) => any>(Base: T) {
     /**
      * Where a holder's carriers rest, in coordinates above the holder's bottom, and whether they stand on it or hang from
      * it: on the transport surface by default (fmsim v2). A Port, Shelf or Shuttle holds them at its bottom; an OHT hangs
-     * them below.
+     * them below. A figure holder says it by its `carrierMount` (ADR-0167 decision 18).
      */
     get carrierRest(): { height: number; mount: 'ON' | 'HANG' } {
-      return { height: 30, mount: 'ON' }
+      return (this as any).state?.carrierMount === 'HANG' ? { height: 0, mount: 'HANG' } : { height: 30, mount: 'ON' }
     }
 
     /** The pile, and the exception area beside the holder's +X edge. Frames in mm on the holder's own anchor (its bottom) */
@@ -343,4 +343,7 @@ function colourAndEffect(legend: Record<string, unknown>): Record<string, unknow
 }
 
 registerFigureLegendResolver(carrierHolderLegend)
-registerFigureCapability({ ...CARRIER_HOLDER, properties: CARRIER_HOLDER_PROPERTIES as never }, base => CarrierHolder(base) as never)
+registerFigureCapability(
+  { ...CARRIER_HOLDER, properties: carrierHolderProperties({ legends: themesColorMap, animations: themesAnimationMap, mount: true }) as never },
+  base => CarrierHolder(base) as never
+)

package/src/mcs-vehicle.ts

@@ -1,25 +1,15 @@
+import { registerFigureCapability } from '@hatiolab/things-scene'
+import { VEHICLE } from '@fmsim/figure-capabilities'
 import { LEGEND_VEHICLE, Legend } from './features/mcs-status-default'
+import { VehicleTravel } from './features/vehicle-travel'
 import MCSCarrierHolder from './mcs-carrier-holder'
-import Node from './node'
 
 const DIRECTION_GAP = 3
 
-function findNode(vehicle: MCSVehicle, nodeId: string, nodeMachine: string) {
-  if (!nodeId || !nodeMachine) {
-    return null
-  }
-
-  const nodes = (vehicle.root.findAllById?.(nodeId) || []).filter(node => node.state.type == 'Node') as Node[]
-
-  return nodes.find((node: Node) => {
-    return node.nodeMachine === nodeMachine
-  })
-}
-
 /**
  * MCS용 Unit > Transport들의 공통 속성을 정의한 오브젝트
  */
-export default class MCSVehicle extends MCSCarrierHolder {
+export default class MCSVehicle extends VehicleTravel(MCSCarrierHolder) {
   static get properties(): any {
     return [
       ...MCSCarrierHolder.properties,
@@ -34,8 +24,6 @@ export default class MCSVehicle extends MCSCarrierHolder {
     ]
   }
 
-  private lastWaypoint: { NodeId: string; NodeMachine: string } | null = null
-
   getLegendFallback(): Legend {
     return LEGEND_VEHICLE
   }
@@ -92,59 +80,7 @@ export default class MCSVehicle extends MCSCarrierHolder {
     super.postrender(ctx)
     // this.renderDirection(ctx)
   }
-
-  onchangeData(after: Record<string, any>, before: Record<string, any>): void {
-    super.onchangeData(after, before)
-
-    const { NODEID: beforeNodeId, NODEMACHINE: beforeNodeMachine } = before.data || {}
-    const { NODEID: NodeId, NODEMACHINE: NodeMachine } = after.data || {}
-
-    if (
-      NodeId === undefined ||
-      NodeMachine === undefined ||
-      (beforeNodeId === NodeId && beforeNodeMachine === NodeMachine) ||
-      (this.lastWaypoint && this.lastWaypoint.NodeId === NodeId && this.lastWaypoint.NodeMachine === NodeMachine)
-    ) {
-      return // not changed
-    }
-
-    const afterNode = findNode(this, NodeId, NodeMachine)
-    if (!afterNode) {
-      // 보드는 전체 노드의 부분 뷰 — 모든 노드를 그리지 않는다. 위치 NODEID 가 이 보드에
-      // 없는 노드를 가리키는 건 오류가 아니라 정상(그 노드는 이 보드에 미표시)이므로,
-      // 경고 없이 조용히 배치를 생략한다. (데이터 갱신마다 도는 hot path — 거짓 경보 방지.)
-      return
-    }
-
-    const beforeNode = this.lastWaypoint
-      ? findNode(this, this.lastWaypoint.NodeId, this.lastWaypoint.NodeMachine)
-      : afterNode
-
-    // 실제 존재하는 노드 중 가장 최근에 이동한 노드
-    this.lastWaypoint = { NodeId, NodeMachine }
-
-    if ((this.root as any).vehicleAnimation) {
-      this.trigger('waypoint', {
-        from: beforeNode || afterNode,
-        to: afterNode,
-        duration: 5000
-      })
-    } else if (beforeNode) {
-      const fromCenter = beforeNode.center
-      const toCenter = afterNode.center
-
-      const { x: startX, y: startY } = beforeNode.transcoordS2T(fromCenter.x, fromCenter.y)
-      const { x: endX, y: endY } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
-
-      const theta = Math.atan2(endY - startY, endX - startX) + Math.PI / 2
-
-      this.location = { x: endX, y: endY }
-      this.setState('rotation', theta)
-    } else {
-      // beforeNode 없음: afterNode 위치로 즉시 이동
-      const toCenter = afterNode.center
-      const { x, y } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
-      this.location = { x, y }
-    }
-  }
 }
+
+/* fmsim.Vehicle (ADR-0167 18): a figure travels between nodes by the same mixin as fmsim's own AGV and OHT */
+registerFigureCapability(VEHICLE, base => VehicleTravel(base) as never)