@fmsim/machine 2.0.0-beta.52 → 2.0.0-beta.53

package/package.json

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

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

@@ -10,7 +10,7 @@
  * Based on operato-scene Vehicle3D, adapted for fmsim:
  *   - extends RealObjectGroup (Conveyor3D와 동일 패턴)
  *   - statusColor from MCSStatusMixin
- *   - 바닥 원점 (y=0~depth)
+ *   - 볼륨 중심 원점 (things-scene 기본 컨벤션) - mesh 로컬 [-d/2, +d/2]
  */
 
 import * as THREE from 'three'
@@ -30,10 +30,6 @@ export class AGV3D extends RealObjectGroup {
     return depth || TRANSPORT_SURFACE_HEIGHT
   }
 
-  protected get syncZPosOffset(): number {
-    return 0
-  }
-
   private resolveColor(): number {
     const comp = this.component as any
 
@@ -118,7 +114,8 @@ export class AGV3D extends RealObjectGroup {
     plat.receiveShadow = true
 
     this._ownMeshes = [bumper, body, plat]
-    for (const m of this._ownMeshes) this.object3d.add(m)
+    // ownGroup이 center-origin ↔ bottom-up 좌표계 변환을 자동 처리
+    for (const m of this._ownMeshes) this.components3D.add(m)
   }
 
   updateDimension() {}
@@ -126,7 +123,7 @@ export class AGV3D extends RealObjectGroup {
   update() {
     // 자신의 mesh만 제거 (Carrier 등 자식 컴포넌트 3D 보존)
     for (const m of this._ownMeshes) {
-      this.object3d.remove(m)
+      this.components3D.remove(m)
       disposeObject3D(m)
     }
     this._ownMeshes = []

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

@@ -27,12 +27,6 @@ export class Conveyor3D extends RealObjectGroup {
     return depth || TRANSPORT_SURFACE_HEIGHT
   }
 
-  // group origin = 바닥 (y=0). MCSRealObject3D와 동일 컨벤션.
-  // 기하는 build()에서 y=0(바닥)~y=depth(상단) 범위로 배치.
-  protected get syncZPosOffset(): number {
-    return 0
-  }
-
   private resolveColor(): number {
     const comp = this.component as any
 
@@ -172,7 +166,7 @@ export class Conveyor3D extends RealObjectGroup {
     const frameMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(frameGeometries), frameMaterial)
     frameMesh.castShadow = true
     frameMesh.receiveShadow = true
-    this.object3d.add(frameMesh)
+    this.components3D.add(frameMesh)
 
     // --- Rollers, Belt, or Rails ---
     if (conveyorType === 'rail') {
@@ -237,7 +231,7 @@ export class Conveyor3D extends RealObjectGroup {
         new THREE.MeshStandardMaterial({ color, metalness: 0.9, roughness: 0.2 })
       )
       rollerMesh.castShadow = true
-      this.object3d.add(rollerMesh)
+      this.components3D.add(rollerMesh)
     }
   }
 
@@ -274,7 +268,7 @@ export class Conveyor3D extends RealObjectGroup {
       new THREE.MeshStandardMaterial({ color: ROLLER_COLOR, metalness: 0.9, roughness: 0.2 })
     )
     drumMesh.castShadow = true
-    this.object3d.add(drumMesh)
+    this.components3D.add(drumMesh)
 
     // Belt surface
     const beltThickness = drumRadius * 0.12
@@ -292,7 +286,7 @@ export class Conveyor3D extends RealObjectGroup {
     const flatMesh = new THREE.Mesh(flatGeo, beltMaterial)
     flatMesh.position.set(0, beltY + drumRadius, 0)
     flatMesh.castShadow = true
-    this.object3d.add(flatMesh)
+    this.components3D.add(flatMesh)
 
     // Belt wrap around drums (segmented half-cylinder)
     const wrapSegments = 12
@@ -328,7 +322,7 @@ export class Conveyor3D extends RealObjectGroup {
       }
       const wrapMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(wrapGeometries), beltMaterial)
       wrapMesh.castShadow = true
-      this.object3d.add(wrapMesh)
+      this.components3D.add(wrapMesh)
     }
 
     // Flat belt bottom (return path)
@@ -337,7 +331,7 @@ export class Conveyor3D extends RealObjectGroup {
       : new THREE.BoxGeometry(flatLen, beltThickness, drumLength * 0.85)
     const bottomMesh = new THREE.Mesh(bottomGeo, beltMaterial)
     bottomMesh.position.set(0, beltY - drumRadius, 0)
-    this.object3d.add(bottomMesh)
+    this.components3D.add(bottomMesh)
   }
 
   private buildRails(width: number, height: number, depth: number, frameH: number, railW: number, isVertical: boolean = false) {
@@ -375,7 +369,7 @@ export class Conveyor3D extends RealObjectGroup {
 
     const railMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(railGeometries), railMaterial)
     railMesh.castShadow = true
-    this.object3d.add(railMesh)
+    this.components3D.add(railMesh)
   }
 
   updateDimension() {}

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

@@ -27,10 +27,6 @@ export class Crane3D extends RealObjectGroup {
     return depth || 5 * TRANSPORT_SURFACE_HEIGHT - 2
   }
 
-  protected get syncZPosOffset(): number {
-    return 0
-  }
-
   private resolveColor(): number {
     const comp = this.component as any
 
@@ -62,6 +58,8 @@ export class Crane3D extends RealObjectGroup {
     const d = this.effectiveDepth
     if (!w || !h) return
 
+    const inner = this.components3D
+
     // 높이 배분: 하단 클램프 4%, 마스트 92%, 상단 클램프 4%
     const clampH = d * 0.04
     const mastH = d * 0.92
@@ -81,7 +79,7 @@ export class Crane3D extends RealObjectGroup {
     const bottomClamp = new THREE.Mesh(bottomClampGeo, clampMat)
     bottomClamp.position.y = clampH / 2
     bottomClamp.castShadow = true
-    this.object3d.add(bottomClamp)
+    inner.add(bottomClamp)
 
     // ── 2. 수직 마스트 (좌우 기둥 + 상·하 가로 연결 바) ──
     const mastBaseY = clampH
@@ -115,7 +113,7 @@ export class Crane3D extends RealObjectGroup {
 
     const mastMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(mastGeometries), mastMat)
     mastMesh.castShadow = true
-    this.object3d.add(mastMesh)
+    inner.add(mastMesh)
 
     // ── 3. 캐리지 포크 (마스트 40% 높이, 양쪽으로 뻗는 포크 암) ──
     const forkY = mastBaseY + mastH * 0.4
@@ -151,14 +149,14 @@ export class Crane3D extends RealObjectGroup {
 
     const forkMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(forkGeometries), forkMat)
     forkMesh.castShadow = true
-    this.object3d.add(forkMesh)
+    inner.add(forkMesh)
 
     // ── 4. 상단 클램프 (천장 레일에 물리는 가이드부) ──
     const topClampGeo = new THREE.BoxGeometry(clampW, clampH, clampD)
     const topClamp = new THREE.Mesh(topClampGeo, clampMat)
     topClamp.position.y = mastBaseY + mastH + clampH / 2
     topClamp.castShadow = true
-    this.object3d.add(topClamp)
+    inner.add(topClamp)
   }
 
   updateDimension() {}

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

@@ -28,10 +28,6 @@ export class CraneRail3D extends RealObjectGroup {
     return depth || DEFAULT_RAIL_DEPTH
   }
 
-  protected get syncZPosOffset(): number {
-    return 0
-  }
-
   build() {
     super.build()
 
@@ -41,6 +37,8 @@ export class CraneRail3D extends RealObjectGroup {
     const d = this.effectiveDepth
     if (!w || !h) return
 
+    const inner = this.components3D
+
     const railH = Math.max(d * 0.02, 2) // 레일 높이 (얇은 트랙)
     const railW = Math.max(h * 0.06, 2) // 레일 폭
     const supportThick = Math.max(Math.min(w, h) * 0.05, 2)
@@ -67,7 +65,7 @@ export class CraneRail3D extends RealObjectGroup {
     const bottomMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(bottomGeometries), railMat)
     bottomMesh.castShadow = true
     bottomMesh.receiveShadow = true
-    this.object3d.add(bottomMesh)
+    inner.add(bottomMesh)
 
     // ── 천장 가이드 레일 (2개 평행 트랙) ──
     const topGeometries: THREE.BufferGeometry[] = []
@@ -78,7 +76,7 @@ export class CraneRail3D extends RealObjectGroup {
     }
     const topMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(topGeometries), railMat)
     topMesh.castShadow = true
-    this.object3d.add(topMesh)
+    inner.add(topMesh)
 
     // ── 양 끝단 수직 지지대 (바닥~천장 연결) ──
     const supportH = d - railH * 2
@@ -96,7 +94,7 @@ export class CraneRail3D extends RealObjectGroup {
     }
     const supportMesh = new THREE.Mesh(BufferGeometryUtils.mergeGeometries(supportGeometries), supportMat)
     supportMesh.castShadow = true
-    this.object3d.add(supportMesh)
+    inner.add(supportMesh)
   }
 
   updateDimension() {}

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

@@ -91,29 +91,35 @@ class MCSRealObject3D extends RealObjectGroup {
   }
 
   protected get syncZPosOffset(): number {
+    // syncZPosOffset = placement + geometric (center origin = effectiveDepth/2)
+    // 중첩 보정(parent shift 상쇄)은 base RealObject.cz가 parent.geometricOffsetY를
+    // 빼는 방식으로 처리하므로 여기선 placement + 본인 geometric만 반환
+    const halfD = this.effectiveDepth / 2
     // zPosOverride: 고정 높이 (OHTLine 등)
     if (this._config.zPosOverride != null) {
-      return this._config.zPosOverride
+      return this._config.zPosOverride + halfD
     }
     // Port: 이송 표면 높이에 배치
     if (this._config.defaultZPosFromParent) {
-      return TRANSPORT_SURFACE_HEIGHT
+      return TRANSPORT_SURFACE_HEIGHT + halfD
     }
     // Carrier: 부모 유형에 따라 배치 위치 결정
     if (this._config.sizeRatio && this._config.sizeRatio < 1) {
       const parentType = this.component.parent?.state?.type
-      // OHT: 그리퍼 아래에 매달림 (캐리어 상단이 OHT 하단에 붙음)
+      // OHT: 그리퍼 아래에 매달림 — placement = -effectiveDepth(carrier top이 OHT bottom)
       if (parentType === 'OHT') {
-        return -this.effectiveDepth
+        return -this.effectiveDepth + halfD
       }
       if (parentType === 'Port' || parentType === 'Shelf' || parentType === 'Shuttle') {
-        return 0
+        return halfD
       }
-      return TRANSPORT_SURFACE_HEIGHT
+      return TRANSPORT_SURFACE_HEIGHT + halfD
     }
-    return 0
+    return halfD
   }
 
+  // geometric 부분(center origin: depth/2)은 base 기본값 사용 — override 불필요
+
   // 컴포넌트의 상태 색상(statusColor) 또는 fillStyle → Three.js 색상 변환
   protected resolveColor(): number {
     const comp = this.component as any
@@ -285,11 +291,14 @@ class MCSRealObject3D extends RealObjectGroup {
     }
 
     this._ownMesh = new THREE.Mesh(geometry, meshMaterial)
-    // sizeRatio < 1이면 부모 중심에 배치 (rawDepth/2), plane은 살짝 띄움
-    this._ownMesh.position.y = isPlane ? 1 : ratio < 1 ? rawDepth / 2 : depth / 2
+    // ownGroup 기준(bottom-up): mesh 바닥을 y=0에 맞추고 ownGroup이 -d/2로 shift해
+    // center-origin object3d에 정렬됨.
+    //   box/hexagon (center-local geometry): y=rawDepth/2 (바닥을 0에 맞춤)
+    //   plane: y=1 (바닥 살짝 띄움)
+    this._ownMesh.position.y = isPlane ? 1 : rawDepth / 2
     this._ownMesh.castShadow = !isPlane
     this._ownMesh.receiveShadow = true
-    this.object3d.add(this._ownMesh)
+    this.components3D.add(this._ownMesh)
   }
 
   // ── Change handling ──
@@ -384,7 +393,7 @@ class MCSRealObject3D extends RealObjectGroup {
   update() {
     // 자신의 mesh만 제거 (자식 컴포넌트 3D 오브젝트 보존)
     if (this._ownMesh) {
-      this.object3d.remove(this._ownMesh)
+      this.components3D.remove(this._ownMesh)
       disposeObject3D(this._ownMesh)
       this._ownMesh = undefined
     }
@@ -642,8 +651,9 @@ class StockerRealObject3D extends MCSRealObject3D {
     mat.polygonOffsetUnit = -2
 
     this.gaugeMesh = new THREE.Mesh(geo, mat)
+    // ownGroup 기준(bottom-up): 볼륨 상단 = +depth. 그 위로 0.5 띄움.
     this.gaugeMesh.position.set(0, depth + 0.5, 0)
-    this.object3d.add(this.gaugeMesh)
+    this.components3D.add(this.gaugeMesh)
   }
 
   private resolveGauge(data: any, mode: string) {
@@ -718,7 +728,7 @@ class StockerRealObject3D extends MCSRealObject3D {
 
   private clearGauge() {
     if (this.gaugeMesh) {
-      this.object3d.remove(this.gaugeMesh)
+      this.components3D.remove(this.gaugeMesh)
       this.gaugeMesh.geometry?.dispose()
       const mat = this.gaugeMesh.material as THREE.MeshBasicMaterial
       mat?.map?.dispose()

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

@@ -30,9 +30,9 @@ export class OHT3D extends RealObjectGroup {
     return depth || TRANSPORT_SURFACE_HEIGHT
   }
 
-  /** 천장 레일 높이에 배치 */
+  /** 천장 레일 높이에 배치 (center origin 기준: 레일 높이 + 볼륨 중심 반깊이) */
   protected get syncZPosOffset(): number {
-    return OHT_RAIL_HEIGHT
+    return OHT_RAIL_HEIGHT + this.effectiveDepth / 2
   }
 
   private resolveColor(): number {
@@ -155,14 +155,14 @@ export class OHT3D extends RealObjectGroup {
     }
 
     this._ownMeshes = [gripperMesh, armMesh, bodyMesh, trolleyMesh, ...wheelMeshes]
-    for (const m of this._ownMeshes) this.object3d.add(m)
+    for (const m of this._ownMeshes) this.components3D.add(m)
   }
 
   updateDimension() {}
 
   update() {
     for (const m of this._ownMeshes) {
-      this.object3d.remove(m)
+      this.components3D.remove(m)
       disposeObject3D(m)
     }
     this._ownMeshes = []

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

@@ -27,10 +27,6 @@ export class Shuttle3D extends RealObjectGroup {
     return depth || TRANSPORT_SURFACE_HEIGHT
   }
 
-  protected get syncZPosOffset(): number {
-    return 0
-  }
-
   private resolveColor(): number {
     const comp = this.component as any
 
@@ -142,14 +138,14 @@ export class Shuttle3D extends RealObjectGroup {
     forkMesh.castShadow = true
 
     this._ownMeshes = [baseMesh, mastMesh, forkMesh]
-    for (const m of this._ownMeshes) this.object3d.add(m)
+    for (const m of this._ownMeshes) this.components3D.add(m)
   }
 
   updateDimension() {}
 
   update() {
     for (const m of this._ownMeshes) {
-      this.object3d.remove(m)
+      this.components3D.remove(m)
       disposeObject3D(m)
     }
     this._ownMeshes = []