From 95b5cc27cea4d2f846883738789cebf29246b738 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 09 五月 2024 14:34:10 +0800
Subject: [PATCH] #
---
src/components/agv.jsx | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index 3c9f99b..137ce38 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -30,16 +30,59 @@
}
const getLoaderHasBox = (loaderAngle, finger1, finger2, finger3, finger4) => {
+ // console.log(loaderAngle, finger1, finger2, finger3, finger4);
if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) {
- return finger3 && finger4;
+ return finger1 && finger2; // 鍙栬揣鏄鐨� 鏀捐揣鏄敊鐨� 锛堝彸锛�
+ /**
+ * 2鎺� (0)
+ *
+ * 鍙栬揣
+ * 0 false false false false
+ * 0 false false true true
+ * 0 true true true true
+ *
+ * 鏀捐揣
+ *
+ * 0 true true true true
+ * 0 false false true true
+ * 0 false false false false
+ *
+ */
}
if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) {
- return finger3 && finger4;
- }
- if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
- return finger1 && finger2;
+ return finger3 && finger4; // 鏀捐揣鏄鐨� 鍙栬揣鏄敊鐨� 锛堝乏锛�
+ /**
+ * 1銆�3鎺� (180)
+ *
+ * 鍙栬揣
+ * 180 false false false false
+ * 180 false false true true
+ * 180 true true true true
+ *
+ * 鏀捐揣
+ * 180 false false true true
+ * 180 false false false false
+ *
+ */
}
if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) {
+ return finger1 && finger2; // 鏀捐揣鏄鐨� 鍙栬揣鏄敊鐨� 锛堜腑锛�
+ /**
+ * 鑳岀瘬 (90)
+ *
+ * 鍙栬揣
+ * 90 true true false false
+ * 90 true true true true
+ *
+ * 鏀捐揣
+ *
+ * 90 true true true true
+ * 90 true true false false
+ * 90 false false false false
+ *
+ */
+ }
+ if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) {
return finger1 && finger2;
}
return finger1 && finger2 && finger3 && finger4;
@@ -48,8 +91,9 @@
const Agv = (props) => {
const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4 } = props;
const theta = -props.theta;
- const height = props.height * 0.06;
- const forkLength = props.forkLength * 0.1;
+ const height = props.height * 0.0655;
+ const forkLength = props.forkLength * 0.077;
+ // console.log(props.forkLength);
const loaderTheta = Number(props.loaderTheta?.toFixed(1));
const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 });
@@ -152,7 +196,7 @@
if (!fbx.castShadow) {
Common.setShadow(fbx);
}
- fbx.scale.set(MODEL_AGV_SCALE, MODEL_AGV_SCALE, MODEL_AGV_SCALE);
+ fbx.scale.set(MODEL_AGV_SCALE, MODEL_AGV_SCALE * 0.97, MODEL_AGV_SCALE);
return fbx.clone();
}, [])
@@ -185,10 +229,10 @@
position-y={loaderHeight}
rotation-y={Common.rotationParseNum(loaderAngle)}
>
- <primitive object={loaderModel} castShadow position={[0, 20, 0]} />
+ <primitive object={loaderModel} castShadow position={[0, 0, 0]} />
<group position-z={forkDis}>
- <primitive object={forkModel} castShadow position={[0, 25, 0]} />
- {(hasBox || getLoaderHasBox(loaderAngle, finger1, finger2, finger3, finger4)) && <Box position={[0, 26, 0]} />}
+ <primitive object={forkModel} castShadow position={[0, 6, 0]} />
+ {(hasBox || getLoaderHasBox(loaderAngle, finger1, finger2, finger3, finger4)) && <Box position={[0, 6, 0]} />}
</group>
</group>
<group>
--
Gitblit v1.9.1