@fmsim/machine 2.0.0-beta.25 → 2.0.0-beta.27

package/package.json

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

package/src/conveyor-join.ts

@@ -119,8 +119,11 @@ export default class ConveyorJoin extends ConveyorMixin(MCSTransport) {
     if (normx * normx + normy * normy < 0.25 && ratiox * ratiox + ratioy * ratioy > 0.25) {
       const angle = normalizeAngle(Math.atan2(-normy, normx) - Math.PI / 2)
 
-      if (angle >= startAngle && angle <= endAngle) {
-        return true
+      if (startAngle <= endAngle) {
+        if (angle >= startAngle && angle <= endAngle) return true
+      } else {
+        // wraparound: startAngle > endAngle (예: π → 0)
+        if (angle >= startAngle || angle <= endAngle) return true
       }
     }
 

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'
@@ -247,7 +247,6 @@ class MCSRealObject3D extends RealObjectGroup {
           opacity,
           transparent: opacity < 1,
           side: THREE.DoubleSide,
-          depthWrite: opacity >= 0.9,
         })
       : new THREE.MeshStandardMaterial({
           color,
@@ -256,7 +255,6 @@ class MCSRealObject3D extends RealObjectGroup {
           opacity,
           transparent: opacity < 1,
           side: opacity < 1 ? THREE.DoubleSide : THREE.FrontSide,
-          depthWrite: opacity >= 0.9,
           ...(this._config.emissiveIntensity ? { emissive: color, emissiveIntensity: this._config.emissiveIntensity } : {}),
         })
     // z-fighting 방지: 바닥면(floor grid)보다 항상 앞에 렌더링
@@ -487,9 +485,6 @@ class OHTLineRealObject3D extends RealObjectGroup {
       color: OHT_LINE_RAIL_COLOR,
       metalness: 0.5,
       roughness: 0.4,
-      transparent: true,
-      opacity: 1.0,
-      depthWrite: false,
     })
 
     const geoms: THREE.BufferGeometry[] = []
@@ -856,9 +851,8 @@ class PortFlowRealObject3D extends RealObjectGroup {
 
     const mat = new THREE.MeshBasicMaterial({
       map: this._texture,
-      transparent: true,
+      alphaTest: 0.1,
       side: THREE.DoubleSide,
-      depthWrite: false,
     })
 
     this._mesh = new THREE.Mesh(geo, mat)
@@ -948,9 +942,8 @@ class NodeRealObject3D extends RealObjectGroup {
 
     const mat = new THREE.MeshBasicMaterial({
       map: this._texture,
-      transparent: true,
+      alphaTest: 0.1,
       side: THREE.DoubleSide,
-      depthWrite: false,
     })
 
     this._mesh = new THREE.Mesh(geo, mat)
@@ -985,3 +978,11 @@ class NodeRealObject3D extends RealObjectGroup {
 }
 
 registerRealObjectFactory('Node', (component: Component) => new NodeRealObject3D(component))
+
+// Scanner — Triangle extrude + 기본 depth = Port + Carrier 높이
+class ScannerExtrude extends TriangleExtrude {
+  get effectiveDepth(): number {
+    return this.component.state.depth || TRANSPORT_SURFACE_HEIGHT * 1.3
+  }
+}
+registerRealObjectFactory('Scanner', (component: Component) => new ScannerExtrude(component))

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
+  }
+}