From 62022ea96c5d3e36eadd9177b16031b5b1e4f085 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 四月 2024 12:58:35 +0800
Subject: [PATCH] #
---
src/utils/common.js | 6 +++---
src/config/setting.js | 9 +++++----
src/components/shelf.jsx | 12 ++++++------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/shelf.jsx b/src/components/shelf.jsx
index 30404d2..ec2e951 100644
--- a/src/components/shelf.jsx
+++ b/src/components/shelf.jsx
@@ -12,17 +12,17 @@
const { no, position = [0, 300, 0], rotationY = 0 } = props;
const state = useStore();
- const { nodes, materials } = useMemo(() => {
- return useGLTF('/models/shelf/row.glb');
- }, [])
+ // const { nodes, materials } = useMemo(() => {
+ // return useGLTF('/models/shelf/row.glb');
+ // }, [])
const model = useMemo(() => {
const fbx = useFBX('/models/shelf/row.fbx');
if (!fbx.castShadow) {
Common.setShadow(fbx);
}
- // Common.setColor(fbx)
- fbx.scale.set(MODEL_SHELF_SCALE * 1.5, MODEL_SHELF_SCALE, MODEL_SHELF_SCALE);
+ // Common.setColor(fbx);
+ fbx.scale.set(MODEL_SHELF_SCALE.x, MODEL_SHELF_SCALE.y, MODEL_SHELF_SCALE.z);
return fbx.clone();
}, [])
@@ -42,7 +42,7 @@
scale={50000}
/> */}
- <primitive object={model} castShadow position={[0, 0, 0]} />
+ <primitive object={model} castShadow position={[0, 1, 0]} />
{/* <mesh position={[0, 100, 0]}>
<boxGeometry args={[150, 200, 30]} />
<meshStandardMaterial color={'orange'} transparent={true} opacity={.5} />
diff --git a/src/config/setting.js b/src/config/setting.js
index 8f6845c..ccf63af 100644
--- a/src/config/setting.js
+++ b/src/config/setting.js
@@ -14,7 +14,8 @@
export const MODEL_BOX_SCALE = .5;
-export const MODEL_SHELF_SCALE = .6;
+export const MODEL_SHELF_SCALE = { x: 0.8, y: 0.52, z: 0.55 };
+
// shelf scale & offset
@@ -28,8 +29,8 @@
export const SHELF_BAY_GROUP_COUNT = 3;
-export const SHELF_BAY_UNIT_SEPARTE_DISTANCE = 50;
+export const SHELF_BAY_UNIT_SEPARTE_DISTANCE = 60;
-export const SHELF_HEIGHT_FROM_GROUND = 10;
+export const SHELF_HEIGHT_FROM_GROUND = 23;
-export const SHELF_LEV_UNIT_SEPARTE_DISTANCE = 28;
\ No newline at end of file
+export const SHELF_LEV_UNIT_SEPARTE_DISTANCE = 22;
\ No newline at end of file
diff --git a/src/utils/common.js b/src/utils/common.js
index 25d76a5..149c847 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -47,13 +47,13 @@
}
};
-export const setColor = (obj) => {
+export const setColor = (obj, color = 0x4680BF) => {
if (obj.material) {
- obj.material.color.set(0x4680BF);
+ obj.material.color.set(color);
}
if (obj.children) {
obj.children.forEach((child) => {
- setColor(child);
+ setColor(child, color);
});
}
};
--
Gitblit v1.9.1