Merge remote-tracking branch 'origin/jx-test' into jx-test

src/core/base/BaseRenderer.ts

@@ -177,6 +177,17 @@ export default abstract class BaseRenderer {
         console.error(`无法获取物品 ${item.id} 的存储位置`)
       }
 
+      // 观察这个地方是不是已经有物品了
+      const existsGoods = this.tempViewport.runtimeManager?.getItemsByRack(item.dt.storeAt?.item)
+      if (existsGoods?.size > 0) {
+        let sumHeight = 0
+        for(let goodId of existsGoods) {
+          const itemJson = this.tempViewport.entityManager.findItemById(goodId)
+          sumHeight += itemJson.tf[2][1]
+        }
+        position[1] += sumHeight
+      }
+
       option.position = position
       option.rotation = rotation
       option.getParentObject3D = getParentObject3D

src/modules/amr/fm600/FM600PropertySetter.ts

@@ -14,7 +14,7 @@ const propertySetter: PropertySetter = {
                 inputProps: {},
             },
             {
-              dataPath: 'state', label: 'ptr控制', input: 'PtrController',
+              dataPath: 'state', label: 'FM600控制', input: 'PtrController',
               inputProps: {},
             },
         ],

src/modules/bracket/BracketRenderer.ts

@@ -3,7 +3,7 @@ import BaseRenderer from '@/core/base/BaseRenderer.ts'
 import { decimalSumBy } from '@/core/ModelUtils'
 import Constract from '@/core/Constract.ts'
 import type Viewport from '@/core/engine/Viewport.ts'
-import Bracket3dObject from "@/modules/bracket/Bracket3dObject";
+import Bracket3dObject from '@/modules/bracket/Bracket3dObject'
 
 /**
  * 货架货位渲染器
@@ -17,7 +17,7 @@ export default class BracketRenderer extends BaseRenderer {
    * 默认点的高度, 防止和地面重合
    */
   readonly defulePositionY: number = Constract.HEIGHT_WAY
-  readonly defaultScale: THREE.Vector3 = new THREE.Vector3(1, 1, 1)
+  readonly defaultScale: THREE.Vector3 = new THREE.Vector3(0.85, 0.35, 0.85)
   readonly defaultRotation: THREE.Vector3 = new THREE.Vector3(0, 0, 0)
   readonly defaultLineWidth: number = 0.05
 
@@ -43,15 +43,15 @@ export default class BracketRenderer extends BaseRenderer {
   }
 
   createLine(start: ItemJson, end: ItemJson, type: LinkType, option?: RendererCudOption) {
-    // throw new Error('not allow store line.')
+    throw new Error('not allow store line.')
   }
 
   createLineBasic(start: ItemJson, end: ItemJson, type: LinkType) {
-    // throw new Error('not allow store line.')
+    throw new Error('not allow store line.')
   }
 
   updateLine(start: ItemJson, end: ItemJson, type: LinkType, option?: RendererCudOption) {
-    // throw new Error('not allow store line.')
+    throw new Error('not allow store line.')
   }
 
   getStorePlacement(me: ItemJson, bay = 0, level = 0, cell = 0): { position: [number, number, number], rotation: [number, number, number] } {
@@ -71,7 +71,7 @@ export default class BracketRenderer extends BaseRenderer {
     // 禁止缩放，
     item.tf[2][0] = 0.85
     item.tf[2][1] = 0.35
-    item.tf[2][3] = 0.85
+    item.tf[2][2] = 0.85
 
 
     // 更新放在内部的所有箱子
@@ -109,8 +109,12 @@ export default class BracketRenderer extends BaseRenderer {
     const group = new Bracket3dObject(item, option)
     group.name = BracketRenderer.POINT_NAME
 
+    this.calcMeshMatrix(item, option)
+    // group.setMatrix4(matrix)
+
     // 设置位置
     group.position.set(item.tf[0][0], item.tf[0][1], item.tf[0][2])
+    // group.position.set(option.position[0], option.position[1], option.position[2])
 
     group.rotation.set(
       THREE.MathUtils.degToRad(item.tf[1][0]),