@gnsx/three 0.185.5 → 0.185.7

package/examples/jsm/inspector/tabs/Settings.js

@@ -79,7 +79,12 @@ function _saveState() {
 
 }
 
-_loadState();
+// WITH_GENESYS
+// Defer state load until Settings is instantiated. Calling `_loadState()` at
+// module evaluation time triggers `Inspector.getItem()`, which reads `REVISION`
+// (imported from `three/webgpu`) while `Inspector.js` is still mid-evaluation (TDZ).
+// _loadState();
+// !WITH_GENESYS
 
 //
 
@@ -276,10 +281,11 @@ Shares the same state across any page within the current origin.` );
 
 		extension.active = true;
 
-		const extUrl = new URL( extension.url, import.meta.url ).href;
-
 		// WITH_GENESYS
-		const module = await import( /* @vite-ignore */ /* webpackIgnore: true */ extUrl );
+		// `new URL( extension.url, import.meta.url )` fails with webpack 5 because the
+		// first argument is dynamic ("Can't resolve <dynamic>"). With @vite-ignore and
+		// webpackIgnore, the browser resolves the relative `extension.url` at runtime.
+		const module = await import( /* @vite-ignore */ /* webpackIgnore: true */ extension.url );
 		// !WITH_GENESYS
 
 		const keys = Object.keys( module );

package/examples/jsm/lighting/LightProbeGrid.js

@@ -33,6 +33,7 @@ import {
 	storageTexture,
 	textureStore,
 	uniform,
+	uint,
 	uvec3,
 	vec3,
 	vec4
@@ -675,31 +676,6 @@ class LightProbeGrid extends Object3D {
 
 		renderer.shadowMap.autoUpdate = savedShadowAutoUpdate;
 
-		// Padding slices copy the nearest edge data slices on the GPU.
-		const atlas = this.texture;
-
-		for ( let textureIndex = 0; textureIndex < 7; textureIndex ++ ) {
-
-			const baseSlice = textureIndex * paddedSlices;
-			const dataSlice = baseSlice + ATLAS_PADDING;
-			const trailingSlice = dataSlice + nz;
-
-			renderer.copyTextureToTexture(
-				atlas,
-				atlas,
-				new Box3( new Vector3( 0, 0, dataSlice ), new Vector3( nx, ny, dataSlice + 1 ) ),
-				new Vector3( 0, 0, baseSlice )
-			);
-
-			renderer.copyTextureToTexture(
-				atlas,
-				atlas,
-				new Box3( new Vector3( 0, 0, dataSlice + nz - 1 ), new Vector3( nx, ny, dataSlice + nz ) ),
-				new Vector3( 0, 0, trailingSlice )
-			);
-
-		}
-
 		await renderer.backend.device.queue.onSubmittedWorkDone();
 
 	}
@@ -1172,35 +1148,56 @@ function _ensureWebGPUComputeResources( cubemapSize, envMapTexture, atlasTexture
 
 		Loop( { end: 7, name: 't', type: 'int' }, ( { t } ) => {
 
-			const atlasZ = paddedSlices.mul( t ).add( 1 ).add( probeIz );
+			const baseSlice = paddedSlices.mul( t );
+			const atlasZ = baseSlice.add( 1 ).add( probeIz );
+			const trailingSlice = baseSlice.add( paddedSlices ).sub( 1 );
+			const lastDataSlice = paddedSlices.sub( 3 );
+			const storeProbeValue = ( value ) => {
+
+				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), value ).toWriteOnly();
+
+				// Write padding during the compute pass; WebGPU validation rejects atlas-to-itself copies.
+				If( probeIz.equal( uint( 0 ) ), () => {
+
+					textureStore( atlas, uvec3( probeIx, probeIy, baseSlice ), value ).toWriteOnly();
+
+				} );
+
+				If( probeIz.equal( lastDataSlice ), () => {
+
+					textureStore( atlas, uvec3( probeIx, probeIy, trailingSlice ), value ).toWriteOnly();
+
+				} );
+
+			};
 
 			If( t.equal( int( 0 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c0.x, c0.y, c0.z, c1.x ) ).toWriteOnly();
+				storeProbeValue( vec4( c0.x, c0.y, c0.z, c1.x ) );
 
 			} ).ElseIf( t.equal( int( 1 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c1.y, c1.z, c2.x, c2.y ) ).toWriteOnly();
+				storeProbeValue( vec4( c1.y, c1.z, c2.x, c2.y ) );
 
 			} ).ElseIf( t.equal( int( 2 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c2.z, c3.x, c3.y, c3.z ) ).toWriteOnly();
+				storeProbeValue( vec4( c2.z, c3.x, c3.y, c3.z ) );
 
 			} ).ElseIf( t.equal( int( 3 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c4.x, c4.y, c4.z, c5.x ) ).toWriteOnly();
+				storeProbeValue( vec4( c4.x, c4.y, c4.z, c5.x ) );
 
 			} ).ElseIf( t.equal( int( 4 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c5.y, c5.z, c6.x, c6.y ) ).toWriteOnly();
+				storeProbeValue( vec4( c5.y, c5.z, c6.x, c6.y ) );
 
 			} ).ElseIf( t.equal( int( 5 ) ), () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c6.z, c7.x, c7.y, c7.z ) ).toWriteOnly();
+				storeProbeValue( vec4( c6.z, c7.x, c7.y, c7.z ) );
 
 			} ).Else( () => {
 
-				textureStore( atlas, uvec3( probeIx, probeIy, atlasZ ), vec4( c8.x, c8.y, c8.z, float( 0 ) ) ).toWriteOnly();
+				storeProbeValue( vec4( c8.x, c8.y, c8.z, float( 0 ) ) );
 
 			} );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnsx/three",
-  "version": "0.185.5",
+  "version": "0.185.7",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",

package/src/renderers/webgpu/WebGPUBackend.js

@@ -2267,6 +2267,11 @@ class WebGPUBackend extends Backend {
 
 		const baseOffset = timestampQueryPool.allocateQueriesForContext( uid );
 
+		// WITH_GENESYS
+		// If query allocation fails, leave timestampWrites unset so WebGPU doesn't receive a null querySet.
+		if ( baseOffset === null || timestampQueryPool.querySet === null ) return;
+		// !WITH_GENESYS
+
 		_renderPassTimestampWrites.querySet = timestampQueryPool.querySet;
 		_renderPassTimestampWrites.beginningOfPassWriteIndex = baseOffset;
 		_renderPassTimestampWrites.endOfPassWriteIndex = baseOffset + 1;

package/src/renderers/webgpu/utils/WebGPUTextureUtils.js

@@ -250,6 +250,17 @@ class WebGPUTextureUtils {
 		if ( bindingData.sampler !== undefined ) {
 
 			const samplerData = this._samplerCache.get( bindingData.samplerKey );
+			// WITH_GENESYS
+			// Binding disposal can be reached more than once during renderer teardown; tolerate stale sampler cache data.
+			if ( samplerData === undefined ) {
+
+				bindingData.sampler = undefined;
+				bindingData.samplerKey = undefined;
+				return;
+
+			}
+
+			// !WITH_GENESYS
 			samplerData.usedTimes --;
 
 			if ( samplerData.usedTimes === 0 ) {