From d12d58f9df8a8a05466496e12f2dbd02e8f51a31 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 05 五月 2024 16:29:49 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index e63648d..8de561a 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -5,7 +5,13 @@
import Box from './box';
import * as Common from '../utils/common';
import * as TWEEN from "@tweenjs/tween.js";
-import { INTERVAL_TIME, MODEL_AGV_SCALE } from '@/config/setting'
+import {
+ INTERVAL_TIME,
+ MODEL_AGV_SCALE,
+ REAL_COMPARE_MAP_SCALE,
+ REAL_COMPARE_MAP_OFFSET_X,
+ REAL_COMPARE_MAP_OFFSET_Z,
+} from '../config/setting'
const Agv = (props) => {
const { agvNo, position, theta, height, loaderTheta, forkLength, trayList, hasBox } = props;
@@ -22,10 +28,15 @@
}
// group position
+ // const pos = {
+ // x: position?.[0],
+ // y: position?.[1],
+ // z: position?.[2],
+ // }
const pos = {
- x: position?.[0],
- y: position?.[1],
- z: position?.[2],
+ x: position?.[0] * REAL_COMPARE_MAP_SCALE + REAL_COMPARE_MAP_OFFSET_X,
+ y: position?.[1] * REAL_COMPARE_MAP_SCALE,
+ z: position?.[2] * REAL_COMPARE_MAP_SCALE + REAL_COMPARE_MAP_OFFSET_Z,
}
if (!Common.deepEqual(groupPos, pos)) {
new TWEEN.Tween(groupPos)
@@ -67,8 +78,9 @@
}
// loader theta
- if (integrateTheta !== loaderTheta) {
- const minTheta = Common.minDiffTheta(integrateTheta, loaderTheta);
+ const loaderAbsoluteAngle = (theta + loaderTheta) % 360;
+ if (integrateTheta !== loaderAbsoluteAngle) {
+ const minTheta = Common.minDiffTheta(integrateTheta, loaderAbsoluteAngle);
new TWEEN.Tween({ value: integrateTheta })
.to({ value: minTheta }, INTERVAL_TIME)
.easing(TWEEN.Easing.Linear.None)
--
Gitblit v1.9.1