@fmsim/machine 2.0.0-beta.26 → 2.0.0-beta.28

package/package.json

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

package/src/carrier-manager.ts

@@ -57,7 +57,7 @@ export default class CarrierManager {
       ) as unknown as Carrier
 
       this.carriers.set(afterName, carrier)
-      holder.addComponent(carrier, true)
+      holder.addComponent(carrier, { silent: true })
     } else if (carrier.parent !== holder && (!beforeName && afterName)) {
       // CARRIERNAME이 새로 나타남 (이전엔 없었음) → 다른 holder로 이동
       ;(holder as any).reparent(carrier, { animated: true, duration: 2000, ease: 'inout' })

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

@@ -10,7 +10,7 @@
 
 import * as THREE from 'three'
 import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js'
-import { RealObjectGroup, registerRealObjectFactory, disposeObject3D } from '@hatiolab/things-scene'
+import { RealObjectGroup, registerRealObjectFactory, disposeObject3D, TriangleExtrude } from '@hatiolab/things-scene'
 import type { Component } from '@hatiolab/things-scene'
 import { LEGEND_CAPACITY } from '../features/mcs-status-default'
 import { getVaueOnRanges } from '../utils/get-value-on-ranges'
@@ -91,6 +91,9 @@ class MCSRealObject3D extends RealObjectGroup {
   }
 
   protected get syncZPosOffset(): number {
+    // zPos가 명시되면 그 값을 절대 높이로 사용 (다른 컴포넌트와 동일한 의미)
+    if (this.component.state.zPos != null) return 0
+
     // zPosOverride: 고정 높이 (OHTLine 등)
     if (this._config.zPosOverride != null) {
       return this._config.zPosOverride
@@ -99,10 +102,14 @@ class MCSRealObject3D extends RealObjectGroup {
     if (this._config.defaultZPosFromParent) {
       return TRANSPORT_SURFACE_HEIGHT
     }
-    // Carrier: Port 안이면 중앙, 그 외 컨테이너면 상단 위
+    // Carrier: 부모 유형에 따라 배치 위치 결정
     if (this._config.sizeRatio && this._config.sizeRatio < 1) {
       const parentType = this.component.parent?.state?.type
-      if (parentType === 'Port' || parentType === 'Shelf' || parentType === 'OHT' || parentType === 'Shuttle') {
+      // OHT: 그리퍼 아래에 매달림 (캐리어 상단이 OHT 하단에 붙음)
+      if (parentType === 'OHT') {
+        return -this.effectiveDepth
+      }
+      if (parentType === 'Port' || parentType === 'Shelf' || parentType === 'Shuttle') {
         return 0
       }
       return TRANSPORT_SURFACE_HEIGHT
@@ -395,9 +402,9 @@ class MCSRealObject3D extends RealObjectGroup {
   updateDimension() {}
 
   updateAlpha() {
-    const { alpha = 1 } = this.component.state
-    const configOpacity = this._config.opacity
-    const effective = configOpacity * alpha
+    const state = this.component.state
+    // alpha가 명시적으로 설정되어 있으면 그 값을 사용, 없으면 config 기본값 적용
+    const effective = ('alpha' in state) ? (state.alpha as number) : this._config.opacity
 
     this.object3d.traverse((o: any) => {
       if (!o.material) return
@@ -978,3 +985,16 @@ class NodeRealObject3D extends RealObjectGroup {
 }
 
 registerRealObjectFactory('Node', (component: Component) => new NodeRealObject3D(component))
+
+// Scanner — 이송 표면 높이의 기둥 형태
+const SCANNER_CONFIG: MCS3DConfig = {
+  ...DEFAULTS,
+  defaultDepth: TRANSPORT_SURFACE_HEIGHT * 0.2,
+  defaultZPosFromParent: true,
+  opacity: 1,
+  metalness: 0.3,
+  roughness: 0.7,
+  defaultColor: 0x888888,
+  shape: 'box',
+}
+registerRealObjectFactory('Scanner', (component: Component) => new MCSRealObject3D(component, SCANNER_CONFIG))

package/src/index.ts

@@ -27,6 +27,7 @@ import './equipment'
 import './oht-line'
 import './stocker'
 import './crane-rail'
+import './scanner'
 
 // vehicles
 import './agv'
@@ -74,6 +75,7 @@ export { default as Equipment } from './equipment'
 export { default as OHTLine } from './oht-line'
 export { default as Stocker } from './stocker'
 export { default as CraneRail } from './crane-rail'
+export { default as Scanner } from './scanner'
 
 // ── vehicles ──
 export { default as AGV } from './agv'

package/src/scanner.ts

@@ -0,0 +1,29 @@
+import { Component, ComponentNature, Triangle, sceneComponent } from '@hatiolab/things-scene'
+import { MCSStatusMixin } from './features/mcs-status-mixin'
+
+const NATURE: ComponentNature = {
+  mutable: true,
+  resizable: false,
+  rotatable: true,
+  properties: [
+    {
+      type: 'number',
+      label: 'round',
+      name: 'round',
+      property: { min: 0, max: 100, step: 1 }
+    }
+  ]
+}
+
+@sceneComponent('Scanner')
+export default class Scanner extends MCSStatusMixin(Triangle) {
+  static get nature() {
+    return NATURE
+  }
+
+  is3dish() {
+    return true
+  }
+}
+
+Component.memoize(Scanner.prototype, 'path', false)

package/src/templates/index.ts

@@ -17,6 +17,7 @@ import agvLine from './agv-line'
 import ohtLine from './oht-line'
 import conveyor from './conveyor'
 
+import Scanner from './scanner'
 import Node from './node'
 import DataSubscription from './data-subscription'
 import FloatingContainer from './floating-container'
@@ -41,6 +42,7 @@ export default [
   Shelf,
   Port,
 
+  Scanner,
   Node,
   FloatingContainer,
   DataSubscription

package/src/templates/scanner.ts

@@ -0,0 +1,20 @@
+const icon = new URL('../../icons/equipment.png', import.meta.url).href
+
+export default {
+  type: 'Scanner',
+  description: 'Fixed mount barcode/QR scanner',
+  group: ['etc'],
+  icon,
+  model: {
+    type: 'Scanner',
+    x1: 100,
+    y1: 100,
+    x2: 130,
+    y2: 110,
+    x3: 100,
+    y3: 120,
+    strokeStyle: '#333',
+    fillStyle: '#8899aa',
+    lineWidth: 1
+  }
+}