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 | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index caf04bb..b0cc514 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -15,16 +15,16 @@
const getCorrectForkDis = (loaderAngle, forkDis) => {
if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
- return forkDis;
+ return -forkDis;
}
- if (loaderAngle > 360 - 10 && loaderAngle < 0 + 10) {
+ if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
return -forkDis;
}
if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
- return -forkDis;
+ return forkDis;
}
if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
- return -forkDis;
+ return forkDis;
}
return forkDis;
}
@@ -94,14 +94,8 @@
}
// loader theta
- let loaderTargetTheta;
- const loaderAbsoluteAngle = (theta + loaderTheta) % 360;
- if (loaderAngle !== loaderAbsoluteAngle && props.loaderTheta !== null) {
- console.log("theta", theta);
- console.log("loaderTheta", loaderTheta);
- console.log("loaderAbsoluteAngle", loaderAbsoluteAngle);
- loaderTargetTheta = Common.normalizeAngle(loaderAbsoluteAngle - loaderAngle) + loaderAngle;
- console.log("loaderTargetTheta", loaderTargetTheta);
+ 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)
@@ -178,16 +172,16 @@
<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