From afa8b789bf9ade50f8b76ad33776115a3ff2cc96 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 五月 2024 16:09:25 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index 4588a9d..b0cc514 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -13,6 +13,22 @@
REAL_COMPARE_MAP_OFFSET_Z,
} from '../config/setting'
+const getCorrectForkDis = (loaderAngle, forkDis) => {
+ if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
+ return -forkDis;
+ }
+ if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
+ return -forkDis;
+ }
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
+ return forkDis;
+ }
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ return forkDis;
+ }
+ return forkDis;
+}
+
const Agv = (props) => {
const { agvNo, position, trayList, hasBox } = props;
const theta = -props.theta;
@@ -23,7 +39,7 @@
const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 });
const [groupTheta, setGroupTheta] = useState(0);
const [loaderHeight, setLoaderHeight] = useState(0);
- const [integrateTheta, setIntegrateTheta] = useState(0);
+ const [loaderAngle, setLoaderAngle] = useState(0);
const [forkDis, setForkDis] = useState(0);
const [realTrayList, setRealTrayList] = useState([]);
@@ -52,9 +68,9 @@
// group theta
if (groupTheta !== theta && props.theta !== null) {
- const minTheta = Common.normalizeAngle(theta);
+ const targetTheta = Common.normalizeAngle(theta - groupTheta) + groupTheta;
new TWEEN.Tween({ value: groupTheta })
- .to({ value: minTheta }, INTERVAL_TIME)
+ .to({ value: targetTheta }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
.onUpdate((e) => {
setGroupTheta(e.value)
@@ -78,31 +94,24 @@
}
// loader theta
- const loaderAbsoluteAngle = (theta + loaderTheta) % 360;
- // console.log("integrateTheta", integrateTheta);
- // console.log("theta", theta);
- // console.log("loaderTheta", loaderTheta);
- // console.log("loaderAbsoluteAngle", loaderAbsoluteAngle);
- if (integrateTheta !== loaderAbsoluteAngle && props.loaderTheta !== null) {
- const minTheta = Common.normalizeAngle(loaderAbsoluteAngle);
- // const minTheta = Common.minDiffTheta(integrateTheta, loaderAbsoluteAngle);
- new TWEEN.Tween({ value: integrateTheta })
- .to({ value: minTheta }, INTERVAL_TIME)
+ const loaderTargetTheta = Common.normalizeAngle(loaderTheta + 90);
+ if (loaderAngle !== loaderTargetTheta && props.loaderTheta !== null) {
+ new TWEEN.Tween({ value: loaderAngle })
+ .to({ value: loaderTargetTheta }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
.onUpdate((e) => {
- setIntegrateTheta(e.value)
+ setLoaderAngle(e.value)
})
.onComplete((e) => {
- setIntegrateTheta(e.value)
+ setLoaderAngle(e.value)
}).start();
}
// fork lenght
- // console.log("forkDis", forkDis);
- // console.log("forkLength", forkLength);
if (forkDis !== forkLength && props.forkLength !== null) {
+ const targetForkDis = getCorrectForkDis(Common.positiveAngle(loaderTargetTheta), forkLength);
new TWEEN.Tween({ value: forkDis })
- .to({ value: forkLength }, INTERVAL_TIME)
+ .to({ value: targetForkDis }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
.onUpdate((e) => {
setForkDis(e.value)
@@ -158,21 +167,21 @@
<primitive object={bodyModel} castShadow />
<group
position-y={loaderHeight}
- rotation-y={Common.rotationParseNum(integrateTheta)}
+ rotation-y={Common.rotationParseNum(loaderAngle)}
>
<primitive object={loaderModel} castShadow position={[0, 20, 0]} />
<group position-z={forkDis}>
<primitive object={forkModel} castShadow position={[0, 25, 0]} />
- {hasBox && <Box position={[0, 24, 0]} />}
+ {hasBox && <Box position={[0, 26, 0]} />}
</group>
</group>
<group>
- {realTrayList?.[0]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 25, 0]} />}
- {realTrayList?.[1]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 48, 0]} />}
- {realTrayList?.[2]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 71, 0]} />}
- {realTrayList?.[3]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 94, 0]} />}
- {realTrayList?.[4]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 117, 0]} />}
- {realTrayList?.[5]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 140, 0]} />}
+ {realTrayList?.[0]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 34, 0]} />}
+ {realTrayList?.[1]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 66, 0]} />}
+ {realTrayList?.[2]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 99, 0]} />}
+ {realTrayList?.[3]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 131, 0]} />}
+ {realTrayList?.[4]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 163, 0]} />}
+ {realTrayList?.[5]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 195, 0]} />}
</group>
</group>
</>
--
Gitblit v1.9.1