@gnsx/three 0.184.15 → 0.184.16

package/package.json

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

package/src/nodes/lighting/PointShadowNode.js

@@ -13,6 +13,9 @@ import { screenCoordinate } from '../display/ScreenNode.js';
 import { interleavedGradientNoise, vogelDiskSample } from '../utils/PostProcessingUtils.js';
 import { abs, normalize, cross } from '../math/MathNode.js';
 import { viewZToPerspectiveDepth, viewZToReversedPerspectiveDepth } from '../display/ViewportDepthNode.js';
+// WITH_GENESYS
+import { ProfilerService } from '../../profiler/ProfilerService.js';
+// !WITH_GENESYS
 
 const _clearColor = /*@__PURE__*/ new Color();
 const _projScreenMatrix = /*@__PURE__*/ new Matrix4();
@@ -261,12 +264,20 @@ class PointShadowNode extends ShadowNode {
 		// Render each cube face
 		for ( let face = 0; face < 6; face ++ ) {
 
+			// WITH_GENESYS
+			const faceLabel = `shadowMap.render.depthPass (face ${face})`;
+			// !WITH_GENESYS
+
 			// Set render target to the specific cube face
 			renderer.setRenderTarget( shadowMap, face );
 			renderer.clear();
 
 			// Update shadow camera matrices for this face
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'shadowMap.render.updateMatrices' );
+			// !WITH_GENESYS
+
 			const far = light.distance || camera.far;
 
 			if ( far !== camera.far ) {
@@ -290,13 +301,23 @@ class PointShadowNode extends ShadowNode {
 			_projScreenMatrix.multiplyMatrices( camera.projectionMatrix, camera.matrixWorldInverse );
 			shadow._frustum.setFromProjectionMatrix( _projScreenMatrix, camera.coordinateSystem, camera.reversedDepth );
 
+			// WITH_GENESYS
+			ProfilerService.end( 'shadowMap.render.updateMatrices' );
+			// !WITH_GENESYS
+
 			//
 
 			const currentSceneName = scene.name;
 
 			scene.name = `Point Light Shadow [ ${ light.name || 'ID: ' + light.id } ] - Face ${ face + 1 }`;
 
+			// WITH_GENESYS
+			ProfilerService.begin( faceLabel );
+			// !WITH_GENESYS
 			renderer.render( scene, camera );
+			// WITH_GENESYS
+			ProfilerService.end( faceLabel );
+			// !WITH_GENESYS
 
 			scene.name = currentSceneName;
 

package/src/nodes/lighting/ShadowNode.js

@@ -680,29 +680,33 @@ class ShadowNode extends ShadowBaseNode {
 	 */
 	renderShadow( frame ) {
 
-		// WITH_GENESYS
-		ProfilerService.begin( 'ShadowNode.renderShadow' );
-		// !WITH_GENESYS
-
 		const { shadow, shadowMap, light } = this;
 		const { renderer, scene } = frame;
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.render.updateMatrices' );
+		// !WITH_GENESYS
 		shadow.updateMatrices( light );
 
 		shadowMap.setSize( shadow.mapSize.width, shadow.mapSize.height, shadowMap.depth );
+		// WITH_GENESYS
+		ProfilerService.end( 'shadowMap.render.updateMatrices' );
+		// !WITH_GENESYS
 
 		const currentSceneName = scene.name;
 
 		scene.name = `Shadow Map [ ${ light.name || 'ID: ' + light.id } ]`;
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.render.depthPass' );
+		// !WITH_GENESYS
 		renderer.render( scene, shadow.camera );
-
-		scene.name = currentSceneName;
-
 		// WITH_GENESYS
-		ProfilerService.end( 'ShadowNode.renderShadow' );
+		ProfilerService.end( 'shadowMap.render.depthPass' );
 		// !WITH_GENESYS
 
+		scene.name = currentSceneName;
+
 	}
 
 	/**
@@ -715,6 +719,11 @@ class ShadowNode extends ShadowBaseNode {
 		const { shadowMap, light, shadow } = this;
 		const { renderer, scene, camera } = frame;
 
+		// WITH_GENESYS
+		const lightLabel = `shadowMap.render.light (${light.name || light.type})`;
+		ProfilerService.begin( lightLabel );
+		// !WITH_GENESYS
+
 		const shadowType = renderer.shadowMap.type;
 
 		const depthVersion = shadowMap.depthTexture.version;
@@ -733,6 +742,9 @@ class ShadowNode extends ShadowBaseNode {
 		const currentMRT = renderer.getMRT();
 		const useVelocity = currentMRT ? currentMRT.has( 'velocity' ) : false;
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.render.setupPass' );
+		// !WITH_GENESYS
 		_rendererState = resetRendererAndSceneState( renderer, scene, _rendererState );
 
 		scene.overrideMaterial = getShadowMaterial( light );
@@ -742,6 +754,9 @@ class ShadowNode extends ShadowBaseNode {
 		renderer.setClearColor( 0x000000, 0 );
 
 		renderer.setRenderTarget( shadowMap );
+		// WITH_GENESYS
+		ProfilerService.end( 'shadowMap.render.setupPass' );
+		// !WITH_GENESYS
 
 		this.renderShadow( frame );
 
@@ -751,7 +766,13 @@ class ShadowNode extends ShadowBaseNode {
 
 		if ( shadowType === VSMShadowMap && shadow.isPointLightShadow !== true ) {
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'shadowMap.render.vsmPass' );
+			// !WITH_GENESYS
 			this.vsmPass( renderer );
+			// WITH_GENESYS
+			ProfilerService.end( 'shadowMap.render.vsmPass' );
+			// !WITH_GENESYS
 
 		}
 
@@ -759,6 +780,10 @@ class ShadowNode extends ShadowBaseNode {
 
 		restoreRendererAndSceneState( renderer, scene, _rendererState );
 
+		// WITH_GENESYS
+		ProfilerService.end( lightLabel );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -768,26 +793,30 @@ class ShadowNode extends ShadowBaseNode {
 	 */
 	vsmPass( renderer ) {
 
-		// WITH_GENESYS
-		ProfilerService.begin( 'ShadowNode.vsmPass' );
-		// !WITH_GENESYS
-
 		const { shadow } = this;
 
 		const depth = this.shadowMap.depth;
 		this.vsmShadowMapVertical.setSize( shadow.mapSize.width, shadow.mapSize.height, depth );
 		this.vsmShadowMapHorizontal.setSize( shadow.mapSize.width, shadow.mapSize.height, depth );
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.vsmPass.vertical' );
+		// !WITH_GENESYS
 		renderer.setRenderTarget( this.vsmShadowMapVertical );
 		_quadMesh.material = this.vsmMaterialVertical;
 		_quadMesh.render( renderer );
+		// WITH_GENESYS
+		ProfilerService.end( 'shadowMap.vsmPass.vertical' );
+		// !WITH_GENESYS
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.vsmPass.horizontal' );
+		// !WITH_GENESYS
 		renderer.setRenderTarget( this.vsmShadowMapHorizontal );
 		_quadMesh.material = this.vsmMaterialHorizontal;
 		_quadMesh.render( renderer );
-
 		// WITH_GENESYS
-		ProfilerService.end( 'ShadowNode.vsmPass' );
+		ProfilerService.end( 'shadowMap.vsmPass.horizontal' );
 		// !WITH_GENESYS
 
 	}

package/src/renderers/WebGLRenderer.js

@@ -54,6 +54,9 @@ import { WebGLUniformsGroups } from './webgl/WebGLUniformsGroups.js';
 import { createCanvasElement, probeAsync, error, warn, log } from '../utils.js';
 import { ColorManagement } from '../math/ColorManagement.js';
 import { getDFGLUT } from './shaders/DFGLUTData.js';
+// WITH_GENESYS
+import { ProfilerService } from '../profiler/ProfilerService.js';
+// !WITH_GENESYS
 
 /**
  * This renderer uses WebGL 2 to display scenes.
@@ -1600,14 +1603,28 @@ class WebGLRenderer {
 		 */
 		this.render = function ( scene, camera ) {
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'WebGLRenderer.render' );
+			// !WITH_GENESYS
+
 			if ( camera !== undefined && camera.isCamera !== true ) {
 
 				error( 'WebGLRenderer.render: camera is not an instance of THREE.Camera.' );
+				// WITH_GENESYS
+				ProfilerService.end( 'WebGLRenderer.render' );
+				// !WITH_GENESYS
 				return;
 
 			}
 
-			if ( _isContextLost === true ) return;
+			if ( _isContextLost === true ) {
+
+				// WITH_GENESYS
+				ProfilerService.end( 'WebGLRenderer.render' );
+				// !WITH_GENESYS
+				return;
+
+			}
 
 			// update node builder if available
 			if ( _nodesHandler !== null ) {
@@ -1624,7 +1641,13 @@ class WebGLRenderer {
 
 			// update scene graph
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'scene.updateMatrixWorld' );
+			// !WITH_GENESYS
 			if ( scene.matrixWorldAutoUpdate === true ) scene.updateMatrixWorld();
+			// WITH_GENESYS
+			ProfilerService.end( 'scene.updateMatrixWorld' );
+			// !WITH_GENESYS
 
 			// update camera matrices and frustum
 
@@ -1658,6 +1681,10 @@ class WebGLRenderer {
 
 			renderListStack.push( currentRenderList );
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'buildRenderList' );
+			// !WITH_GENESYS
+
 			if ( xr.enabled === true && xr.isPresenting === true ) {
 
 				const depthSensingMesh = _this.xr.getDepthSensingMesh();
@@ -1670,16 +1697,34 @@ class WebGLRenderer {
 
 			}
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'projectObject' );
+			// !WITH_GENESYS
+
 			projectObject( scene, camera, 0, _this.sortObjects );
 
+			// WITH_GENESYS
+			ProfilerService.end( 'projectObject' );
+			// !WITH_GENESYS
+
 			currentRenderList.finish();
 
 			if ( _this.sortObjects === true ) {
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'sortRenderList' );
+				// !WITH_GENESYS
 				currentRenderList.sort( _opaqueSort, _transparentSort );
+				// WITH_GENESYS
+				ProfilerService.end( 'sortRenderList' );
+				// !WITH_GENESYS
 
 			}
 
+			// WITH_GENESYS
+			ProfilerService.end( 'buildRenderList' );
+			// !WITH_GENESYS
+
 			_renderBackground = xr.enabled === false || xr.isPresenting === false || xr.hasDepthSensing() === false;
 			if ( _renderBackground ) {
 
@@ -1695,7 +1740,13 @@ class WebGLRenderer {
 
 			const shadowsArray = currentRenderState.state.shadowsArray;
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'shadowMap.render' );
+			// !WITH_GENESYS
 			shadowMap.render( shadowsArray, scene, camera );
+			// WITH_GENESYS
+			ProfilerService.end( 'shadowMap.render' );
+			// !WITH_GENESYS
 
 			if ( _clippingEnabled === true ) clipping.endShadows();
 
@@ -1709,6 +1760,10 @@ class WebGLRenderer {
 
 			if ( skipSceneRender === false ) {
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'WebGLRenderer.renderScene' );
+				// !WITH_GENESYS
+
 				const opaqueObjects = currentRenderList.opaque;
 				const transmissiveObjects = currentRenderList.transmissive;
 
@@ -1750,6 +1805,10 @@ class WebGLRenderer {
 
 				}
 
+				// WITH_GENESYS
+				ProfilerService.end( 'WebGLRenderer.renderScene' );
+				// !WITH_GENESYS
+
 			}
 
 			//
@@ -1770,7 +1829,13 @@ class WebGLRenderer {
 
 			if ( useOutput ) {
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'WebGLOutput.end' );
+				// !WITH_GENESYS
 				output.end( _this );
+				// WITH_GENESYS
+				ProfilerService.end( 'WebGLOutput.end' );
+				// !WITH_GENESYS
 
 			}
 
@@ -1818,6 +1883,10 @@ class WebGLRenderer {
 
 			}
 
+			// WITH_GENESYS
+			ProfilerService.end( 'WebGLRenderer.render' );
+			// !WITH_GENESYS
+
 		};
 
 		function projectObject( object, camera, groupOrder, sortObjects ) {
@@ -1964,10 +2033,17 @@ class WebGLRenderer {
 
 		function renderTransmissionPass( opaqueObjects, transmissiveObjects, scene, camera ) {
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'WebGLRenderer.renderTransmissionPass' );
+			// !WITH_GENESYS
+
 			const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
 
 			if ( overrideMaterial !== null ) {
 
+				// WITH_GENESYS
+				ProfilerService.end( 'WebGLRenderer.renderTransmissionPass' );
+				// !WITH_GENESYS
 				return;
 
 			}
@@ -2084,10 +2160,19 @@ class WebGLRenderer {
 
 			_this.toneMapping = currentToneMapping;
 
+			// WITH_GENESYS
+			ProfilerService.end( 'WebGLRenderer.renderTransmissionPass' );
+			// !WITH_GENESYS
+
 		}
 
 		function renderObjects( renderList, scene, camera ) {
 
+			// WITH_GENESYS
+			const renderObjectsLabel = `renderObjects (${renderList.length})`;
+			ProfilerService.begin( renderObjectsLabel );
+			// !WITH_GENESYS
+
 			const overrideMaterial = scene.isScene === true ? scene.overrideMaterial : null;
 
 			for ( let i = 0, l = renderList.length; i < l; i ++ ) {
@@ -2111,6 +2196,10 @@ class WebGLRenderer {
 
 			}
 
+			// WITH_GENESYS
+			ProfilerService.end( renderObjectsLabel );
+			// !WITH_GENESYS
+
 		}
 
 		function renderObject( object, scene, camera, geometry, material, group ) {

package/src/renderers/webgl/WebGLShadowMap.js

@@ -17,6 +17,9 @@ import { CubeDepthTexture } from '../../textures/CubeDepthTexture.js';
 import * as vsm from '../shaders/ShaderLib/vsm.glsl.js';
 import { warn } from '../../utils.js';
 import { Vector3 } from '../../math/Vector3.js';
+// WITH_GENESYS
+import { ProfilerService } from '../../profiler/ProfilerService.js';
+// !WITH_GENESYS
 
 const _cubeDirections = [
 	/*@__PURE__*/ new Vector3( 1, 0, 0 ), /*@__PURE__*/ new Vector3( - 1, 0, 0 ), /*@__PURE__*/ new Vector3( 0, 1, 0 ),
@@ -133,6 +136,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 		// (sampler2DShadow for PCF vs sampler2D for Basic)
 		if ( typeChanged ) {
 
+			// WITH_GENESYS
+			ProfilerService.begin( 'shadowMap.render.typeChangeMaterialUpdate' );
+			// !WITH_GENESYS
+
 			scene.traverse( function ( object ) {
 
 				if ( object.material ) {
@@ -151,6 +158,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 			} );
 
+			// WITH_GENESYS
+			ProfilerService.end( 'shadowMap.render.typeChangeMaterialUpdate' );
+			// !WITH_GENESYS
+
 		}
 
 		// render depth map
@@ -160,14 +171,29 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 			const light = lights[ i ];
 			const shadow = light.shadow;
 
+			// WITH_GENESYS
+			const lightLabel = `shadowMap.render.light (${light.name || light.type})`;
+			ProfilerService.begin( lightLabel );
+			// !WITH_GENESYS
+
 			if ( shadow === undefined ) {
 
 				warn( 'WebGLShadowMap:', light, 'has no shadow.' );
+				// WITH_GENESYS
+				ProfilerService.end( lightLabel );
+				// !WITH_GENESYS
 				continue;
 
 			}
 
-			if ( shadow.autoUpdate === false && shadow.needsUpdate === false ) continue;
+			if ( shadow.autoUpdate === false && shadow.needsUpdate === false ) {
+
+				// WITH_GENESYS
+				ProfilerService.end( lightLabel );
+				// !WITH_GENESYS
+				continue;
+
+			}
 
 			_shadowMapSize.copy( shadow.mapSize );
 
@@ -202,6 +228,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 			if ( shadow.map === null || typeChanged === true ) {
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'shadowMap.render.setupMap' );
+				// !WITH_GENESYS
+
 				if ( shadow.map !== null ) {
 
 					if ( shadow.map.depthTexture !== null ) {
@@ -220,6 +250,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 					if ( light.isPointLight ) {
 
 						warn( 'WebGLShadowMap: VSM shadow maps are not supported for PointLights. Use PCF or BasicShadowMap instead.' );
+						// WITH_GENESYS
+						ProfilerService.end( 'shadowMap.render.setupMap' );
+						ProfilerService.end( lightLabel );
+						// !WITH_GENESYS
 						continue;
 
 					}
@@ -276,6 +310,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 				shadow.camera.updateProjectionMatrix();
 
+				// WITH_GENESYS
+				ProfilerService.end( 'shadowMap.render.setupMap' );
+				// !WITH_GENESYS
+
 			}
 
 			// For cube render targets (PointLights), render all 6 faces. Otherwise, render once.
@@ -283,6 +321,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 			for ( let face = 0; face < faceCount; face ++ ) {
 
+				// WITH_GENESYS
+				const faceLabel = faceCount > 1 ? `shadowMap.render.depthPass (face ${face})` : 'shadowMap.render.depthPass';
+				// !WITH_GENESYS
+
 				// For cube render targets, render to each face separately
 				if ( shadow.map.isWebGLCubeRenderTarget ) {
 
@@ -312,6 +354,10 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 				}
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'shadowMap.render.updateMatrices' );
+				// !WITH_GENESYS
+
 				if ( light.isPointLight ) {
 
 					const camera = shadow.camera;
@@ -346,9 +392,19 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 				}
 
+				// WITH_GENESYS
+				ProfilerService.end( 'shadowMap.render.updateMatrices' );
+				// !WITH_GENESYS
+
 				_frustum = shadow.getFrustum();
 
+				// WITH_GENESYS
+				ProfilerService.begin( faceLabel );
+				// !WITH_GENESYS
 				renderObject( scene, camera, shadow.camera, light, this.type );
+				// WITH_GENESYS
+				ProfilerService.end( faceLabel );
+				// !WITH_GENESYS
 
 			}
 
@@ -356,12 +412,22 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 			if ( shadow.isPointLightShadow !== true && this.type === VSMShadowMap ) {
 
+				// WITH_GENESYS
+				ProfilerService.begin( 'shadowMap.render.vsmPass' );
+				// !WITH_GENESYS
 				VSMPass( shadow, camera );
+				// WITH_GENESYS
+				ProfilerService.end( 'shadowMap.render.vsmPass' );
+				// !WITH_GENESYS
 
 			}
 
 			shadow.needsUpdate = false;
 
+			// WITH_GENESYS
+			ProfilerService.end( lightLabel );
+			// !WITH_GENESYS
+
 		}
 
 		_previousType = this.type;
@@ -397,21 +463,33 @@ function WebGLShadowMap( renderer, objects, capabilities ) {
 
 		// vertical pass - read from native depth texture
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.vsmPass.vertical' );
+		// !WITH_GENESYS
 		shadowMaterialVertical.uniforms.shadow_pass.value = shadow.map.depthTexture;
 		shadowMaterialVertical.uniforms.resolution.value = shadow.mapSize;
 		shadowMaterialVertical.uniforms.radius.value = shadow.radius;
 		renderer.setRenderTarget( shadow.mapPass );
 		renderer.clear();
 		renderer.renderBufferDirect( camera, null, geometry, shadowMaterialVertical, fullScreenMesh, null );
+		// WITH_GENESYS
+		ProfilerService.end( 'shadowMap.vsmPass.vertical' );
+		// !WITH_GENESYS
 
 		// horizontal pass
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'shadowMap.vsmPass.horizontal' );
+		// !WITH_GENESYS
 		shadowMaterialHorizontal.uniforms.shadow_pass.value = shadow.mapPass.texture;
 		shadowMaterialHorizontal.uniforms.resolution.value = shadow.mapSize;
 		shadowMaterialHorizontal.uniforms.radius.value = shadow.radius;
 		renderer.setRenderTarget( shadow.map );
 		renderer.clear();
 		renderer.renderBufferDirect( camera, null, geometry, shadowMaterialHorizontal, fullScreenMesh, null );
+		// WITH_GENESYS
+		ProfilerService.end( 'shadowMap.vsmPass.horizontal' );
+		// !WITH_GENESYS
 
 	}