@gnsx/three 0.186.5 → 0.186.6

package/package.json

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

package/src/materials/nodes/NodeMaterial.js

@@ -26,10 +26,30 @@ import { vertexColor } from '../../nodes/accessors/VertexColorNode.js';
 import { premultiplyAlpha } from '../../nodes/display/PremultiplyAlphaFunctions.js';
 import { subBuild } from '../../nodes/core/SubBuildNode.js';
 // WITH_GENESYS
-import { DEBUG_VIEW_LIGHTING_COMPLEXITY, DEBUG_VIEW_QUAD_OVERDRAW, DEBUG_VIEW_SHADER_COMPLEXITY, DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS, quadOverdrawOutput, shaderComplexityAndQuadsOutput, shaderComplexityOutput } from '../../nodes/display/ComplexityDebug.js';
+import { DEBUG_VIEW_LIGHTING_COMPLEXITY, DEBUG_VIEW_SHADER_COMPLEXITY, DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS, debugDrawAccumulates, quadOverdrawOutput, shaderComplexityAndQuadsOutput, shaderComplexityOutput } from '../../nodes/display/ComplexityDebug.js';
+import { mrt } from '../../nodes/core/MRTNode.js';
 import { DEBUG_VIEW_BUFFER, assignBufferDefaults, bufferVisualizationOutput } from '../../nodes/display/BufferDebug.js';
 import { DEBUG_VIEW_DETAIL_LIGHTING, DEBUG_VIEW_LIGHTING_ONLY, applyLightingDebug, lightingOnlyNormal } from '../../nodes/display/LightingDebug.js';
 import { DEBUG_VIEW_DRAW_CALL, applyDrawCallDebug } from '../../nodes/display/DrawCallDebug.js';
