@fmsim/machine 2.0.0-beta.2 → 2.0.0-beta.21

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

@@ -12,7 +12,7 @@
 
 import * as THREE from 'three'
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js'
-import { RealObjectGroup, registerRealObjectFactory } from '@hatiolab/things-scene'
+import { RealObjectGroup, registerRealObjectFactory, disposeObject3D } from '@hatiolab/things-scene'
 import type { Component } from '@hatiolab/things-scene'
 import { TRANSPORT_SURFACE_HEIGHT } from './machine-3d.js'
 
@@ -21,6 +21,7 @@ const FORK_COLOR = 0x777777
 const DEFAULT_BODY_COLOR = 0x6688cc
 
 export class Shuttle3D extends RealObjectGroup {
+  private _ownMeshes: THREE.Mesh[] = []
   get effectiveDepth(): number {
     const { depth } = this.component.state
     return depth || TRANSPORT_SURFACE_HEIGHT
@@ -80,7 +81,6 @@ export class Shuttle3D extends RealObjectGroup {
     baseMesh.position.y = baseH / 2
     baseMesh.castShadow = true
     baseMesh.receiveShadow = true
-    this.object3d.add(baseMesh)
 
     // ── 2. 좌우 마스트 기둥 (statusColor 적용) ──
     const mastBaseY = baseH
@@ -109,7 +109,6 @@ export class Shuttle3D extends RealObjectGroup {
 
     const mastMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(mastGeometries), mastMat)
     mastMesh.castShadow = true
-    this.object3d.add(mastMesh)
 
     // ── 3. 상단 포크 (2개의 평행 암 + 백 플레이트) ──
     const forkBaseY = mastBaseY + mastH
@@ -141,14 +140,39 @@ export class Shuttle3D extends RealObjectGroup {
 
     const forkMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(forkGeometries), forkMat)
     forkMesh.castShadow = true
-    this.object3d.add(forkMesh)
+
+    this._ownMeshes = [baseMesh, mastMesh, forkMesh]
+    for (const m of this._ownMeshes) this.object3d.add(m)
   }
 
   updateDimension() {}
-  updateAlpha() {}
+
+  update() {
+    for (const m of this._ownMeshes) {
+      this.object3d.remove(m)
+      disposeObject3D(m)
+    }
+    this._ownMeshes = []
+    this.build()
+    this.updateTransform()
+    this.updateAlpha()
+    this.updateHidden()
+  }
+
+  updateAlpha() {
+    const { alpha = 1 } = this.component.state
+    for (const m of this._ownMeshes) {
+      const materials = Array.isArray(m.material) ? m.material : [m.material]
+      for (const mat of materials) {
+        ;(mat as THREE.MeshStandardMaterial).opacity = alpha
+        ;(mat as THREE.MeshStandardMaterial).transparent = alpha < 1
+      }
+    }
+  }
 
   onchange(after: Record<string, unknown>, before: Record<string, unknown>) {
-    if ('width' in after || 'height' in after || 'depth' in after || 'fillStyle' in after || 'strokeStyle' in after) {
+    if ('width' in after || 'height' in after || 'depth' in after ||
+        'fillStyle' in after || 'strokeStyle' in after || 'id' in after) {
       this.update()
       return
     }

package/src/index.ts

@@ -1,55 +1,71 @@
 // ── side-effect: scene override ──
-import './scene/root-container-override.js'
+import './scene/root-container-override'
 
 // ── side-effect: 3D factories ──
-import './factories/machine-3d.js'
-import './factories/conveyor-3d.js'
-import './factories/agv-3d.js'
-import './factories/oht-3d.js'
-import './factories/shuttle-3d.js'
-import './factories/crane-3d.js'
-import './factories/crane-rail-3d.js'
+import './factories/machine-3d'
+import './factories/conveyor-3d'
+import './factories/agv-3d'
+import './factories/oht-3d'
+import './factories/shuttle-3d'
+import './factories/crane-3d'
+import './factories/crane-rail-3d'
 
 // ── side-effect: @sceneComponent 등록 (tree-shaking 방지) ──
-import './zone-capacity-bar.js'
-import './stocker-capacity-bar.js'
-import './stocker-carrier-bar.js'
-import './stocker-abnormal-bar.js'
-import './port-flow.js'
-import './agv-line.js'
-import './buffer.js'
-import './conveyor.js'
-import './conveyor-join.js'
-import './equipment.js'
-import './oht-line.js'
-import './stocker.js'
-import './crane-rail.js'
-import './agv.js'
-import './oht.js'
-import './shuttle.js'
-import './port.js'
-import './crane.js'
-import './shelf.js'
-import './carrier.js'
-import './node.js'
-import './node-path.js'
-import './floating-container.js'
-import './static-container.js'
-import './clickable-popup.js'
+// bars & overlays
+import './zone-capacity-bar'
+import './stocker-capacity-bar'
+import './stocker-carrier-bar'
+import './stocker-abnormal-bar'
+import './port-flow'
 
+// facilities
+import './agv-line'
+import './buffer'
+import './conveyor'
+import './conveyor-join'
+import './equipment'
+import './oht-line'
+import './stocker'
+import './crane-rail'
+
+// vehicles
+import './agv'
+import './oht'
+import './shuttle'
+
+// units
+import './port'
+import './crane'
+import './shelf'
+import './carrier'
+
+// topology
+import './node'
+import './node-path'
+
+// containers
+import './floating-container'
+import './static-container'
+import './clickable-popup'
+
+// ── groups ──
 export { default as MachineGroups } from './groups'
 
+// ── base classes ──
 export { default as MCSMachine } from './mcs-machine'
 export { default as MCSUnit } from './mcs-unit'
 export { default as MCSCarrierHolder } from './mcs-carrier-holder'
 export { default as MCSVehicle } from './mcs-vehicle'
 export { default as MCSTransport } from './mcs-transport'
+
+// ── bars & overlays ──
 export { default as ZoneCapacityBar } from './zone-capacity-bar'
 export { default as StockerCapacityBar } from './stocker-capacity-bar'
 export { default as StockerCarrierBar } from './stocker-carrier-bar'
 export { default as StockerAbnormalBar } from './stocker-abnormal-bar'
 export { default as PortFlow } from './port-flow'
 
+// ── facilities ──
 export { default as AGVLine } from './agv-line'
 export { default as Buffer } from './buffer'
 export { default as Conveyor } from './conveyor'
@@ -59,18 +75,22 @@ export { default as OHTLine } from './oht-line'
 export { default as Stocker } from './stocker'
 export { default as CraneRail } from './crane-rail'
 
+// ── vehicles ──
 export { default as AGV } from './agv'
 export { default as OHT } from './oht'
 export { default as Shuttle } from './shuttle'
 
+// ── units ──
 export { default as Port } from './port'
 export { default as Crane } from './crane'
 export { default as Shelf } from './shelf'
 export { default as Carrier } from './carrier'
 
+// ── topology ──
 export { default as Node } from './node'
 export { default as NodePath } from './node-path'
 
+// ── containers ──
 export { default as FloatingContainer } from './floating-container'
-export { default as StaticContainer } from './static-container.js'
+export { default as StaticContainer } from './static-container'
 export { default as ClickablePopup } from './clickable-popup'

package/src/mcs-carrier-holder.ts

@@ -1,7 +1,5 @@
-import { Model, Properties } from '@hatiolab/things-scene'
 import { themesColorMap, themesAnimationMap } from '@fmsim/api'
 import MCSUnit from './mcs-unit.js'
-import Carrier from './carrier.js'
 
 export default class MCSCarrierHolder extends MCSUnit {
   static get properties(): any {
@@ -31,50 +29,56 @@ export default class MCSCarrierHolder extends MCSUnit {
     ]
   }
 
-  carrier?: Carrier | null
-
-  async ready() {
-    super.ready()
+  get showOverflow() {
+    return true
+  }
 
-    for (let component of this.components) {
-      this.removeComponent(component)
+  get hierarchy() {
+    return {
+      ...super.hierarchy,
+      components: []
     }
-
-    const { width, height } = this.state
-
-    this.carrier = Model.compile(
-      {
-        type: 'Carrier',
-        left: 0,
-        top: 0,
-        width,
-        height,
-        showText: this.getState('showCarrierText') || false
-      },
-      this.root.app
-    ) as any
-
-    this.addComponent(this.carrier!)
-
-    this.carrier!.data = this.data
   }
 
   dispose(): void {
-    this.carrier = null
-
+    ;(this.root as any)?.carrierManager?.update(this, {}, this.data)
     super.dispose()
   }
 
-  get hierarchy() {
-    return {
-      ...super.hierarchy,
-      components: []
+  async ready() {
+    super.ready()
+
+    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}
+    
+    if(CARRIERNAME) {
+      ;(this.root as any).carrierManager.update(this, {
+        CARRIERNAME,
+        CARRIERTYPE,
+        EMPTYTYPE,
+        CARRIERSTATUS
+      }, undefined)
     }
   }
 
   onchangeData(after: Record<string, any>, before: Record<string, any>): void {
-    if (this.carrier) {
-      this.carrier.data = this.data
+    // CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS 이 변경되었을 때만 캐리어 관리자에게 알린다.
+    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = after.data || {}
+    const { CARRIERNAME: beforeCARRIERNAME, CARRIERTYPE: beforeCARRIERTYPE = '', EMPTYTYPE: beforeEMPTYTYPE, CARRIERSTATUS: beforeCARRIERSTATUS } = before.data || {}
+    if(CARRIERNAME !== beforeCARRIERNAME ||
+      CARRIERTYPE !== beforeCARRIERTYPE ||
+      EMPTYTYPE !== beforeEMPTYTYPE ||
+      CARRIERSTATUS !== beforeCARRIERSTATUS) {
+      ;(this.root as any).carrierManager.update(this, {
+        CARRIERNAME,
+        CARRIERTYPE,
+        EMPTYTYPE,
+        CARRIERSTATUS
+      }, {
+        CARRIERNAME: beforeCARRIERNAME,
+        CARRIERTYPE: beforeCARRIERTYPE,
+        EMPTYTYPE: beforeEMPTYTYPE,
+        CARRIERSTATUS: beforeCARRIERSTATUS
+      })
     }
 
     super.onchangeData(after, before)

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

@@ -1,6 +1,7 @@
 import { Component, RootContainer } from '@hatiolab/things-scene'
 import { themesColorMap, themesColorRange, themesAnimationMap } from '@fmsim/api'
 import { Legend } from '../features/mcs-status-default'
+import CarrierManager from '../carrier-manager'
 
 // RootContainer 클래스 타입 확장
 declare module '@hatiolab/things-scene' {
@@ -26,6 +27,8 @@ declare module '@hatiolab/things-scene' {
     vehicleAnimation?: boolean
     // 캐시 관련 속성 추가
     _animationConfigCache?: Map<string, any>
+    _carrierManager?: CarrierManager
+    carrierManager: CarrierManager
   }
 }
 
@@ -326,3 +329,12 @@ Object.defineProperty(RootContainer.prototype, 'vehicleAnimation', {
     return !!vehicleAnimation
   }
 })
+
+Object.defineProperty(RootContainer.prototype, 'carrierManager', {
+  get: function () {
+    if (!this._carrierManager) {
+      this._carrierManager = new CarrierManager(this)
+    }
+    return this._carrierManager
+  }
+})