BabylonJS · sebavan · May 15, 2025 · Mar 13, 2025 · Mar 18, 2025 · Mar 18, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/public/@babylonjs/viewer/rollup.config.dist.esm.mjs b/packages/public/@babylonjs/viewer/rollup.config.dist.esm.mjs
@@ -21,6 +21,7 @@ const commonConfig = {
             entries: [
                 { find: "core", replacement: `@${source}/core/dist` },
                 { find: "loaders", replacement: `@${source}/loaders/dist` },
+                { find: "materials", replacement: `@${source}/materials/dist` },
             ],
         }),
         nodeResolve({ mainFields: ["browser", "module", "main"] }),

diff --git a/packages/public/@babylonjs/viewer/rollup.config.lib.mjs b/packages/public/@babylonjs/viewer/rollup.config.lib.mjs
@@ -4,7 +4,7 @@ import { nodeResolve } from "@rollup/plugin-node-resolve";
 
 const commonConfig = {
     input: "../../../tools/viewer/src/index.ts",
-    external: (id) => /^@babylonjs\/(core|loaders)(\/|$)/.test(id),
+    external: (id) => /^@babylonjs\/(core|loaders|materials)(\/|$)/.test(id),
 };
 
 const jsConfig = {

diff --git a/packages/tools/viewer-configurator/package.json b/packages/tools/viewer-configurator/package.json
@@ -23,6 +23,7 @@
         "@dnd-kit/sortable": "^10.0.0",
         "@dev/core": "1.0.0",
         "@dev/loaders": "1.0.0",
+        "@dev/materials": "1.0.0",
         "@dev/shared-ui-components": "1.0.0",
         "@tools/viewer": "1.0.0"
     },

