@fmsim/machine 2.0.0-beta.19 → 2.0.0-beta.20

package/package.json

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

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

@@ -59,19 +59,9 @@ export class AGV3D extends RealObjectGroup {
     return DEFAULT_BODY_COLOR
   }
 
-  private _dataHandler?: () => void
-
   build() {
     super.build()
 
-    // data 변경 감지 (배터리 잔량 업데이트)
-    if (!this._dataHandler) {
-      this._dataHandler = (_after: any, _before: any) => {
-        if (_after.data !== undefined) this.updateBattery()
-      }
-      this.component.on('change', this._dataHandler)
-    }
-
     const { width = 10, height = 10 } = this.component.state
     const w = Math.abs(width)
     const h = Math.abs(height)
@@ -128,127 +118,9 @@ export class AGV3D extends RealObjectGroup {
     plat.receiveShadow = true
 
     this._ownMeshes = [bumper, body, plat]
-
-    // ── 배터리 실린더 (바디 뒷면, BATTERYRATE 데이터가 있을 때만) ──
-    if (this.getBatteryRate() > 0) {
-      const batteryMeshes = this.buildBattery(w, h, bumperH, bodyH)
-      this._ownMeshes.push(...batteryMeshes)
-    }
-
     for (const m of this._ownMeshes) this.object3d.add(m)
   }
 
-  private _batteryFillMesh?: THREE.Mesh
-  private _batteryLen = 0
-  private _batteryY = 0
-  private _batteryZ = 0
-
-  private buildBattery(agvW: number, agvH: number, bodyBottomY: number, bodyH: number): THREE.Mesh[] {
-    const radius = Math.min(agvW, agvH) * 0.15
-    this._batteryLen = agvW * 0.7
-    this._batteryY = bodyBottomY + bodyH * 0.5
-    this._batteryZ = -agvH / 2 - radius * 1.5
-
-    const rate = this.getBatteryRate()
-    const batteryColor = this.getBatteryColor(rate)
-    const innerRadius = radius * 0.85
-    const capWidth = radius * 0.3
-    const meshes: THREE.Mesh[] = []
-
-    // 투명 외장 (유리 쉘, 양단 막힘)
-    const shellGeo = new THREE.CylinderGeometry(radius, radius, this._batteryLen, 20)
-    shellGeo.rotateZ(Math.PI / 2)
-    const shellMat = new THREE.MeshStandardMaterial({
-      color: 0xffffff,
-      transparent: true,
-      opacity: 0.25,
-      roughness: 0.1,
-      metalness: 0.1,
-      side: THREE.DoubleSide,
-      depthWrite: false,
-    })
-    const shell = new THREE.Mesh(shellGeo, shellMat)
-    shell.position.set(0, this._batteryY, this._batteryZ)
-    meshes.push(shell)
-
-    // 좌측 캡 (금속)
-    const capGeo = new THREE.CylinderGeometry(radius * 0.6, radius, capWidth, 20)
-    capGeo.rotateZ(Math.PI / 2)
-    const capMat = new THREE.MeshStandardMaterial({
-      color: batteryColor, roughness: 0.3, metalness: 0.7,
-      emissive: batteryColor, emissiveIntensity: 0.2,
-    })
-    const leftCap = new THREE.Mesh(capGeo, capMat)
-    leftCap.position.set(-this._batteryLen / 2 - capWidth / 2, this._batteryY, this._batteryZ)
-    meshes.push(leftCap)
-
-    // 우측 캡 (금속)
-    const rightCapGeo = capGeo.clone()
-    const rightCap = new THREE.Mesh(rightCapGeo, capMat)
-    rightCap.position.set(this._batteryLen / 2 + capWidth / 2, this._batteryY, this._batteryZ)
-    rightCap.rotation.z = Math.PI
-    meshes.push(rightCap)
-
-    // 내부 잔량/빈 부분
-    const fillLen = Math.max(this._batteryLen * rate / 100, 0.1)
-    const emptyLen = Math.max(this._batteryLen - fillLen, 0.1)
-
-    // 빈 부분 (짙은 회색, 불투명, 양단 닫힘)
-    const emptyGeo = new THREE.CylinderGeometry(innerRadius, innerRadius, emptyLen, 16)
-    emptyGeo.rotateZ(Math.PI / 2)
-    const emptyMat = new THREE.MeshStandardMaterial({
-      color: 0x333333,
-      roughness: 0.6,
-      metalness: 0.2,
-      side: THREE.DoubleSide,
-    })
-    const emptyMesh = new THREE.Mesh(emptyGeo, emptyMat)
-    emptyMesh.position.set(
-      (this._batteryLen - emptyLen) / 2,
-      this._batteryY, this._batteryZ
-    )
-    meshes.push(emptyMesh)
-
-    // 잔량 채움 (상태 컬러)
-    const fillGeo = new THREE.CylinderGeometry(innerRadius * 0.98, innerRadius * 0.98, fillLen, 16)
-    fillGeo.rotateZ(Math.PI / 2)
-    const fillMat = new THREE.MeshStandardMaterial({
-      color: batteryColor,
-      roughness: 0.3,
-      metalness: 0.1,
-      emissive: batteryColor,
-      emissiveIntensity: 0.4,
-      side: THREE.DoubleSide,
-    })
-    this._batteryFillMesh = new THREE.Mesh(fillGeo, fillMat)
-    this._batteryFillMesh.position.set(
-      -(this._batteryLen - fillLen) / 2,
-      this._batteryY, this._batteryZ
-    )
-    meshes.push(this._batteryFillMesh)
-
-    return meshes
-  }
-
-  private getBatteryRate(): number {
-    const data = (this.component as any).data
-    return typeof data?.BATTERYRATE === 'number' ? data.BATTERYRATE : 0
-  }
-
-  private getBatteryColor(rate: number): number {
-    try {
-      const comp = this.component as any
-      if (comp.getBatteryColor) {
-        const color = comp.getBatteryColor(rate)
-        if (color) return new THREE.Color(color).getHex()
-      }
-    } catch { /* fallback */ }
-    // 기본: 녹색 > 노랑 > 빨강
-    if (rate > 50) return 0x4caf50
-    if (rate > 20) return 0xffc107
-    return 0xf44336
-  }
-
   updateDimension() {}
 
   update() {
@@ -286,11 +158,6 @@ export class AGV3D extends RealObjectGroup {
 
     super.onchange(after, before)
   }
-
-  private updateBattery() {
-    // 전체 rebuild로 정확한 geometry 생성
-    this.update()
-  }
 }
 
 registerRealObjectFactory('AGV', (component: Component) => new AGV3D(component))

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

@@ -637,7 +637,7 @@ const PORT_CONFIG: MCS3DConfig = {
   ...DEFAULTS,
   depthRatio: 0.01,
   defaultZPosFromParent: true,
-  opacity: 1,
+  opacity: 0.1,
   metalness: 0.3,
   roughness: 0.8,
   defaultColor: 0xb0a090,
@@ -656,13 +656,12 @@ register('Shelf', {
 const CARRIER_CONFIG: MCS3DConfig = {
   ...DEFAULTS,
   depthRatio: 0.5,
-  metalness: 0.2,
-  roughness: 0.8,
+  metalness: 0,
+  roughness: 1,
   defaultColor: 0x66bb66,
   isVisible: (c: Component) => !!(c.state as any).id,
   sizeRatio: 0.8,
   texturedTop: true,
-  emissiveIntensity: 0.4,
 }
 
 class CarrierRealObject3D extends MCSRealObject3D {