@gnsx/three 0.186.4 → 0.186.6

package/src/renderers/common/nodes/NodeManager.js

@@ -10,7 +10,7 @@ import { builtin } from '../../../nodes/accessors/BuiltinNode.js';
 import { CubeUVReflectionMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping, NoToneMapping } from '../../../constants.js';
 // WITH_GENESYS
 import { vec4 } from '../../../nodes/tsl/TSLCore.js';
-import { colorizeShaderComplexity, DEBUG_VIEW_SHADER_COMPLEXITY } from '../../../nodes/display/ComplexityDebug.js';
+import { colorizeQuadOverdraw, colorizeShaderComplexity, DEBUG_VIEW_QUAD_OVERDRAW, DEBUG_VIEW_SHADER_COMPLEXITY, DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS, SHADER_COMPLEXITY_QUAD_COUNT_SCALE } from '../../../nodes/display/ComplexityDebug.js';
 // !WITH_GENESYS
 import { hashArray } from '../../../nodes/core/NodeUtils.js';
 import { error } from '../../../utils.js';
@@ -1035,9 +1035,19 @@ class NodeManager extends DataMap {
 		}
 
 		// WITH_GENESYS
-		if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY ) {
+		if ( renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY || renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS ) {
 
-			return vec4( colorizeShaderComplexity( sampled.r ), 1 ).renderOutput( NoToneMapping, renderer.currentColorSpace );
+			const complexity = renderer.debug.view === DEBUG_VIEW_SHADER_COMPLEXITY_AND_QUADS
+				? sampled.r.mul( sampled.g ).mul( SHADER_COMPLEXITY_QUAD_COUNT_SCALE )
+				: sampled.r;
+
+			return vec4( colorizeShaderComplexity( complexity ), 1 ).renderOutput( NoToneMapping, renderer.currentColorSpace );
+
+		}
+
+		if ( renderer.debug.view === DEBUG_VIEW_QUAD_OVERDRAW ) {
+
+			return vec4( colorizeQuadOverdraw( sampled.r ), 1 ).renderOutput( NoToneMapping, renderer.currentColorSpace );
 
 		}
 		// !WITH_GENESYS

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

@@ -11,6 +11,9 @@ import {
 import { Color } from '../../../math/Color.js';
 import { Vector4 } from '../../../math/Vector4.js';
 import { error, ReversedDepthFuncs, warnOnce } from '../../../utils.js';
+// WITH_GENESYS
+import { debugDrawAccumulates } from '../../../nodes/display/ComplexityDebug.js';
+// !WITH_GENESYS
 
 let equationToGL, factorToGL;
 
@@ -920,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;
 
@@ -936,7 +940,7 @@ class WebGLState {
 
 		// WITH_GENESYS
 		// WebGL has no cached render pipeline. One+One is applied on each draw instead.
-		if ( this.backend.renderer.debug.view === 'shaderComplexity' && 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

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