diff --git a/app/src/assets/textures/floor/tex3/metal_plate_diff_1k.jpg b/app/src/assets/textures/floor/tex3/metal_plate_diff_1k.jpg new file mode 100644 index 0000000..e3da12a Binary files /dev/null and b/app/src/assets/textures/floor/tex3/metal_plate_diff_1k.jpg differ diff --git a/app/src/assets/textures/floor/tex3/metal_plate_metal_1k.png b/app/src/assets/textures/floor/tex3/metal_plate_metal_1k.png new file mode 100644 index 0000000..5d7594e Binary files /dev/null and b/app/src/assets/textures/floor/tex3/metal_plate_metal_1k.png differ diff --git a/app/src/assets/textures/floor/tex3/metal_plate_nor_gl_1k.png b/app/src/assets/textures/floor/tex3/metal_plate_nor_gl_1k.png new file mode 100644 index 0000000..aa89562 Binary files /dev/null and b/app/src/assets/textures/floor/tex3/metal_plate_nor_gl_1k.png differ diff --git a/app/src/assets/textures/floor/tex3/metal_plate_rough_1k.png b/app/src/assets/textures/floor/tex3/metal_plate_rough_1k.png new file mode 100644 index 0000000..f454a84 Binary files /dev/null and b/app/src/assets/textures/floor/tex3/metal_plate_rough_1k.png differ diff --git a/app/src/assets/textures/hdr/autoshop_01_1k.hdr b/app/src/assets/textures/hdr/autoshop_01_1k.hdr new file mode 100644 index 0000000..3abce56 Binary files /dev/null and b/app/src/assets/textures/hdr/autoshop_01_1k.hdr differ diff --git a/app/src/assets/textures/hdr/empty_warehouse_01_1k.hdr b/app/src/assets/textures/hdr/empty_warehouse_01_1k.hdr new file mode 100644 index 0000000..5066e1e Binary files /dev/null and b/app/src/assets/textures/hdr/empty_warehouse_01_1k.hdr differ diff --git a/app/src/assets/textures/hdr/industrial_pipe_and_valve_01_1k.hdr b/app/src/assets/textures/hdr/industrial_pipe_and_valve_01_1k.hdr new file mode 100644 index 0000000..d9e9bcb Binary files /dev/null and b/app/src/assets/textures/hdr/industrial_pipe_and_valve_01_1k.hdr differ diff --git a/app/src/assets/textures/hdr/machine_shop_02_1k.hdr b/app/src/assets/textures/hdr/machine_shop_02_1k.hdr new file mode 100644 index 0000000..22c4758 Binary files /dev/null and b/app/src/assets/textures/hdr/machine_shop_02_1k.hdr differ diff --git a/app/src/components/layout/sidebarRight/properties/FloorProperties.tsx b/app/src/components/layout/sidebarRight/properties/FloorProperties.tsx index d94363c..c5938f7 100644 --- a/app/src/components/layout/sidebarRight/properties/FloorProperties.tsx +++ b/app/src/components/layout/sidebarRight/properties/FloorProperties.tsx @@ -6,6 +6,7 @@ import defaultTexture from '../../../../assets/textures/floor/white.png'; import flootTexture1 from '../../../../assets/textures/floor/factory wall texture.jpg'; import flootTexture2 from '../../../../assets/textures/floor/tex1/MI_FactoryConcreteFloor01_BaseColor.001.jpg'; import flootTexture3 from '../../../../assets/textures/floor/tex2/MI_FloorMats01_baseColor.png'; +import flootTexture4 from '../../../../assets/textures/floor/tex3/metal_plate_diff_1k.jpg'; import { useBuilderStore } from "../../../../store/builder/useBuilderStore"; @@ -20,6 +21,7 @@ export const materials = [ { texture: flootTexture1, textureId: "Material 1", textureName: "Grunge Concrete Wall" }, { texture: flootTexture2, textureId: "Material 2", textureName: "Tiled Floor" }, { texture: flootTexture3, textureId: "Material 3", textureName: "Metal Floor" }, + { texture: flootTexture4, textureId: "Material 4", textureName: "Metal Floor 2" }, ]; const FloorProperties = () => { diff --git a/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx b/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx index a8fc1c1..1b92209 100644 --- a/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx +++ b/app/src/modules/builder/floor/Instances/Instance/floorInstance.tsx @@ -29,6 +29,12 @@ import material3Map from "../../../../../assets/textures/floor/tex2/MI_FloorMats import material3NormalMap from "../../../../../assets/textures/floor/tex2/MI_FloorMats01_Normal.png"; import material3MetalicRoughnessMap from "../../../../../assets/textures/floor/tex2/MI_FloorMats01_occlusionRoughnessMetallic.png"; +// floor-mat3 +import material4Map from "../../../../../assets/textures/floor/tex3/metal_plate_diff_1k.jpg"; +import material4RoughnessMap from "../../../../../assets/textures/floor/tex3/metal_plate_rough_1k.png"; +import material4MetalicMap from "../../../../../assets/textures/floor/tex3/metal_plate_metal_1k.png"; +import material4NormalMap from "../../../../../assets/textures/floor/tex3/metal_plate_nor_gl_1k.png"; + function FloorInstance({ floor }: { floor: Floor }) { const { togglView } = useToggleView(); const { activeModule } = useModuleStore(); @@ -65,6 +71,12 @@ function FloorInstance({ floor }: { floor: Floor }) { metalnessMap: material3MetalicRoughnessMap, normalMap: material3NormalMap, }, + "Material 4": { + map: material4Map, + roughnessMap: material4RoughnessMap, + metalnessMap: material4MetalicMap, + normalMap: material4NormalMap, + }, }; const shape = useMemo(() => { @@ -131,6 +143,7 @@ function FloorInstance({ floor }: { floor: Floor }) { if (!tex) return; tex.wrapS = tex.wrapT = RepeatWrapping; tex.repeat.set(tileScale, tileScale); + tex.anisotropy = 16; // First texture is always the color map (use SRGB), others should be linear tex.colorSpace = idx < 1 ? SRGBColorSpace : NoColorSpace; }); @@ -184,14 +197,14 @@ function FloorInstance({ floor }: { floor: Floor }) { ]} userData={floor} > - diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx index a00bfe0..1d7e600 100644 --- a/app/src/modules/scene/scene.tsx +++ b/app/src/modules/scene/scene.tsx @@ -52,6 +52,7 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co }).catch((err) => { console.error(err); }); + // eslint-disable-next-line }, [activeModule, assets, loadingProgress]) return (