+
+/**
+ * Replaces the color a material writes with a debug output. With MRT, only the `output`
+ * attachment is replaced so the other attachments keep their members. Converting the
+ * whole MRT struct to a color leaves WGSL with an empty output struct.
+ *
+ * @param {Node} resultNode - The material's fragment result, possibly an MRT node.
+ * @param {function(Node): Node} createOutput - Builds the debug color from the shaded color.
+ * @return {Node} The fragment result with the debug color in place.
+ */
+function replaceColorOutput( resultNode, createOutput ) {
+
+	if ( resultNode.isMRTNode !== true ) return createOutput( resultNode );
+
+	if ( resultNode.has( 'output' ) !== true ) return resultNode;
+
+	return resultNode.merge( mrt( { output: createOutput( resultNode.get( 'output' ) ) } ) );
+
+}
 // !WITH_GENESYS
 
 /**
@@ -548,11 +568,11 @@ class NodeMaterial extends Material {
 			// for detail lighting and can be replaced for lighting only.
 			if ( ( renderer.debug.view === DEBUG_VIEW_LIGHTING_ONLY || renderer.debug.view === DEBUG_VIEW_DETAIL_LIGHTING ) && this.isShadowPassMaterial !== true ) {
 
-				applyLightingDebug( builder, renderer.debug.view );
+				applyLightingDebug( builder, this, renderer.debug.view );
 
 			} else if ( renderer.debug.view === DEBUG_VIEW_DRAW_CALL && this.isShadowPassMaterial !== true ) {
 
-				applyDrawCallDebug( builder );
+				applyDrawCallDebug( builder, this );
 
 			}
 			// !WITH_GENESYS
@@ -627,27 +647,32 @@ class NodeMaterial extends Material {
 		}
 
 		// WITH_GENESYS
-		// The screen output pass colorizes the accumulated ratio. Wrapping that pass
-		// would replace the heatmap with this material's own constant cost.
-		if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY && this.isShadowPassMaterial !== true && renderer.isOutputTarget !== true ) {
+		// The screen output pass colorizes the accumulated ratio. Wrapping that pass, or a
+		// post-processing quad that copies the scene target, would replace the heatmap with
+		// that quad's own constant cost.
+		if ( debugDrawAccumulates( renderer, this, builder.object ) ) {
+
+			if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY ) {
 
-			builder.shaderComplexityBase = this.getShaderComplexity();
-			resultNode = shaderComplexityOutput( resultNode );
+				builder.shaderComplexityBase = this.getShaderComplexity();
+				resultNode = replaceColorOutput( resultNode, shaderComplexityOutput );
 
-		} else if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS && this.isShadowPassMaterial !== true && renderer.isOutputTarget !== true ) {
+			} else if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS ) {
 
-			builder.shaderComplexityBase = this.getShaderComplexity();
-			resultNode = shaderComplexityAndQuadsOutput( resultNode );
+				builder.shaderComplexityBase = this.getShaderComplexity();
+				resultNode = replaceColorOutput( resultNode, shaderComplexityAndQuadsOutput );
 
-		} else if ( renderer.debug.view === DEBUG_VIEW_QUAD_OVERDRAW && this.isShadowPassMaterial !== true && renderer.isOutputTarget !== true ) {
+			} else {
+
+				resultNode = replaceColorOutput( resultNode, quadOverdrawOutput );
 
-			resultNode = quadOverdrawOutput( resultNode );
+			}
 
 		} else if ( renderer.debug.view === DEBUG_VIEW_BUFFER && this.isShadowPassMaterial !== true && this.fragmentNode === null ) {
 
 			// The fullscreen output pass sets fragmentNode. Scene materials do not, including
 			// when the scene is drawn straight to the canvas.
-			resultNode = bufferVisualizationOutput( renderer.debug.buffer );
+			resultNode = replaceColorOutput( resultNode, () => bufferVisualizationOutput( renderer.debug.buffer ) );
 
 		}
 		// !WITH_GENESYS

package/src/nodes/display/ComplexityDebug.js

@@ -5,6 +5,7 @@
 import Node from '../core/Node.js';
 import { float, vec3, vec4, If, Fn } from '../tsl/TSLCore.js';
 import { fract, min, mix, round } from '../math/MathNode.js';
+import { DEBUG_VIEW_BUFFER } from './BufferDebug.js';
 
 /**
  * Shaded output. No complexity debug view.
@@ -224,6 +225,37 @@ export function debugViewAccumulates( view ) {
 
 }
 
+/**
+ * Whether a draw adds its scalar to the accumulating target instead of shading normally.
+ * Shadow passes, draws to the screen, and fullscreen quads draw normally. A post-processing
+ * quad copies the accumulated scene target, so its own cost must not replace it.
+ *
+ * @param {Renderer} renderer - The renderer.
+ * @param {Material} material - The material being drawn.
+ * @param {?Object3D} object - The object being drawn.
+ * @return {boolean} `true` when the draw accumulates.
+ */
+export function debugDrawAccumulates( renderer, material, object ) {
+
+	return debugViewAccumulates( renderer.debug.view ) &&
+		material.isShadowPassMaterial !== true &&
+		renderer.isOutputTarget !== true &&
+		( object === null || object === undefined || object.isQuadMesh !== true );
+
+}
+
+/**
+ * Views that output data or a heatmap, so tone mapping would distort them.
+ *
+ * @param {string} view - `renderer.debug.view`.
+ * @return {boolean} `true` when the view is drawn without tone mapping.
+ */
+export function debugViewSkipsToneMapping( view ) {
+
+	return debugViewAccumulates( view ) || view === DEBUG_VIEW_LIGHTING_COMPLEXITY || view === DEBUG_VIEW_BUFFER;
+
+}
+
 /**
  * Unreal's nonlinear shader-complexity ramp (`ColorizeComplexity`).
  * The first third of the normalized cost spreads across the first seven stops.

package/src/nodes/display/DrawCallDebug.js

@@ -77,10 +77,11 @@ function writeDrawCallColor( color, object, material ) {
  * The color is an object uniform, so meshes that share a material still differ.
  *
  * @param {NodeBuilder} builder - The current node builder.
+ * @param {NodeMaterial} material - The node material being set up. `builder.material` can be the
+ * source material of a converted one, such as a glTF `MeshStandardMaterial`.
  */