diff --git a/packages/tools/viewer-configurator/src/components/configurator/configurator.tsx b/packages/tools/viewer-configurator/src/components/configurator/configurator.tsx
@@ -953,7 +953,7 @@ export const Configurator: FunctionComponent<{ viewerOptions: ViewerOptions; vie
     );
 
     const isEnvironmentLightingUrlValid = useMemo(() => {
-        return !lightingUrlConfig.configuredState || URL.canParse(lightingUrlConfig.configuredState) || lightingUrlConfig.configuredState === "auto";
+        return !lightingUrlConfig.configuredState || lightingUrlConfig.configuredState === "auto" || URL.canParse(lightingUrlConfig.configuredState);
     }, [lightingUrlConfig.configuredState]);
 
     const onEnvironmentLightingUrlChange = useCallback(
@@ -964,7 +964,7 @@ export const Configurator: FunctionComponent<{ viewerOptions: ViewerOptions; vie
     );
 
     const isEnvironmentSkyboxUrlValid = useMemo(() => {
-        return !skyboxUrlConfig.configuredState || URL.canParse(skyboxUrlConfig.configuredState);
+        return !skyboxUrlConfig.configuredState || skyboxUrlConfig.configuredState === "auto" || URL.canParse(skyboxUrlConfig.configuredState);
     }, [skyboxUrlConfig.configuredState]);
 
     const onEnvironmentSkyboxUrlChange = useCallback(

diff --git a/packages/tools/viewer-configurator/tsconfig.build.json b/packages/tools/viewer-configurator/tsconfig.build.json
@@ -8,6 +8,7 @@
         "paths": {
             "core/*": ["dev/core/dist/*"],
             "loaders/*": ["dev/loaders/dist/*"],
+            "materials/*": ["dev/materials/dist/*"],
             "shared-ui-components/*": ["dev/sharedUiComponents/dist/*"],
             "viewer/*": ["tools/viewer/dist/*"],
             "viewer": ["tools/viewer/dist/tsbuild/index"]

diff --git a/packages/tools/viewer-configurator/tsconfig.json b/packages/tools/viewer-configurator/tsconfig.json
@@ -7,6 +7,7 @@
         "paths": {
             "core/*": ["dev/core/src/*"],
             "loaders/*": ["dev/loaders/src/*"],
+            "materials/*": ["dev/materials/src/*"],
             "shared-ui-components/*": ["dev/sharedUiComponents/src/*"],
             "viewer/*": ["tools/viewer/src/*"],
             "viewer": ["tools/viewer/src/index"]

diff --git a/packages/tools/viewer-configurator/webpack.config.js b/packages/tools/viewer-configurator/webpack.config.js
@@ -22,6 +22,7 @@ module.exports = (env) => {
             alias: {
                 core: path.resolve("../../dev/core/dist"),
                 loaders: path.resolve("../../dev/loaders/dist"), // "src" results in unknown babylonjs-gltf2interface
+                materials: path.resolve("../../dev/materials/dist"),
                 viewer: path.resolve("../../tools/viewer/dist/tsbuild"), // "src" results in runtime viewer error
                 "shared-ui-components": path.resolve("../../dev/sharedUiComponents/src"),
             },

diff --git a/packages/tools/viewer/rollup.config.common.mjs b/packages/tools/viewer/rollup.config.common.mjs
@@ -26,6 +26,7 @@ export function createConfig(outDir) {
                 entries: [
                     { find: "core", replacement: `@${source}/core/dist` },
                     { find: "loaders", replacement: `@${source}/loaders/dist` },
+                    { find: "materials", replacement: `@${source}/materials/dist` },
                 ],
             }),
             nodeResolve({ mainFields: ["browser", "module", "main"] }),

diff --git a/packages/tools/viewer/src/Shaders/envShadowGround.fragment.fx b/packages/tools/viewer/src/Shaders/envShadowGround.fragment.fx
@@ -0,0 +1,23 @@
+precision highp float;
+
+// Sampler
+uniform sampler2D shadowTexture;
+uniform vec2 renderTargetSize;
+uniform float shadowOpacity;
+// Varying
+varying vec2 vUV;
+
+void main(void) {
+    float uvBasedOpacity = clamp(length(vUV * vec2(2.0) - vec2(1.0)), 0.0, 1.0);
+    uvBasedOpacity = uvBasedOpacity * uvBasedOpacity;
+    uvBasedOpacity = 1.0 - uvBasedOpacity;
+
+    vec2 screenUv = gl_FragCoord.xy / renderTargetSize;
+    vec3 shadowValue = texture2D(shadowTexture, screenUv).rrr;
+
+    float totalOpacity = shadowOpacity * uvBasedOpacity;
+    vec3 invertedShadowValue = vec3(1.0) - shadowValue;
+
+    gl_FragColor.rgb = shadowValue;
+    gl_FragColor.a = invertedShadowValue.r * totalOpacity;
+}
diff --git a/packages/tools/viewer/src/Shaders/envShadowGround.vertex.fx b/packages/tools/viewer/src/Shaders/envShadowGround.vertex.fx
@@ -0,0 +1,16 @@
+precision highp float;
+
+// Attributes
+attribute vec3 position;
+attribute vec2 uv;
+
+// Uniforms
+uniform mat4 worldViewProjection;
+
+// Varying
+varying vec2 vUV;
+
+void main(void) {
+    gl_Position = worldViewProjection * vec4(position, 1.0);
+    vUV = uv;
+}
diff --git a/packages/tools/viewer/src/ShadersWGSL/envShadowGround.fragment.fx b/packages/tools/viewer/src/ShadersWGSL/envShadowGround.fragment.fx
@@ -0,0 +1,17 @@
+var shadowTextureSampler: sampler;
+var shadowTexture : texture_2d<f32>;
+
+uniform shadowOpacity : f32;
+uniform renderTargetSize: vec2<f32>;
+
+@fragment
+fn main(input: FragmentInputs) -> FragmentOutputs {
+    let uvBasedOpacity = 1.0 - pow(clamp(length(input.vUV * vec2<f32>(2.0) - vec2<f32>(1.0)), 0.0, 1.0), 2.0);
+    let screenUv = fragmentInputs.position.xy / uniforms.renderTargetSize;
+
+    let shadowValue = textureSampleLevel(shadowTexture, shadowTextureSampler, screenUv, 0.0).rrr;
+    let totalOpacity = uniforms.shadowOpacity * uvBasedOpacity;
+    let finalShadowValue = mix(vec3<f32>(1.0), shadowValue, totalOpacity);
+    let invertedShadowValue = vec3(1.0) - shadowValue;
+    fragmentOutputs.color = vec4f(finalShadowValue, invertedShadowValue.r * totalOpacity);
+}
diff --git a/packages/tools/viewer/src/ShadersWGSL/envShadowGround.vertex.fx b/packages/tools/viewer/src/ShadersWGSL/envShadowGround.vertex.fx
@@ -0,0 +1,14 @@
+attribute position: vec3f;
+attribute uv: vec2f;
+
+uniform viewProjection: mat4x4f;
+uniform worldViewProjection: mat4x4f;
+
+// Output
+varying vUV: vec2f;
+
+@vertex
+fn main(input : VertexInputs) -> FragmentInputs {
+    vertexOutputs.position = uniforms.worldViewProjection * vec4f(input.position, 1.0);
+    vertexOutputs.vUV = input.uv;
+}