@fmsim/machine 2.0.0-beta.78 → 2.0.0-beta.82

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "2.0.0-beta.78",
+  "version": "2.0.0-beta.82",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -26,7 +26,7 @@
     "migration": "things-factory-migration"
   },
   "dependencies": {
-    "@fmsim/api": "^2.0.0-beta.75",
+    "@fmsim/api": "^2.0.0-beta.82",
     "@hatiolab/things-scene": "^10.0.0-beta.1"
   },
   "devDependencies": {
@@ -55,5 +55,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "ec49cb13a3210741a7002d0f3fb002ed280594f4"
+  "gitHead": "3c774890bc55dd19594c17199337bdfe93b7ef5a"
 }

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

@@ -16,12 +16,15 @@ import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUti
 import { RealObjectGroup, registerRealObjectFactory } from '@hatiolab/things-scene'
 import type { Component } from '@hatiolab/things-scene'
 import { TRANSPORT_SURFACE_HEIGHT } from './machine-3d.js'
+import { Z_FMSIM } from './z-priority'
 
 const FRAME_COLOR = 0x888899
 const ROLLER_COLOR = 0xaaaabc
 const DEFAULT_COLOR = 0x999999
 
 export class Conveyor3D extends RealObjectGroup {
+  get zPriority(): number { return Z_FMSIM.CONVEYOR }
+
   get effectiveDepth(): number {
     const { depth } = this.component.state
     return depth || TRANSPORT_SURFACE_HEIGHT

package/src/factories/crane-rail-3d.ts

@@ -15,6 +15,7 @@ import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUti
 import { RealObjectGroup, registerRealObjectFactory } from '@hatiolab/things-scene'
 import type { Component } from '@hatiolab/things-scene'
 import { TRANSPORT_SURFACE_HEIGHT } from './machine-3d.js'
+import { Z_FMSIM } from './z-priority'
 
 const RAIL_COLOR = 0x666677
 const SUPPORT_COLOR = 0x555566
@@ -23,6 +24,8 @@ const SUPPORT_COLOR = 0x555566
 const DEFAULT_RAIL_DEPTH = 5 * TRANSPORT_SURFACE_HEIGHT
 
 export class CraneRail3D extends RealObjectGroup {
+  get zPriority(): number { return Z_FMSIM.CRANE_RAIL }
+
   get effectiveDepth(): number {
     const { depth } = this.component.state
     return depth || DEFAULT_RAIL_DEPTH

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

@@ -14,6 +14,7 @@ import { RealObjectGroup, registerRealObjectFactory, disposeObject3D } from '@ha
 import type { Component } from '@hatiolab/things-scene'
 import { LEGEND_CAPACITY } from '../features/mcs-status-default'
 import { getValueOnRanges } from '../utils/get-value-on-ranges'
+import { Z_FMSIM } from './z-priority'
 
 // ── 설정 타입 ────────────────────────────────────────────
 
@@ -48,6 +49,8 @@ interface MCS3DConfig {
   keepBottomFace?: boolean
   /** syncZPosOffset 고정값 (설정 시 다른 로직 무시) */
   zPosOverride?: number
+  /** z-priority — polygonOffset 으로 z-fight 완화. 기본 0 (OBJECTS). */
+  zPriority?: number
 }
 
 /**
@@ -76,6 +79,10 @@ class MCSRealObject3D extends RealObjectGroup {
     this._config = config
   }
 
+  get zPriority(): number {
+    return this._config.zPriority ?? 0
+  }
+
   // width, height 절대값 (음수 값은 양수로 취급).
   // `resizable:false` 컴포넌트(예: Scanner)는 state.width/height 가 없고
   // bounds 만 있을 수 있으므로 bounds 를 fallback 으로 사용.
@@ -503,6 +510,7 @@ register('Equipment', {
   metalness: 0.4,
   roughness: 0.6,
   defaultColor: 0x8899aa,
+  zPriority: Z_FMSIM.EQUIPMENT,
 })
 
 register('Buffer', {
@@ -512,6 +520,7 @@ register('Buffer', {
   roughness: 0.7,
   defaultColor: 0x99aa88,
   shape: 'hexagon',
+  zPriority: Z_FMSIM.BUFFER,
 })
 
 register('AGVLine', {
@@ -520,6 +529,7 @@ register('AGVLine', {
   metalness: 0.6,
   roughness: 0.3,
   defaultColor: 0x888899,
+  zPriority: Z_FMSIM.AGV_LINE,
 })
 
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -532,6 +542,7 @@ const OHT_LINE_HEIGHT = 7 * TRANSPORT_SURFACE_HEIGHT // OHT 상단과 일치
 class OHTLineRealObject3D extends RealObjectGroup {
   private _mesh?: THREE.Mesh
 
+  get zPriority(): number { return Z_FMSIM.OHT_LINE }
   get effectiveDepth(): number { return 0 }
   protected get syncZPosOffset(): number { return OHT_LINE_HEIGHT }
 
@@ -624,6 +635,7 @@ const STOCKER_CONFIG: MCS3DConfig = {
   metalness: 0.3,
   roughness: 0.6,
   defaultColor: 0x8899bb,
+  zPriority: Z_FMSIM.STOCKER,
 }
 
 class StockerRealObject3D extends MCSRealObject3D {
@@ -815,6 +827,7 @@ const PORT_CONFIG: MCS3DConfig = {
   roughness: 0.8,
   defaultColor: 0xb0a090,
   shape: 'plane',
+  zPriority: Z_FMSIM.PORT,
 }
 registerRealObjectFactory('Port', (component: Component) => new MCSRealObject3D(component, PORT_CONFIG))
 
@@ -823,6 +836,7 @@ register('Shelf', {
   metalness: 0.3,
   roughness: 0.7,
   defaultColor: 0xaabbcc,
+  zPriority: Z_FMSIM.SHELF,
 })
 
 // Carrier: CARRIERSTATUS에 따른 3D 애니메이션 지원
@@ -835,6 +849,7 @@ const CARRIER_CONFIG: MCS3DConfig = {
   isVisible: (c: Component) => !!(c.state as any).id,
   sizeRatio: 0.8,
   texturedTop: true,
+  // Carrier 는 이동 entity — default OBJECTS(0). zPriority 미설정.
 }
 
 class CarrierRealObject3D extends MCSRealObject3D {
@@ -867,6 +882,7 @@ class PortFlowRealObject3D extends RealObjectGroup {
   private _mesh?: THREE.Mesh
   private _texture?: THREE.CanvasTexture
 
+  get zPriority(): number { return Z_FMSIM.PORT_FLOW }
   get effectiveDepth(): number { return 0 }
   protected get syncZPosOffset(): number {
     // 부모 Port/Conveyor의 zPos와 동일하게
@@ -980,6 +996,7 @@ class NodeRealObject3D extends RealObjectGroup {
   private _mesh?: THREE.Mesh
   private _texture?: THREE.CanvasTexture
 
+  get zPriority(): number { return Z_FMSIM.NODE }
   get effectiveDepth(): number { return 0 }
   protected get syncZPosOffset(): number { return 0 }
 
@@ -1070,5 +1087,6 @@ const SCANNER_CONFIG: MCS3DConfig = {
   roughness: 0.7,
   defaultColor: 0x888888,
   shape: 'triangle',
+  zPriority: Z_FMSIM.SCANNER,
 }
 registerRealObjectFactory('Scanner', (component: Component) => new MCSRealObject3D(component, SCANNER_CONFIG))

package/src/factories/z-priority-defaults.ts

@@ -0,0 +1,38 @@
+/*
+ * 기본 factory (RealObjectDomTexture) 를 쓰는 컴포넌트들에 대한 zPriority override.
+ *
+ * `factories/machine-3d.ts`, `conveyor-3d.ts`, `crane-rail-3d.ts` 등에 등록된
+ * 커스텀 RealObject 들은 자기 클래스에서 `get zPriority()` override. 그 외 컴포넌트는
+ * 기본 RealObjectDomTexture 를 쓰는데, 이 파일이 그것들도 priority 갖도록 등록.
+ *
+ * 패턴: registerRealObjectFactory(type, (component) => withZ(new RealObjectDomTexture(...), N))
+ */
+import { registerRealObjectFactory, RealObjectDomTexture } from '@hatiolab/things-scene'
+import type { Component } from '@hatiolab/things-scene'
+import { Z_FMSIM } from './z-priority'
+
+/** 주어진 RealObject 의 zPriority getter 를 override (instance level). */
+function withZ<T extends RealObjectDomTexture>(ro: T, zPriority: number): T {
+  Object.defineProperty(ro, 'zPriority', {
+    get: () => zPriority,
+    configurable: true
+  })
+  return ro
+}
+
+/** RealObjectDomTexture 기반 컴포넌트에 priority 일괄 등록 helper. */
+function registerWithPriority(type: string, zPriority: number) {
+  registerRealObjectFactory(type, (component: Component) =>
+    withZ(new RealObjectDomTexture(component), zPriority)
+  )
+}
+
+// ── 미등록 컴포넌트들 ──────────────────────────────────────
+registerWithPriority('ConveyorJoin', Z_FMSIM.CONVEYOR_JOIN)
+registerWithPriority('NodePath', Z_FMSIM.NODE_PATH)
+registerWithPriority('container', Z_FMSIM.STATIC_CONTAINER)
+registerWithPriority('FloatingContainer', Z_FMSIM.FLOATING_CONTAINER)
+registerWithPriority('popup', Z_FMSIM.POPUP)
+registerWithPriority('confidential-overlay', Z_FMSIM.CONFIDENTIAL_OVERLAY)
+registerWithPriority('StockerAbnormalBar', Z_FMSIM.STOCKER_ABNORMAL_BAR)
+registerWithPriority('StockerCarrierBar', Z_FMSIM.STOCKER_CARRIER_BAR)

package/src/factories/z-priority.ts

@@ -0,0 +1,60 @@
+/*
+ * fmsim 컴포넌트별 z-priority 상수.
+ *
+ * 같은 평면에 겹친 *다른 type 의* mesh 들이 GPU depth test 에서 결정적으로 정렬되도록
+ * 각 컴포넌트 type 마다 unique polygonOffset 값을 부여. 각 RealObject 가 자기 클래스에서
+ * `get zPriority(): number` override 로 이 상수 중 하나를 반환.
+ *
+ * 위치 (geometry vertex, object3d.position) 는 변경하지 않음 — depth buffer 의 fragment
+ * depth 값에만 미세 bias.
+ *
+ * 컨벤션 (높은 값 = 뒤로, 낮은 값 = 앞으로):
+ *
+ *   [14~17] 바닥 paths/lines (가장 뒤)
+ *   [11~13] 큰 영역 시각화 (container, 흐름 영역)
+ *   [10]    zone capacity bar (영역 표시)
+ *   [1~9]   바닥 설비 (facility)
+ *   [0]     이동 entity (AGV/OHT/Crane/Shuttle/Carrier) — default OBJECTS
+ *   [-1~-4] 설비 위 indicator bar (decal)
+ *   [-9~-10] overlay / popup (가장 앞)
+ */
+
+export const Z_FMSIM = {
+  // ── Floor paths (가장 뒤 — 바닥에 그려지는 선) ──────────────
+  AGV_LINE: 17,
+  OHT_LINE: 16,
+  CRANE_RAIL: 15,
+  NODE_PATH: 14,
+  PORT_FLOW: 13,
+
+  // ── Container 영역 ────────────────────────────────────────
+  STATIC_CONTAINER: 12,
+  FLOATING_CONTAINER: 11,
+
+  // ── Zone 표시 ─────────────────────────────────────────────
+  ZONE_CAPACITY_BAR: 10,
+
+  // ── 바닥 설비 (facility) ──────────────────────────────────
+  NODE: 9,
+  SCANNER: 8,
+  PORT: 7,
+  SHELF: 6,
+  STOCKER: 5,
+  CONVEYOR: 4,
+  CONVEYOR_JOIN: 3,
+  BUFFER: 2,
+  EQUIPMENT: 1,
+
+  // ── 이동 entity — priority 0 (default OBJECTS), polygonOffset 미적용 ──
+  // AGV, OHT, Crane, Shuttle, Carrier — override 안 함
+
+  // ── 설비 위 status indicator bar (decal) ─────────────────
+  MCS_GAUGE_CAPACITY_BAR: -1,
+  STOCKER_CAPACITY_BAR: -2,
+  STOCKER_CARRIER_BAR: -3,
+  STOCKER_ABNORMAL_BAR: -4,
+
+  // ── Overlay / popup (가장 앞) ──────────────────────────────
+  POPUP: -9,
+  CONFIDENTIAL_OVERLAY: -10
+} as const

package/src/index.ts

@@ -9,6 +9,8 @@ import './factories/oht-3d'
 import './factories/shuttle-3d'
 import './factories/crane-3d'
 import './factories/crane-rail-3d'
+// 기본 factory (RealObjectDomTexture) 쓰는 컴포넌트들의 z-priority override
+import './factories/z-priority-defaults'
 
 // ── side-effect: @sceneComponent 등록 (tree-shaking 방지) ──
 // bars & overlays

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

@@ -229,9 +229,9 @@ Object.defineProperty(ModelLayer.prototype, 'nature', {
  * 를 일괄 set → three-capability 의 변경 감지 핸들러가 즉시 갱신.
  */
 const LIGHT_PRESETS: Record<string, { exposure: number; hemiIntensity: number; dirLightIntensity: number }> = {
-  dark: { exposure: 0.7, hemiIntensity: 2.0, dirLightIntensity: 1.0 },
+  dark: { exposure: 1.2, hemiIntensity: 4.0, dirLightIntensity: 0.6 },
   medium: { exposure: 1.2, hemiIntensity: 4.0, dirLightIntensity: 2.0 },
-  bright: { exposure: 1.6, hemiIntensity: 6.0, dirLightIntensity: 3.0 }
+  bright: { exposure: 1.2, hemiIntensity: 4.0, dirLightIntensity: 5.0 }
 }
 
 const _origModelLayerOnchange = ModelLayer.prototype.onchange