-export function applyDrawCallDebug( builder ) {
+export function applyDrawCallDebug( builder, material ) {
 
-	const material = builder.material;
 	const colorNode = uniform( new Color() ).onObjectUpdate( ( { object, material: drawnMaterial }, self ) => {
 
 		if ( object === null || drawnMaterial === null ) return;

package/src/nodes/display/LightingDebug.js

@@ -59,11 +59,12 @@ export const lightingOnlyNormal = /*@__PURE__*/ Fn( ( builder ) => {
  * Lit materials become a dielectric gray. Unlit materials become flat gray.
  *
  * @param {NodeBuilder} builder - The current node builder.
+ * @param {NodeMaterial} material - The node material being set up. `builder.material` can be the
+ * source material of a converted one, such as a glTF `MeshStandardMaterial`.
  * @param {string} view - `renderer.debug.view`.
  */
-export function applyLightingDebug( builder, view ) {
+export function applyLightingDebug( builder, material, view ) {
 
-	const material = builder.material;
 	const gray = vec3( LIGHTING_ONLY_BRIGHTNESS );
 
 	diffuseColor.rgb.assign( gray );

package/src/renderers/common/RenderPipeline.js

@@ -4,6 +4,9 @@ import { vec4, renderOutput, context } from '../../nodes/TSL.js';
 import { NoToneMapping } from '../../constants.js';
 import QuadMesh from '../../renderers/common/QuadMesh.js';
 import { warnOnce } from '../../utils.js';
+// WITH_GENESYS
+import { debugViewAccumulates, debugViewSkipsToneMapping } from '../../nodes/display/ComplexityDebug.js';
+// !WITH_GENESYS
 
 /**
  * This module is responsible to manage the rendering pipeline setups in apps.
@@ -139,7 +142,12 @@ class RenderPipeline {
 		const outputColorSpace = renderer.outputColorSpace;
 
 		renderer.toneMapping = NoToneMapping;
-		renderer.outputColorSpace = ColorManagement.workingColorSpace;
+
+		// WITH_GENESYS
+		// Accumulating views colorize in the renderer's output pass, which must still encode the color space.
+		if ( debugViewAccumulates( renderer.debug.view ) !== true ) renderer.outputColorSpace = ColorManagement.workingColorSpace;
+		// !WITH_GENESYS
+		// renderer.outputColorSpace = ColorManagement.workingColorSpace;
 
 		//
 
@@ -215,19 +223,40 @@ class RenderPipeline {
 	 */
 	_update() {
 
-		if ( this._toneMapping !== this.renderer.toneMapping ) {
+		// WITH_GENESYS
+		// Debug views drawn without tone mapping must match the direct path. An accumulating
+		// view copies the raw ratio here, and the renderer's output pass colorizes it.
+		const view = this.renderer.debug.view;
+		const toneMapping = debugViewSkipsToneMapping( view ) ? NoToneMapping : this.renderer.toneMapping;
+		const outputColorSpace = debugViewAccumulates( view ) ? ColorManagement.workingColorSpace : this.renderer.outputColorSpace;
+
+		if ( this._toneMapping !== toneMapping ) {
 
-			this._toneMapping = this.renderer.toneMapping;
+			this._toneMapping = toneMapping;
 			this.needsUpdate = true;
 
 		}
 
-		if ( this._outputColorSpace !== this.renderer.outputColorSpace ) {
+		if ( this._outputColorSpace !== outputColorSpace ) {
 
-			this._outputColorSpace = this.renderer.outputColorSpace;
+			this._outputColorSpace = outputColorSpace;
 			this.needsUpdate = true;
 
 		}
+		// !WITH_GENESYS
+		// if ( this._toneMapping !== this.renderer.toneMapping ) {
+		//
+		// 	this._toneMapping = this.renderer.toneMapping;
+		// 	this.needsUpdate = true;
+		//
+		// }
+		//
+		// if ( this._outputColorSpace !== this.renderer.outputColorSpace ) {
+		//
+		// 	this._outputColorSpace = this.renderer.outputColorSpace;
+		// 	this.needsUpdate = true;
+		//
+		// }
 
 		if ( this.needsUpdate === true ) {
 

package/src/renderers/common/Renderer.js

@@ -37,8 +37,8 @@ import { float, vec3, vec4, Fn } from '../../nodes/tsl/TSLCore.js';
 import { detachRendererReference } from '../../nodes/accessors/RendererReferenceNode.js';
 import { toneMappingExposure } from '../../nodes/display/ToneMappingNode.js';
 import { ProfilerService } from '../../profiler/ProfilerService.js';
-import { DEBUG_VIEW_LIGHTING_COMPLEXITY, DEBUG_VIEW_NONE, DEBUG_VIEW_QUAD_OVERDRAW, DEBUG_VIEW_SHADER_COMPLEXITY, DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS, DEFAULT_QUAD_OVERDRAW_BUDGET, DEFAULT_SHADER_COMPLEXITY_BUDGET, debugViewAccumulates } from '../../nodes/display/ComplexityDebug.js';
-import { DEBUG_VIEW_BUFFER, DEFAULT_BUFFER } from '../../nodes/display/BufferDebug.js';
+import { DEBUG_VIEW_NONE, DEFAULT_QUAD_OVERDRAW_BUDGET, DEFAULT_SHADER_COMPLEXITY_BUDGET, debugViewAccumulates, debugViewSkipsToneMapping } from '../../nodes/display/ComplexityDebug.js';
+import { DEFAULT_BUFFER } from '../../nodes/display/BufferDebug.js';
 // !WITH_GENESYS
 import { reference } from '../../nodes/accessors/ReferenceNode.js';
 import { highpModelNormalViewMatrix, highpModelViewMatrix } from '../../nodes/accessors/ModelNode.js';
@@ -2705,7 +2705,8 @@ class Renderer {
 
 		// WITH_GENESYS
 		// Accumulating views write a scalar into an intermediate target, then the output pass colorizes it.
-		return useToneMapping || useColorSpace || debugViewAccumulates( this.debug.view );
+		// Only screen output needs one. An off-screen target, such as a scene pass, already is the target.
+		return useToneMapping || useColorSpace || ( debugViewAccumulates( this.debug.view ) && this.isOutputTarget );
 		// !WITH_GENESYS
 		// return useToneMapping || useColorSpace;
 
@@ -2759,9 +2760,7 @@ class Renderer {
 	get currentToneMapping() {
 
 		// WITH_GENESYS
-		const view = this.debug.view;
-
-		if ( view === DEBUG_VIEW_SHADER_COMPLEXITY || view === DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS || view === DEBUG_VIEW_LIGHTING_COMPLEXITY || view === DEBUG_VIEW_QUAD_OVERDRAW || view === DEBUG_VIEW_BUFFER ) {
+		if ( debugViewSkipsToneMapping( this.debug.view ) ) {
 
 			return NoToneMapping;
 

package/src/renderers/webgl-fallback/WebGLBackend.js

@@ -1124,7 +1124,10 @@ class WebGLBackend extends Backend {
 
 		const frontFaceCW = ( object.isMesh && object.matrixWorld.determinantAffine() < 0 );
 
-		state.setMaterial( material, frontFaceCW, hardwareClippingPlanes );
+		// WITH_GENESYS
+		state.setMaterial( material, frontFaceCW, hardwareClippingPlanes, object );
+		// !WITH_GENESYS
+		// state.setMaterial( material, frontFaceCW, hardwareClippingPlanes );
 
 		if ( context.mrt !== null && context.textures !== null ) {
 

package/src/renderers/webgl-fallback/utils/WebGLState.js

@@ -12,7 +12,7 @@ import { Color } from '../../../math/Color.js';
 import { Vector4 } from '../../../math/Vector4.js';
 import { error, ReversedDepthFuncs, warnOnce } from '../../../utils.js';
 // WITH_GENESYS
-import { debugViewAccumulates } from '../../../nodes/display/ComplexityDebug.js';
+import { debugDrawAccumulates } from '../../../nodes/display/ComplexityDebug.js';
 // !WITH_GENESYS
 
 let equationToGL, factorToGL;
@@ -923,8 +923,9 @@ class WebGLState {
 	 * @param {Material} material - The material to configure the state for.
 	 * @param {number} frontFaceCW - Whether the front faces are counter-clockwise or not.
 	 * @param {number} hardwareClippingPlanes - The number of hardware clipping planes.
+	 * @param {?Object3D} [object=null] - The object being drawn. Used by the accumulating debug views.
 	 */
-	setMaterial( material, frontFaceCW, hardwareClippingPlanes ) {
+	setMaterial( material, frontFaceCW, hardwareClippingPlanes, object = null ) {
 
 		const { gl } = this;
 
@@ -939,7 +940,7 @@ class WebGLState {
 
 		// WITH_GENESYS
 		// WebGL has no cached render pipeline. One+One is applied on each draw instead.
-		if ( debugViewAccumulates( this.backend.renderer.debug.view ) && material.isShadowPassMaterial !== true && this.backend.renderer.isOutputTarget !== true ) {
+		if ( debugDrawAccumulates( this.backend.renderer, material, object ) ) {
 
 			this.setBlending( AdditiveBlending, AddEquation, OneFactor, OneFactor, AddEquation, OneFactor, OneFactor, material.blendColor, material.blendAlpha, true );
 

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

@@ -16,7 +16,7 @@ import {
 
 import { error, ReversedDepthFuncs, warn, warnOnce } from '../../../utils.js';
 // WITH_GENESYS
-import { debugViewAccumulates } from '../../../nodes/display/ComplexityDebug.js';
+import { debugDrawAccumulates } from '../../../nodes/display/ComplexityDebug.js';
 // !WITH_GENESYS
 
 import GPUComputePipelineDescriptor from '../descriptors/GPUComputePipelineDescriptor.js';
@@ -111,7 +111,7 @@ class WebGPUPipelineUtils {
 
 		// WITH_GENESYS
 		// Accumulate shader cost with One+One. Opaque materials normally disable blending.
-		if ( debugViewAccumulates( backend.renderer.debug.view ) && material.isShadowPassMaterial !== true && backend.renderer.isOutputTarget !== true ) {
+		if ( debugDrawAccumulates( backend.renderer, material, object ) ) {
 
 			materialBlending = {
 				color: {