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 | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index 31e88be..8de561a 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -5,10 +5,16 @@
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 { position, theta, height, loaderTheta, forkLength, trayList, hasBox } = props;
+ const { agvNo, position, theta, height, loaderTheta, forkLength, trayList, hasBox } = props;
const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 });
const [groupTheta, setGroupTheta] = useState(0);
@@ -20,11 +26,17 @@
if (!props || Object.keys(props).length === 0) {
return;
}
+
// 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)
@@ -66,10 +78,9 @@
}
// loader theta
- if (integrateTheta !== loaderTheta) {
- console.log(integrateTheta, loaderTheta);
- const minTheta = Common.minDiffTheta(integrateTheta, loaderTheta);
- console.log(minTheta);
+ 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)
@@ -144,6 +155,14 @@
{hasBox && <Box position={[0, 24, 0]} />}
</group>
</group>
+ <group>
+ {trayList?.[0]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 25, 0]} />}
+ {trayList?.[1]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 48, 0]} />}
+ {trayList?.[2]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 71, 0]} />}
+ {trayList?.[3]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 94, 0]} />}
+ {trayList?.[4]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 117, 0]} />}
+ {trayList?.[5]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 140, 0]} />}
+ </group>
</group>
</>
)
--
Gitblit v1.9.1