@gnsx/three 0.184.12 → 0.184.13

package/package.json

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

package/src/Three.Core.js

@@ -164,6 +164,11 @@ export { createCanvasElement, setConsoleFunction, getConsoleFunction, log, warn,
 export * from './constants.js';
 export * from './Three.Legacy.js';
 
+// WITH_GENESYS
+export { ProfilerService, profile, profileClass } from './profiler/ProfilerService.js';
+// !WITH_GENESYS
+
+
 if ( typeof __THREE_DEVTOOLS__ !== 'undefined' ) {
 
 	__THREE_DEVTOOLS__.dispatchEvent( new CustomEvent( 'register', { detail: {

package/src/Three.js

@@ -8,6 +8,3 @@ export { UniformsUtils } from './renderers/shaders/UniformsUtils.js';
 export { ShaderChunk } from './renderers/shaders/ShaderChunk.js';
 export { PMREMGenerator } from './extras/PMREMGenerator.js';
 export { WebGLUtils } from './renderers/webgl/WebGLUtils.js';
-// WITH_GENESYS
-export { ProfilerService, profile, profileClass } from './profiler/ProfilerService.js';
-// !WITH_GENESYS

package/src/nodes/core/NodeFrame.js

@@ -1,5 +1,9 @@
 import { NodeUpdateType } from './constants.js';
 
+// WITH_GENESYS
+import { ProfilerService } from '../../profiler/ProfilerService.js';
+// !WITH_GENESYS
+
 /**
  * Management class for updating nodes. The module tracks metrics like
  * the elapsed time, delta time, the render and frame ID to correctly
@@ -146,6 +150,11 @@ class NodeFrame {
 	 */
 	updateBeforeNode( node ) {
 
+		// WITH_GENESYS
+		const label = `${node.type}.updateBefore`;
+		ProfilerService.begin( label );
+		// !WITH_GENESYS
+
 		const updateType = node.getUpdateBeforeType();
 		const reference = node.updateReference( this );
 
@@ -191,6 +200,10 @@ class NodeFrame {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.end( label );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -203,6 +216,11 @@ class NodeFrame {
 	 */
 	updateAfterNode( node ) {
 
+		// WITH_GENESYS
+		const label = `${node.type}.updateAfter`;
+		ProfilerService.begin( label );
+		// !WITH_GENESYS
+
 		const updateType = node.getUpdateAfterType();
 		const reference = node.updateReference( this );
 
@@ -240,6 +258,10 @@ class NodeFrame {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.end( label );
+		// !WITH_GENESYS
+
 	}
 
 	/**

package/src/nodes/lighting/ShadowNode.js

@@ -24,6 +24,10 @@ import { uv } from '../accessors/UV.js';
 import { positionLocal } from '../accessors/Position.js';
 import { uniform } from '../core/UniformNode.js';
 
+// WITH_GENESYS
+import { ProfilerService } from '../../profiler/ProfilerService.js';
+// !WITH_GENESYS
+
 //
 
 const _shadowRenderObjectLibrary = /*@__PURE__*/ new ChainMap();
@@ -676,6 +680,10 @@ class ShadowNode extends ShadowBaseNode {
 	 */
 	renderShadow( frame ) {
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'ShadowNode.renderShadow' );
+		// !WITH_GENESYS
+
 		const { shadow, shadowMap, light } = this;
 		const { renderer, scene } = frame;
 
@@ -691,6 +699,10 @@ class ShadowNode extends ShadowBaseNode {
 
 		scene.name = currentSceneName;
 
+		// WITH_GENESYS
+		ProfilerService.end( 'ShadowNode.renderShadow' );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -756,6 +768,10 @@ class ShadowNode extends ShadowBaseNode {
 	 */
 	vsmPass( renderer ) {
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'ShadowNode.vsmPass' );
+		// !WITH_GENESYS
+
 		const { shadow } = this;
 
 		const depth = this.shadowMap.depth;
@@ -770,6 +786,10 @@ class ShadowNode extends ShadowBaseNode {
 		_quadMesh.material = this.vsmMaterialHorizontal;
 		_quadMesh.render( renderer );
 
+		// WITH_GENESYS
+		ProfilerService.end( 'ShadowNode.vsmPass' );
+		// !WITH_GENESYS
+
 	}
 
 	/**

package/src/profiler/ProfilerService.js

@@ -48,11 +48,12 @@ class ProfilerServiceClass {
 		this.cursors = new Map();
 		/** @type {Map<string, number>} */
 		this.counts = new Map();
-		/** @type {Map<string, number>} */
+		/** @type {Map<string, Array<{ startTime: number, startMark: string, traced: boolean }>>} */
 		this.marks = new Map();
-		/** @type {Array<{ name: string, ph: 'X', ts: number, dur: number, pid: 1, tid: 1, cat: 'gnsx' }>} */
+		/** @type {ChromeTraceEvent[]} */
 		this.traceEvents = [];
 		this.traceStartTime = 0;
+		this._markId = 0;
 
 		if ( this._enabled ) {
 
@@ -133,8 +134,32 @@ class ProfilerServiceClass {
 	 */
 	_beginImpl( label ) {
 
-		performance.mark( `gnsx:${label}:start` );
-		this.marks.set( label, performance.now() );
+		const startTime = performance.now();
+		const startMark = `gnsx:${label}:start:${++ this._markId}`;
+		let stack = this.marks.get( label );
+		if ( stack === undefined ) {
+
+			stack = [];
+			this.marks.set( label, stack );
+
+		}
+
+		const traced = this._profile === 'full' && this.traceEvents.length < MAX_TRACE_EVENTS;
+		if ( traced ) {
+
+			this.traceEvents.push( {
+				name: label,
+				ph: 'B',
+				ts: this._getTraceTimestamp( startTime ),
+				pid: 1,
+				tid: 1,
+				cat: 'gnsx',
+			} );
+
+		}
+
+		performance.mark( startMark );
+		stack.push( { startTime, startMark, traced } );
 
 	}
 
@@ -143,15 +168,18 @@ class ProfilerServiceClass {
 	 */
 	_endImpl( label ) {
 
-		const startTime = this.marks.get( label );
-		if ( startTime === undefined ) return;
-		this.marks.delete( label );
+		const stack = this.marks.get( label );
+		const mark = stack?.pop();
+		if ( mark === undefined ) return;
+		if ( stack.length === 0 ) this.marks.delete( label );
 
 		const now = performance.now();
+		const { startTime, startMark, traced } = mark;
 		const duration = now - startTime;
+		const endMark = `gnsx:${label}:end:${++ this._markId}`;
 
-		performance.mark( `gnsx:${label}:end` );
-		performance.measure( `gnsx:${label}`, `gnsx:${label}:start`, `gnsx:${label}:end` );
+		performance.mark( endMark );
+		performance.measure( `gnsx:${label}`, startMark, endMark );
 
 		let buffer = this.buffers.get( label );
 		if ( ! buffer ) {
@@ -168,13 +196,12 @@ class ProfilerServiceClass {
 		this.cursors.set( label, ( cursor + 1 ) % RING_SIZE );
 		this.counts.set( label, Math.min( ( this.counts.get( label ) + 1 ), RING_SIZE ) );
 
-		if ( this._profile === 'full' && this.traceEvents.length < MAX_TRACE_EVENTS ) {
+		if ( traced ) {
 
 			this.traceEvents.push( {
 				name: label,
-				ph: 'X',
-				ts: Math.round( ( startTime - this.traceStartTime ) * 1000 ),
-				dur: Math.max( 1, Math.round( duration * 1000 ) ),
+				ph: 'E',
+				ts: this._getTraceTimestamp( now ),
 				pid: 1,
 				tid: 1,
 				cat: 'gnsx',
@@ -264,7 +291,24 @@ class ProfilerServiceClass {
 	 */
 	exportChromeTrace() {
 
-		return { traceEvents: [ ...this.traceEvents ] };
+		return {
+			displayTimeUnit: 'ms',
+			traceEvents: [
+				{ name: 'process_name', ph: 'M', pid: 1, args: { name: 'Genesys Profiler' } },
+				{ name: 'thread_name', ph: 'M', pid: 1, tid: 1, args: { name: 'Main Thread' } },
+				...this.traceEvents,
+			],
+		};
+
+	}
+
+	/**
+	 * @param {number} time
+	 * @return {number}
+	 */
+	_getTraceTimestamp( time ) {
+
+		return ( time - this.traceStartTime ) * 1000;
 
 	}
 
@@ -323,6 +367,7 @@ class ProfilerServiceClass {
 		this.marks.clear();
 		this.traceEvents = [];
 		this.traceStartTime = performance.now();
+		this._markId = 0;
 
 	}
 
@@ -346,10 +391,29 @@ class ProfilerServiceClass {
  * @property {number} frameBudget Percentage of a 60 fps frame budget (16.67 ms)
  */
 
+/**
+ * @typedef {Object} ChromeTraceEvent
+ * @property {string} name
+ * @property {'B'|'E'} ph
+ * @property {number} ts
+ * @property {1} pid
+ * @property {1} tid
+ * @property {'gnsx'} cat
+ */
+
+/**
+ * @typedef {Object} ChromeTraceMetadataEvent
+ * @property {'process_name'|'thread_name'} name
+ * @property {'M'} ph
+ * @property {1} pid
+ * @property {1} [tid]
+ * @property {{ name: string }} args
+ */
+
 /**
  * @typedef {Object} ChromeTrace
- * @property {Array<{ name: string, ph: 'X', ts: number, dur: number, pid: 1, tid: 1, cat: 'gnsx' }>} traceEvents
- * @property {{ 'clock-offset-since-epoch-ns'?: number }|undefined} [metadata]
+ * @property {'ms'} displayTimeUnit
+ * @property {Array<ChromeTraceEvent|ChromeTraceMetadataEvent>} traceEvents
  */
 
 /**
@@ -367,15 +431,24 @@ function applyProfileToMethod( label, descriptor ) {
 	function profiled( ...args ) {
 
 		ProfilerService.begin( label );
-		const result = original.apply( this, args );
-		if ( result instanceof Promise ) {
+		try {
 
-			return result.finally( () => ProfilerService.end( label ) );
+			const result = original.apply( this, args );
+			if ( result instanceof Promise ) {
 
-		}
+				return result.finally( () => ProfilerService.end( label ) );
+
+			}
 
-		ProfilerService.end( label );
-		return result;
+			ProfilerService.end( label );
+			return result;
+
+		} catch ( error ) {
+
+			ProfilerService.end( label );
+			throw error;
+
+		}
 
 	}
 

package/src/renderers/common/Renderer.js

@@ -36,6 +36,7 @@ import { float, vec3, vec4, Fn } from '../../nodes/tsl/TSLCore.js';
 // WITH_GENESYS
 import { detachRendererReference } from '../../nodes/accessors/RendererReferenceNode.js';
 import { toneMappingExposure } from '../../nodes/display/ToneMappingNode.js';
+import { ProfilerService } from '../../profiler/ProfilerService.js';
 // !WITH_GENESYS
 import { reference } from '../../nodes/accessors/ReferenceNode.js';
 import { highpModelNormalViewMatrix, highpModelViewMatrix } from '../../nodes/accessors/ModelNode.js';
@@ -1214,6 +1215,10 @@ class Renderer {
 	 */
 	_renderBundle( bundle, sceneRef, lightsNode ) {
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'renderBundle' );
+		// !WITH_GENESYS
+
 		const { bundleGroup, camera, renderList } = bundle;
 
 		const renderContext = this._currentRenderContext;
@@ -1280,6 +1285,10 @@ class Renderer {
 
 		this.backend.addBundle( renderContext, renderBundle );
 
+		// WITH_GENESYS
+		ProfilerService.end( 'renderBundle' );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -1299,6 +1308,10 @@ class Renderer {
 	 */
 	render( scene, camera ) {
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'Renderer.render' );
+		// !WITH_GENESYS
+
 		if ( this._initialized === false ) {
 
 			throw new Error( 'Renderer: .render() called before the backend is initialized. Use "await renderer.init();" before rendering.' );
@@ -1307,6 +1320,10 @@ class Renderer {
 
 		this._renderScene( scene, camera );
 
+		// WITH_GENESYS
+		ProfilerService.end( 'Renderer.render' );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -1426,6 +1443,10 @@ class Renderer {
 
 		if ( this._isDeviceLost === true ) return;
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'Renderer._renderScene' );
+		// !WITH_GENESYS
+
 		//
 
 		const frameBufferTarget = useFrameBufferTarget ? this._getFrameBufferTarget() : null;
@@ -1583,7 +1604,13 @@ class Renderer {
 
 		//
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'scene.updateMatrixWorld' );
+		// !WITH_GENESYS
 		if ( scene.matrixWorldAutoUpdate === true ) scene.updateMatrixWorld();
+		// WITH_GENESYS
+		ProfilerService.end( 'scene.updateMatrixWorld' );
+		// !WITH_GENESYS
 
 		if ( camera.parent === null && camera.matrixWorldAutoUpdate === true ) camera.updateMatrixWorld();
 
@@ -1647,11 +1674,23 @@ class Renderer {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.begin( 'buildRenderList' );
+		// !WITH_GENESYS
+
 		const renderList = this._renderLists.get( scene, camera );
 		renderList.begin();
 
+		// WITH_GENESYS
+		ProfilerService.begin( '_projectObject' );
+		// !WITH_GENESYS
+
 		this._projectObject( scene, camera, 0, renderList, renderContext.clippingContext );
 
+		// WITH_GENESYS
+		ProfilerService.end( '_projectObject' );
+		// !WITH_GENESYS
+
 		renderList.finish();
 
 		if ( this.sortObjects === true ) {
@@ -1660,6 +1699,10 @@ class Renderer {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.end( 'buildRenderList' );
+		// !WITH_GENESYS
+
 		//
 
 		if ( renderTarget !== null ) {
@@ -1766,6 +1809,10 @@ class Renderer {
 
 		//
 
+		// WITH_GENESYS
+		ProfilerService.end( 'Renderer._renderScene' );
+		// !WITH_GENESYS
+
 		return renderContext;
 
 	}
@@ -3248,6 +3295,10 @@ class Renderer {
 	 */
 	_renderTransparents( renderList, doublePassList, camera, scene, lightsNode ) {
 
+		// WITH_GENESYS
+		ProfilerService.begin( '_renderTransparents' );
+		// !WITH_GENESYS
+
 		if ( doublePassList.length > 0 ) {
 
 			// render back side
@@ -3284,6 +3335,10 @@ class Renderer {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.end( '_renderTransparents' );
+		// !WITH_GENESYS
+
 	}
 
 	/**
@@ -3298,6 +3353,11 @@ class Renderer {
 	 */
 	_renderObjects( renderList, camera, scene, lightsNode, passId = null ) {
 
+		// WITH_GENESYS
+		const label = `${this._currentRenderObjectFunction?.name || 'renderObject'} (${renderList.length})`;
+		ProfilerService.begin( label );
+		// !WITH_GENESYS
+
 		for ( let i = 0, il = renderList.length; i < il; i ++ ) {
 
 			const { object, geometry, material, group, clippingContext } = renderList[ i ];
@@ -3306,6 +3366,10 @@ class Renderer {
 
 		}
 
+		// WITH_GENESYS
+		ProfilerService.end( label );
+		// !WITH_GENESYS
+
 	}
 
 	/**