From efd99f2395add0e6004d6486f13a3ecd9499e159 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 09 五月 2024 13:40:01 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index afbaff0..2930607 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -13,11 +13,45 @@
REAL_COMPARE_MAP_OFFSET_Z,
} from '../config/setting'
+const getCorrectForkDis = (loaderAngle, forkDis) => {
+ if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
+ return -forkDis;
+ }
+ if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
+ return -forkDis;
+ }
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
+ return forkDis;
+ }
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ return forkDis;
+ }
+ return forkDis;
+}
+
+const getLoaderHasBox = (loaderAngle, finger1, finger2, finger3, finger4) => {
+ // console.log(loaderAngle, finger1, finger2, finger3, finger4);
+ if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
+ return finger1 && finger2; // 鍙栬揣鏄鐨�
+ }
+ if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
+ return finger3 && finger4; // 鏀捐揣鏄鐨�
+ }
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
+ return finger1 && finger2;
+ }
+ if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ return finger1 && finger2;
+ }
+ return finger1 && finger2 && finger3 && finger4;
+}
+
const Agv = (props) => {
- const { agvNo, position, trayList, hasBox } = props;
+ const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4 } = props;
const theta = -props.theta;
- const height = props.height * 0.04;
+ const height = props.height * 0.0655;
const forkLength = props.forkLength * 0.1;
+ console.log(props.forkLength);
const loaderTheta = Number(props.loaderTheta?.toFixed(1));
const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 });
@@ -78,11 +112,10 @@
}
// loader theta
- const loaderAbsoluteAngle = (theta + loaderTheta) % 360;
- if (loaderAngle !== loaderAbsoluteAngle && props.loaderTheta !== null) {
- const targetTheta = Common.normalizeAngle(loaderAbsoluteAngle - loaderAngle) + loaderAngle;
+ const loaderTargetTheta = Common.normalizeAngle(loaderTheta + 90);
+ if (loaderAngle !== loaderTargetTheta && props.loaderTheta !== null) {
new TWEEN.Tween({ value: loaderAngle })
- .to({ value: targetTheta }, INTERVAL_TIME)
+ .to({ value: loaderTargetTheta }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
.onUpdate((e) => {
setLoaderAngle(e.value)
@@ -93,11 +126,10 @@
}
// 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)
@@ -122,7 +154,7 @@
if (!fbx.castShadow) {
Common.setShadow(fbx);
}
- fbx.scale.set(MODEL_AGV_SCALE, MODEL_AGV_SCALE, MODEL_AGV_SCALE);
+ fbx.scale.set(MODEL_AGV_SCALE, MODEL_AGV_SCALE * 0.97, MODEL_AGV_SCALE);
return fbx.clone();
}, [])
@@ -155,19 +187,19 @@
position-y={loaderHeight}
rotation-y={Common.rotationParseNum(loaderAngle)}
>
- <primitive object={loaderModel} castShadow position={[0, 20, 0]} />
+ <primitive object={loaderModel} castShadow position={[0, 0, 0]} />
<group position-z={forkDis}>
- <primitive object={forkModel} castShadow position={[0, 25, 0]} />
- {hasBox && <Box position={[0, 24, 0]} />}
+ <primitive object={forkModel} castShadow position={[0, 6, 0]} />
+ {(hasBox || getLoaderHasBox(loaderAngle, finger1, finger2, finger3, finger4)) && <Box position={[0, 6, 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