From 9f1744708955e2f14284925c20d12ad0486c3f30 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 五月 2024 12:59:58 +0800
Subject: [PATCH] #
---
src/utils/common.js | 4 ++++
src/components/agv.jsx | 25 ++++++++++++++++++-------
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index fe06e45..8e315e4 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -14,7 +14,19 @@
} 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) => {
@@ -82,12 +94,12 @@
}
// loader theta
+ let loaderTargetTheta;
const loaderAbsoluteAngle = (theta + loaderTheta) % 360;
if (loaderAngle !== loaderAbsoluteAngle && props.loaderTheta !== null) {
- const targetTheta = Common.normalizeAngle(loaderAbsoluteAngle - loaderAngle) + loaderAngle;
- console.log(targetTheta);
+ loaderTargetTheta = Common.normalizeAngle(loaderAbsoluteAngle - loaderAngle) + loaderAngle;
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)
@@ -98,11 +110,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)
diff --git a/src/utils/common.js b/src/utils/common.js
index 4044069..6fc9711 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -28,6 +28,10 @@
return (targetTheta - originTheta > 180) ? targetTheta - 360 : targetTheta;
}
+export const positiveAngle = (angle) => {
+ return ((angle % 360) + 360) % 360;
+}
+
export const normalizeAngle = (angle) => {
let newAngle = angle % 360;
--
Gitblit v1.9.1