From 65ab695aadfac96fa121986cf1b53966aeab7c2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 四月 2024 15:34:10 +0800
Subject: [PATCH] #
---
src/components/box.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/box.jsx b/src/components/box.jsx
index a3dd4dc..af0d2d7 100644
--- a/src/components/box.jsx
+++ b/src/components/box.jsx
@@ -2,7 +2,7 @@
import { useFrame } from '@react-three/fiber';
import { useFBX, useAnimations } from '@react-three/drei';
import * as THREE from 'three';
-import { MODEL_BOX_SCALE } from '@/config/setting'
+import { MODEL_BOX_SCALE, SHELF_BAY_GROUP_COUNT } from '@/config/setting'
import * as Common from '../utils/common';
import { useStore } from '@/store';
@@ -11,7 +11,7 @@
}
const getShelfBay = (bay) => {
- return bay - (bay - 1) % 3;
+ return bay - (bay - 1) % SHELF_BAY_GROUP_COUNT;
}
const getShelfLev = (lev) => {
@@ -19,7 +19,7 @@
}
const getShelfNo = (row, bay, lev) => {
- return getShelfRow(row) + '-' + getShelfBay(bay) + '-' + getShelfLev(lev);
+ return Common.generateLocNo(getShelfRow(row), getShelfBay(bay), getShelfLev(lev));
}
const Box = (props) => {
@@ -27,6 +27,7 @@
const state = useStore();
const [pos, setPos] = useState([]);
+ const [rotaY, setRotaY] = useState(0);
const boxModel = useMemo(() => {
const fbx = useFBX('/models/box/box.fbx');
@@ -42,16 +43,22 @@
// from shelf
const shelfNo = getShelfNo(row, bay, lev);
const shelfPos = state.shelfList[shelfNo];
- setPos(shelfPos);
+ const { row: shelfRow, bay: shelfBay, lev: shelfLev } = Common.parseLocNo(shelfNo);
+
+ console.log([shelfPos[0], shelfPos[1] + (bay - shelfBay) * 100, shelfPos[2] + (lev - shelfLev) * 100]);
+
+ setPos([shelfPos[0], shelfPos[1] + (bay - shelfBay) * 10, shelfPos[2] + (lev - shelfLev) * 100]);
+ setRotaY(Math.PI / 2);
} else {
// from agv
setPos(position);
+ setRotaY(rotationY);
}
}, [props]);
return (
<>
- <group rotation-y={rotationY} position={pos}>
+ <group rotation-y={rotaY} position={pos}>
<primitive object={boxModel} castShadow />
</group>
</>
--
Gitblit v1.9.1