@fmsim/machine 1.0.46 → 1.0.48

package/src/carrier.ts

@@ -3,6 +3,7 @@ import { getPopupData } from '@fmsim/api'
 
 import { BOUNDS, Component, ComponentNature, Properties, Shape } from '@hatiolab/things-scene'
 import { ANIMATION_DEFAULT, AnimationPreset, AnimationConfig } from './features/animation-default.js'
+import { ParentObjectMixin } from './features/parent-object-mixin.js'
 import { LEGEND_CARRIER, Legend } from './features/mcs-status-default.js'
 import { MCSStatusMixin } from './features/mcs-status-mixin.js'
 
@@ -12,7 +13,7 @@ const NATURE: ComponentNature = {
   rotatable: false
 }
 
-export default class Carrier extends MCSStatusMixin(Shape) {
+export default class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {
   static get nature() {
     return NATURE
   }
@@ -58,7 +59,7 @@ export default class Carrier extends MCSStatusMixin(Shape) {
         }
 
         if (decorator || border || arrow) {
-          this.trigger('animatoroff')
+          this.trigger('deco-off')
         }
       }
 
@@ -75,18 +76,18 @@ export default class Carrier extends MCSStatusMixin(Shape) {
         }
 
         if (decorator) {
-          this.trigger('animatoroff')
-          this.trigger('icon', decorator)
+          this.trigger('deco-icon-off')
+          this.trigger('deco-icon', decorator)
         }
 
         if (border) {
-          this.trigger('animatoroff')
-          this.trigger('border', border)
+          this.trigger('deco-border-off')
+          this.trigger('deco-border', border)
         }
 
         if (arrow) {
-          this.trigger('animatoroff')
-          this.trigger('bouncing', arrow)
+          this.trigger('deco-arrow-off')
+          this.trigger('deco-arrow', arrow)
         }
       }
     }

package/src/conveyor.ts

@@ -32,7 +32,7 @@ export default class Conveyor extends MCSTransport {
   }
 
   containable(component: Component) {
-    return ['Shuttle', 'Port'].includes(component.state.type)
+    return ['Shuttle', 'Port', 'Node'].includes(component.state.type)
   }
 
   renderConveyor(ctx: CanvasRenderingContext2D) {

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

@@ -20,6 +20,10 @@ export const MCSStatusMixinProperties = [
 
 export function MCSStatusMixin<TBase extends Constructor>(Base: TBase) {
   return class extends Base {
+    isLVComponent() {
+      return true
+    }
+
     get status(): string | undefined {
       return
     }

package/src/mcs-machine.ts

@@ -30,10 +30,6 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
     return ['rect', 'ellipse'].includes(component.state.type)
   }
 
-  get reactionDecorators() {
-    return ['bouncing-arrow']
-  }
-
   get decorators() {
     return ['decotag']
   }

package/src/mcs-unit.ts

@@ -17,10 +17,6 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
     return true
   }
 
-  get reactionDecorators() {
-    return ['bouncing-arrow']
-  }
-
   get decorators() {
     return ['decotag']
   }

package/src/mcs-vehicle.ts

@@ -1,8 +1,22 @@
+import { Properties } from '@hatiolab/things-scene'
 import { LEGEND_VEHICLE, Legend } from './features/mcs-status-default'
 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들의 공통 속성을 정의한 오브젝트
  */
@@ -21,6 +35,8 @@ export default class MCSVehicle extends MCSCarrierHolder {
     ]
   }
 
+  private lastWaypoint: { NodeId: string; NodeMachine: string } | null = null
+
   getLegendFallback(): Legend {
     return LEGEND_VEHICLE
   }
@@ -77,4 +93,39 @@ export default class MCSVehicle extends MCSCarrierHolder {
     super.postrender(ctx)
     // this.renderDirection(ctx)
   }
+
+  onchangeData(after: Properties, before: Properties): void {
+    super.onchangeData(after, before)
+
+    const { NodeId: beforeNodeId, NodeMachine: beforeNodeMachine } = before.data || {}
+    const { NodeId, 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) {
+      console.warn(`Node not found. NodeId: ${NodeId}, NodeMachine: ${NodeMachine}`)
+      return
+    }
+
+    const beforeNode = this.lastWaypoint
+      ? findNode(this, this.lastWaypoint.NodeId, this.lastWaypoint.NodeMachine)
+      : afterNode
+
+    // 실제 존재하는 노드 중 가장 최근에 이동한 노드
+    this.lastWaypoint = { NodeId, NodeMachine }
+
+    this.trigger('waypoint', {
+      from: beforeNode,
+      to: afterNode,
+      duration: 5000
+    })
+  }
 }

package/src/node.ts

@@ -3,12 +3,24 @@
  */
 
 import { Component, Shape } from '@hatiolab/things-scene'
+import MCSMachine from './mcs-machine'
 
 const NATURE = {
   mutable: false,
   resizable: false,
   rotatable: false,
-  properties: []
+  properties: [
+    {
+      type: 'string',
+      name: 'NodeIDs',
+      label: 'node-ids'
+    },
+    {
+      type: 'string',
+      name: 'NodeMachine',
+      label: 'node-machine'
+    }
+  ]
 }
 
 export default class Node extends Shape {
@@ -65,6 +77,18 @@ export default class Node extends Shape {
     })
   }
 
+  get nodeMachine() {
+    if (this.state.NodeMachine) {
+      return this.state.NodeMachine
+    }
+
+    const parent = this.parent
+
+    if (parent && parent instanceof MCSMachine) {
+      return parent.state.id
+    }
+  }
+
   contains(x, y) {
     var { cx, cy } = this.state
 

package/src/oht-line.ts

@@ -22,7 +22,7 @@ export default class OHTLine extends MCSTransport {
   }
 
   containable(component: Component) {
-    return ['OHT'].includes(component.state.type)
+    return ['OHT', 'Node'].includes(component.state.type)
   }
 
   render(context: CanvasRenderingContext2D) {