From 71f12f94c165bcc6ddf6ebd97c0dc2381c04963a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 五月 2024 09:55:25 +0800
Subject: [PATCH] #

---
 src/components/shelf.jsx |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/components/shelf.jsx b/src/components/shelf.jsx
index 1626e3c..387d77b 100644
--- a/src/components/shelf.jsx
+++ b/src/components/shelf.jsx
@@ -1,34 +1,54 @@
 import { useMemo, useState, useEffect } from 'react';
-import { useGLTF } from '@react-three/drei';
+import { useGLTF, useFBX } from '@react-three/drei';
 import * as THREE from 'three';
 import { MODEL_SHELF_SCALE } from '@/config/setting'
+import { useStore } from '@/store';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 import Box from './box';
-
+import * as Common from '../utils/common';
 
 const Shelf = (props) => {
-    const { position = [0, 300, 0], rotationY = 0 } = props;
+    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, 0x778ca3);
+        fbx.scale.set(MODEL_SHELF_SCALE.x, MODEL_SHELF_SCALE.y, MODEL_SHELF_SCALE.z);
+        return fbx.clone();
     }, [])
+
+    useEffect(() => {
+        state.shelfList[no] = position;
+    }, [props]);
 
     return (
         <>
             <group rotation-y={rotationY} position={position}>
-                <primitive
+                {/* <primitive
                     castShadow
                     receiveShadow
                     object={nodes.鐗╀欢_1001}
                     material={materials['鏉愯川_1.002']}
                     position={[0, 99, 0]}
                     scale={50000}
-                />
+                /> */}
+
+                <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} />
+                </mesh> */}
+                {/* <Box rotationY={0} position={[0, 0, 0]} /> */}
             </group>
-            {/* <Box rotationY={Math.PI / 2} position={[0, 100, -50]} />
-            <Box rotationY={Math.PI / 2} position={[0, 100, 0]} />
-            <Box rotationY={Math.PI / 2} position={[0, 100, 30]} /> */}
         </>
     )
 }

--
Gitblit v1.9.1