From 1c367ba22bb5ba35b3a2de45f23af675d50eeff4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 四月 2024 17:19:36 +0800
Subject: [PATCH] #
---
src/core/warehouse.jsx | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index 0443611..3e5524c 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -1,10 +1,13 @@
import { useState, useEffect, useRef, useMemo } from 'react';
import { useFrame } from '@react-three/fiber';
import * as THREE from 'three';
-import Agv from '../components/agv';
-import Box from '../components/box';
-import tunnelData from '../assets/data/tunnel';
import Tunnel from '../components/tunnel';
+import Shelf from '../components/shelf';
+import Box from '../components/box';
+import Agv from '../components/agv';
+
+import tunnelData from '@/assets/data/tunnel';
+import shelfData from '@/assets/data/shelf';
import agvRealDataList from '@/assets/data/agv';
import { INTERVAL_TIME } from '@/config/setting'
@@ -15,7 +18,6 @@
const [agvData, setAgvData] = useState([
{}
]);
-
const [boxData, setBoxData] = useState([
{}
])
@@ -24,12 +26,10 @@
const timer = setInterval(() => {
const agvRealData = agvRealDataList[index];
if (agvRealData) {
- setAgvData((state) => {
- return agvRealData;
- });
+ setAgvData(agvRealData);
}
index++;
- }, INTERVAL_TIME);
+ }, INTERVAL_TIME * 1.1);
return () => {
clearInterval(timer);
@@ -37,12 +37,20 @@
}, [])
const tunnelEl = useMemo(() => {
- return tunnelData.map((tunnel, index) => <Tunnel key={index} {...tunnel} />)
+ return tunnelData.map((data, index) => <Tunnel key={index} {...data} />)
}, []);
- const agvEl = agvData.map((data, idx) => <Agv key={idx} {...data} />)
+ const shelfEl = useMemo(() => {
+ return shelfData.map((data, index) => <Shelf key={index} {...data} />)
+ }, []);
- const boxEl = boxData.map((data, idx) => <Box key={idx} {...data} />)
+ const agvEl = useMemo(() => {
+ return agvData.map((data, idx) => <Agv key={idx} {...data} />)
+ }, [agvData]);
+
+ const boxEl = useMemo(() => {
+ return boxData.map((data, idx) => <Box key={idx} {...data} />)
+ }, [boxData]);
useFrame((state, delta) => {
@@ -52,6 +60,7 @@
<>
<group>
{tunnelEl}
+ {shelfEl}
{agvEl}
{boxEl}
</group>
--
Gitblit v1.9.1