diff --git a/src/core/base/BaseRenderer.ts b/src/core/base/BaseRenderer.ts index cd8e9ba..ce7452d 100644 --- a/src/core/base/BaseRenderer.ts +++ b/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 diff --git a/src/modules/amr/fm600/FM600PropertySetter.ts b/src/modules/amr/fm600/FM600PropertySetter.ts index 2cc8a18..1a13e27 100644 --- a/src/modules/amr/fm600/FM600PropertySetter.ts +++ b/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: {}, }, ], diff --git a/src/modules/bracket/BracketRenderer.ts b/src/modules/bracket/BracketRenderer.ts index 77f5f3d..de1a8cf 100644 --- a/src/modules/bracket/BracketRenderer.ts +++ b/src/modules/bracket/BracketRenderer.ts @@ -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 @@ -113,13 +113,13 @@ export default class BracketRenderer extends BaseRenderer { // 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.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(option.rotation[0]), - THREE.MathUtils.degToRad(option.rotation[1]), - THREE.MathUtils.degToRad(option.rotation[2]) + THREE.MathUtils.degToRad(item.tf[1][0]), + THREE.MathUtils.degToRad(item.tf[1][1]), + THREE.MathUtils.degToRad(item.tf[1][2]) ) return group