Skip to content

[pull] dev from mrdoob:dev #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 29, 2025
+19 −23
Merged

[pull] dev from mrdoob:dev #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cde3c7
Examples: Improved grid in webgpu_loader_materialx.
mrdoob Dec 29, 2025
96dbfa6
Fix XR camera layers inheritance (#32626)
wrangelvid Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified examples/screenshots/webgpu_loader_materialx.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 15 additions & 19 deletions examples/webgpu_loader_materialx.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

import * as THREE from 'three/webgpu';

import { Fn, length, fract, vec4, positionWorld, smoothstep, max, abs, float, fwidth } from 'three/tsl';
import { Fn, abs, fract, fwidth, length, max, saturate, smoothstep, vec4, positionWorld, float } from 'three/tsl';

import { OrbitControls } from 'three/addons/controls/OrbitControls.js';

Expand Down Expand Up @@ -130,41 +130,37 @@

const material = new THREE.MeshBasicNodeMaterial();

const gridXZ = Fn( ( [ gridSize = float( 1.0 ), dotWidth = float( 0.1 ), lineWidth = float( 0.02 ) ] ) => {
const grid = Fn( ( [ coord, lineWidth = float( 0.01 ), dotSize = float( 0.03 ) ] ) => {

const coord = positionWorld.xz.div( gridSize );
const grid = fract( coord );
// https://bgolus.medium.com/the-best-darn-grid-shader-yet-727f9278b9d8

// Screen-space derivative for automatic antialiasing
const g = fract( coord );
const fw = fwidth( coord );
const smoothing = max( fw.x, fw.y ).mul( 0.5 );
const gx = abs( g.x.sub( 0.5 ) );
const gy = abs( g.y.sub( 0.5 ) );

// Create squares at cell centers
const squareDist = max( abs( grid.x.sub( 0.5 ) ), abs( grid.y.sub( 0.5 ) ) );
const dots = smoothstep( dotWidth.add( smoothing ), dotWidth.sub( smoothing ), squareDist );
const lineX = saturate( lineWidth.sub( gx ).div( fw.x ).add( 0.5 ) );
const lineY = saturate( lineWidth.sub( gy ).div( fw.y ).add( 0.5 ) );
const lines = max( lineX, lineY );

// Create grid lines
const lineX = smoothstep( lineWidth.add( smoothing ), lineWidth.sub( smoothing ), abs( grid.x.sub( 0.5 ) ) );
const lineZ = smoothstep( lineWidth.add( smoothing ), lineWidth.sub( smoothing ), abs( grid.y.sub( 0.5 ) ) );
const lines = max( lineX, lineZ );
const squareDist = max( gx, gy );
const aa = max( fw.x, fw.y );
const dots = smoothstep( dotSize.add( aa ), dotSize.sub( aa ), squareDist );

return max( dots, lines );

} );

const radialGradient = Fn( ( [ radius = float( 10.0 ), falloff = float( 1.0 ) ] ) => {
const fade = Fn( ( [ radius = float( 10.0 ), falloff = float( 1.0 ) ] ) => {

return smoothstep( radius, radius.sub( falloff ), length( positionWorld ) );

} );

// Create grid pattern
const gridPattern = gridXZ( 1.0, 0.03, 0.005 );
const baseColor = vec4( 1.0, 1.0, 1.0, 0.0 );
const gridColor = vec4( 0.5, 0.5, 0.5, 1.0 );
const baseColor = vec4( 1.0, 1.0, 1.0, 0.0 );

// Mix base color with grid lines
material.colorNode = gridPattern.mix( baseColor, gridColor ).mul( radialGradient( 30.0, 20.0 ) );
material.colorNode = grid( positionWorld.xz, 0.007, 0.03 ).mix( baseColor, gridColor ).mul( fade( 30.0, 20.0 ) );
material.transparent = true;

const plane = new THREE.Mesh( new THREE.CircleGeometry( 40 ), material );
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/common/XRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,8 +1131,8 @@ class XRManager extends EventDispatcher {

// inherit camera layers and enable eye layers (1 = left, 2 = right)
cameraXR.layers.mask = camera.layers.mask | 0b110;
cameraL.layers.mask = cameraXR.layers.mask & 0b011;
cameraR.layers.mask = cameraXR.layers.mask & 0b101;
cameraL.layers.mask = cameraXR.layers.mask & ~ 0b100;
cameraR.layers.mask = cameraXR.layers.mask & ~ 0b010;


const parent = camera.parent;
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/webxr/WebXRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,8 @@ class WebXRManager extends EventDispatcher {

// inherit camera layers and enable eye layers (1 = left, 2 = right)
cameraXR.layers.mask = camera.layers.mask | 0b110;
cameraL.layers.mask = cameraXR.layers.mask & 0b011;
cameraR.layers.mask = cameraXR.layers.mask & 0b101;
cameraL.layers.mask = cameraXR.layers.mask & ~ 0b100;
cameraR.layers.mask = cameraXR.layers.mask & ~ 0b010;

const parent = camera.parent;
const cameras = cameraXR.cameras;
Expand Down