From 19d6c1cbe579409b4fdf77530300b29aa63518d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 五月 2024 10:39:12 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index 4588a9d..afbaff0 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -23,7 +23,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 +52,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)
@@ -79,21 +79,16 @@
// 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)
+ if (loaderAngle !== loaderAbsoluteAngle && props.loaderTheta !== null) {
+ const targetTheta = Common.normalizeAngle(loaderAbsoluteAngle - loaderAngle) + loaderAngle;
+ new TWEEN.Tween({ value: loaderAngle })
+ .to({ value: targetTheta }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
.onUpdate((e) => {
- setIntegrateTheta(e.value)
+ setLoaderAngle(e.value)
})
.onComplete((e) => {
- setIntegrateTheta(e.value)
+ setLoaderAngle(e.value)
}).start();
}
@@ -158,7 +153,7 @@
<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}>
--
Gitblit v1.9.1