Move envMap to material

packages/client/src/components/Museo.tsx

@@ -20,13 +20,6 @@ const Museo: React.FC = () => {
       <Canvas colorManagement>
         <ambientLight color={0xd3840e} />
         <pointLight position={[0, 20, -30]} color={0xd3840e} />
-        <Suspense fallback={null}>
-          <Environment
-            background={false}
-            files={['px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png']}
-            path={'env/'}
-          />
-        </Suspense>
         <Suspense fallback={null}>
           <Plaza />
           <Physics

packages/client/src/models/Plaza.js

@@ -3,11 +3,20 @@ auto-generated by: https://github.com/pmndrs/gltfjsx
 */
 import React, { useRef } from 'react'
 import { useGLTF } from '@react-three/drei/useGLTF'
+import { useCubeTexture } from '@react-three/drei'
 
 export default function Model(props) {
   const group = useRef()
   const { nodes, materials } = useGLTF('/model/plaza.glb')
+
+  const envMap = useCubeTexture(
+    ['px.png', 'nx.png', 'py.png', 'ny.png', 'pz.png', 'nz.png'],
+    { path: 'env/' },
+  )
+  materials.metal_glass.envMap = envMap
+
   return (
+    <>
       <group ref={group} {...props}>
         <group position={[1.74, 1.21, -17.68]} scale={[4.95, 3.08, 4.95]}>
           <mesh material={materials.marble} geometry={nodes.Circle002_0.geometry} />
@@ -41,7 +50,10 @@ export default function Model(props) {
         </group>
         <group position={[1.74, 1.23, 5.99]}>
           <mesh material={materials.marble} geometry={nodes.cerca_mesh_0.geometry} />
-        <mesh material={materials.green_metal} geometry={nodes.cerca_mesh_1_1.geometry} />
+          <mesh
+            material={materials.green_metal}
+            geometry={nodes.cerca_mesh_1_1.geometry}
+          />
         </group>
         <group position={[3.9, 1.96, 32.88]}>
           <mesh material={materials.marble} geometry={nodes.fuente_mesh_0.geometry} />
@@ -134,7 +146,10 @@ export default function Model(props) {
         </group>
         <group position={[15.98, 2.06, 16.67]} scale={[0.22, 0.22, 0.22]}>
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[22.05, 2.06, 24.28]}
@@ -142,7 +157,10 @@ export default function Model(props) {
           scale={[0.26, 0.26, 0.26]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[23.87, 2.06, 46.97]}
@@ -150,7 +168,10 @@ export default function Model(props) {
           scale={[0.31, 0.31, 0.31]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[12.23, 2.06, 54.7]}
@@ -158,7 +179,10 @@ export default function Model(props) {
           scale={[0.3, 0.3, 0.3]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-5.28, 2.06, 52.57]}
@@ -166,7 +190,10 @@ export default function Model(props) {
           scale={[0.38, 0.38, 0.38]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-18.09, 2.06, 35.88]}
@@ -174,7 +201,10 @@ export default function Model(props) {
           scale={[0.32, 0.32, 0.32]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-14.78, 2.06, 13.7]}
@@ -182,7 +212,10 @@ export default function Model(props) {
           scale={[0.33, 0.33, 0.33]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[37.86, 2.06, 14.53]}
@@ -190,7 +223,10 @@ export default function Model(props) {
           scale={[0.36, 0.36, 0.36]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[42.77, 2.06, 43.25]}
@@ -198,7 +234,10 @@ export default function Model(props) {
           scale={[0.36, 0.36, 0.36]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[34.67, 2.06, 67.05]}
@@ -206,7 +245,10 @@ export default function Model(props) {
           scale={[0.36, 0.36, 0.36]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-21.15, 2.06, 64.7]}
@@ -214,7 +256,10 @@ export default function Model(props) {
           scale={[0.36, 0.36, 0.36]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-38.93, 2.06, 22.77]}
@@ -222,7 +267,10 @@ export default function Model(props) {
           scale={[0.48, 0.48, 0.48]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-37.82, 2.06, 53.64]}
@@ -230,7 +278,10 @@ export default function Model(props) {
           scale={[0.29, 0.29, 0.29]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-12.86, 2.05, 48.27]}
@@ -238,7 +289,10 @@ export default function Model(props) {
           scale={[0.48, 0.48, 0.48]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[-43.48, 2.05, 73.17]}
@@ -246,7 +300,10 @@ export default function Model(props) {
           scale={[0.41, 0.41, 0.41]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group
           position={[0.75, 2.06, 71.09]}
@@ -254,7 +311,10 @@ export default function Model(props) {
           scale={[0.38, 0.38, 0.38]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type2_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type2_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type2_1_1.geometry}
+          />
         </group>
         <group position={[-19.97, 2.06, 22.05]} scale={[0.25, 0.25, 0.25]}>
           <mesh material={materials.wood} geometry={nodes.Cube008_0.geometry} />
@@ -374,7 +434,10 @@ export default function Model(props) {
         </group>
         <group position={[-25.85, 2.06, 14.73]} scale={[0.22, 0.22, 0.22]}>
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-18.58, 2.06, 28.07]}
@@ -382,7 +445,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-22.21, 3.87, 40.68]}
@@ -390,7 +456,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-27.51, 2.06, 25.62]}
@@ -398,7 +467,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-29.46, 2.06, 55.87]}
@@ -406,7 +478,10 @@ export default function Model(props) {
           scale={[0.18, 0.18, 0.18]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-13.65, 2.06, 59.88]}
@@ -414,7 +489,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[3.17, 2.06, 62.84]}
@@ -422,7 +500,10 @@ export default function Model(props) {
           scale={[0.2, 0.2, 0.2]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[20.96, 2.06, 64.77]}
@@ -430,7 +511,10 @@ export default function Model(props) {
           scale={[0.18, 0.18, 0.18]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[31.21, 2.06, 51.28]}
@@ -438,7 +522,10 @@ export default function Model(props) {
           scale={[0.21, 0.21, 0.21]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[34.76, 2.06, 39.77]}
@@ -446,7 +533,10 @@ export default function Model(props) {
           scale={[0.14, 0.14, 0.14]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[22.9, 2.06, 38.98]}
@@ -454,7 +544,10 @@ export default function Model(props) {
           scale={[0.2, 0.2, 0.2]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[22.69, 2.06, 30.17]}
@@ -462,7 +555,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[29.66, 2.06, 24.54]}
@@ -470,7 +566,10 @@ export default function Model(props) {
           scale={[0.21, 0.21, 0.21]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[43.4, 2.06, 23.06]}
@@ -478,7 +577,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[42.16, 2.06, 58.52]}
@@ -486,7 +588,10 @@ export default function Model(props) {
           scale={[0.23, 0.23, 0.23]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[21.39, 2.06, 72.23]}
@@ -494,7 +599,10 @@ export default function Model(props) {
           scale={[0.32, 0.32, 0.32]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-6.51, 2.06, 72.22]}
@@ -502,7 +610,10 @@ export default function Model(props) {
           scale={[0.32, 0.32, 0.32]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-37.11, 2.06, 33.55]}
@@ -510,7 +621,10 @@ export default function Model(props) {
           scale={[0.32, 0.32, 0.32]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[-27.67, 2.05, 59.96]}
@@ -518,7 +632,10 @@ export default function Model(props) {
           scale={[0.18, 0.18, 0.18]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <group
           position={[13.71, 1.23, 48.82]}
@@ -526,7 +643,10 @@ export default function Model(props) {
           scale={[0.15, 0.15, 0.15]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type4_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type4_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type4_1_1.geometry}
+          />
         </group>
         <mesh
           material={materials.leaves}
@@ -713,7 +833,10 @@ export default function Model(props) {
           scale={[0.29, 0.29, 0.29]}
         >
           <mesh material={materials.wood} geometry={nodes.tree_mesh_type1_0.geometry} />
-        <mesh material={materials.leaves} geometry={nodes.tree_mesh_type1_1_1.geometry} />
+          <mesh
+            material={materials.leaves}
+            geometry={nodes.tree_mesh_type1_1_1.geometry}
+          />
         </group>
         <mesh
           material={materials.wood}
@@ -731,7 +854,8 @@ export default function Model(props) {
           <mesh material={materials.leaves} geometry={nodes['Cube.018_1_1'].geometry} />
         </group>
       </group>
+    </>
   )
 }
 
-useGLTF.preload('/plaza.glb')
+useGLTF.preload('/model/plaza.glb')

packages/client/src/models/Plaza_collision.tsx

@@ -39,7 +39,12 @@ export default function Model(props: JSX.IntrinsicElements['group']) {
 
   return (
     <group ref={group} {...props}>
-      <mesh ref={ref} material={material} geometry={nodes.collision_mesh_park.geometry} />
+      <mesh
+        ref={ref}
+        material={material}
+        geometry={nodes.collision_mesh_park.geometry}
+        visible={false}
+      />
     </group>
   )
 }