@gnsx/three 0.185.15 → 0.186.0

package/src/renderers/common/RenderLists.js

@@ -13,24 +13,32 @@ class RenderLists {
 
 	/**
 	 * Constructs a render lists management component.
-	 *
-	 * @param {Lighting} lighting - The lighting management component.
 	 */
-	constructor( lighting ) {
+	constructor() {
 
 		/**
-		 * The lighting management component.
+		 * The internal chain map which holds the render lists.
 		 *
-		 * @type {Lighting}
+		 * @type {ChainMap}
 		 */
-		this.lighting = lighting;
+		this.lists = new ChainMap();
 
 		/**
-		 * The internal chain map which holds the render lists.
+		 * The render lists which are currently in use. Lists are removed
+		 * as soon as they become stale.
 		 *
-		 * @type {ChainMap}
+		 * @private
+		 * @type {Set<RenderList>}
 		 */
-		this.lists = new ChainMap();
+		this._activeLists = new Set();
+
+		/**
+		 * The current frame ID.
+		 *
+		 * @private
+		 * @type {number}
+		 */
+		this._frameId = - 1;
 
 	}
 
@@ -39,31 +47,67 @@ class RenderLists {
 	 *
 	 * @param {Scene} scene - The scene.
 	 * @param {Camera} camera - The camera.
+	 * @param {Lighting} lighting - The lighting manager.
 	 * @return {RenderList} The render list.
 	 */
-	get( scene, camera ) {
+	get( scene, camera, lighting ) {
 
 		const lists = this.lists;
 
 		_chainKeys[ 0 ] = scene;
 		_chainKeys[ 1 ] = camera;
+		_chainKeys[ 2 ] = lighting;
 
 		let list = lists.get( _chainKeys );
 
 		if ( list === undefined ) {
 
-			list = new RenderList( this.lighting, scene, camera );
+			list = new RenderList( lighting, scene, camera );
 			lists.set( _chainKeys, list );
 
 		}
 
 		_chainKeys[ 0 ] = null;
 		_chainKeys[ 1 ] = null;
+		_chainKeys[ 2 ] = null;
+
+		//
+
+		list.frameId = this._frameId;
+		this._activeLists.add( list );
 
 		return list;
 
 	}
 
+	/**
+	 * Must be called when a new frame begins.
+	 *
+	 * @param {number} frameId - The current frame ID.
+	 */
+	update( frameId ) {
+
+		if ( frameId === this._frameId ) return;
+
+		this._frameId = frameId;
+
+		for ( const list of this._activeLists ) {
+
+			// if a render list has not been used within 10 frames, consider
+			// it as inactive and clear it
+
+			if ( frameId - list.frameId > 10 ) {
+
+				list.clear();
+
+				this._activeLists.delete( list );
+
+			}
+
+		}
+
+	}
+
 	/**
 	 * Frees all internal resources.
 	 */
@@ -71,6 +115,9 @@ class RenderLists {
 
 		this.lists = new ChainMap();
 
+		this._activeLists.clear();
+		this._frameId = - 1;
+
 	}
 
 }

package/src/renderers/common/RenderObject.js

@@ -343,6 +343,19 @@ class RenderObject {
 
 		};
 
+		/**
+		 * An event listener which is executed when `dispose()` is called on
+		 * the 3D object of this render object.
+		 *
+		 * @method
+		 */
+		this.onObjectDispose = () => {
+
+			this.dispose();
+
+		};
+
+		this.object.addEventListener( 'dispose', this.onObjectDispose );
 		this.material.addEventListener( 'dispose', this.onMaterialDispose );
 		this.geometry.addEventListener( 'dispose', this.onGeometryDispose );
 
@@ -957,6 +970,7 @@ class RenderObject {
 	 */
 	dispose() {
 
+		this.object.removeEventListener( 'dispose', this.onObjectDispose );
 		this.material.removeEventListener( 'dispose', this.onMaterialDispose );
 		this.geometry.removeEventListener( 'dispose', this.onGeometryDispose );
 

package/src/renderers/common/RenderObjects.js

@@ -68,9 +68,18 @@ class RenderObjects {
 		 * A dictionary that manages render contexts in chain maps
 		 * for each pass ID.
 		 *
+		 * @private
 		 * @type {Object<string,ChainMap>}
 		 */
-		this.chainMaps = {};
+		this._chainMaps = {};
+
+		/**
+		 * Stores all render objects created by this component.
+		 *
+		 * @private
+		 * @type {Set<RenderObject>}
+		 */
+		this._renderObjects = new Set();
 
 		// WITH_GENESYS
 		/**
@@ -180,7 +189,7 @@ class RenderObjects {
 	 */
 	getChainMap( passId = 'default' ) {
 
-		return this.chainMaps[ passId ] || ( this.chainMaps[ passId ] = new ChainMap() );
+		return this._chainMaps[ passId ] || ( this._chainMaps[ passId ] = new ChainMap() );
 
 	}
 
@@ -202,8 +211,8 @@ class RenderObjects {
 
 		}
 
+		this._chainMaps = {};
 		// !WITH_GENESYS
-		this.chainMaps = {};
 
 	}
 
@@ -276,10 +285,6 @@ class RenderObjects {
 
 		const renderObject = new RenderObject( nodes, geometries, renderer, object, material, scene, camera, lightsNode, renderContext, clippingContext );
 
-		// WITH_GENESYS
-		this._renderObjects.add( renderObject );
-		// !WITH_GENESYS
-
 		renderObject.onDispose = () => {
 
 			this.pipelines.delete( renderObject );
@@ -288,12 +293,12 @@ class RenderObjects {
 
 			chainMap.delete( renderObject.getChainArray() );
 
-			// WITH_GENESYS
 			this._renderObjects.delete( renderObject );
-			// !WITH_GENESYS
 
 		};
 
+		this._renderObjects.add( renderObject );
+
 		return renderObject;
 
 	}

package/src/renderers/common/RenderPipeline.js

@@ -1,6 +1,6 @@
 import NodeMaterial from '../../materials/nodes/NodeMaterial.js';
 import { ColorManagement } from '../../math/ColorManagement.js';
-import { vec4, renderOutput } from '../../nodes/TSL.js';
+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';
@@ -29,6 +29,15 @@ class RenderPipeline {
 	 */
 	constructor( renderer, outputNode = vec4( 0, 0, 1, 1 ) ) {
 
+		/**
+		 * This flag can be used for type testing.
+		 *
+		 * @type {boolean}
+		 * @readonly
+		 * @default true
+		 */
+		this.isRenderPipeline = true;
+
 		/**
 		 * A reference to the renderer.
 		 *
@@ -86,13 +95,13 @@ class RenderPipeline {
 		this._quadMesh.name = 'Render Pipeline';
 
 		/**
-		 * The context of the render pipeline stack.
+		 * The context data for the render pipeline.
 		 *
 		 * @private
 		 * @type {?Object}
 		 * @default null
 		 */
-		this._context = null;
+		this._contextData = null;
 
 		/**
 		 * The current tone mapping.
@@ -124,7 +133,7 @@ class RenderPipeline {
 
 		this._update();
 
-		if ( this._context.onBeforeRenderPipeline !== null ) this._context.onBeforeRenderPipeline();
+		for ( const callback of this._contextData.onBeforePipelineCallbacks ) callback();
 
 		const toneMapping = renderer.toneMapping;
 		const outputColorSpace = renderer.outputColorSpace;
@@ -146,28 +155,56 @@ class RenderPipeline {
 		renderer.toneMapping = toneMapping;
 		renderer.outputColorSpace = outputColorSpace;
 
-		if ( this._context.onAfterRenderPipeline !== null ) this._context.onAfterRenderPipeline();
+		for ( const callback of this._contextData.onAfterPipelineCallbacks ) callback();
 
 	}
 
 	/**
-	 * Returns the current context of the render pipeline stack.
-	 *
-	 * @readonly
-	 * @type {?Object}
+	 * Frees internal resources.
 	 */
-	get context() {
+	dispose() {
 
-		return this._context;
+		this._quadMesh.material.dispose();
 
 	}
 
 	/**
-	 * Frees internal resources.
+	 * Updates the context data.
+	 *
+	 * @private
 	 */
-	dispose() {
+	_updateContext() {
 
-		this._quadMesh.material.dispose();
+		const toneMapping = this._toneMapping;
+		const outputColorSpace = this._outputColorSpace;
+
+		const contextData = {
+			renderPipeline: this,
+			renderPipelineState: {
+				viewOffsetOwner: null
+			},
+			onBeforePipelineCallbacks: [],
+			onAfterPipelineCallbacks: []
+		};
+
+		let outputNode = this.outputNode;
+
+		if ( this.outputColorTransform === true ) {
+
+			outputNode = renderOutput( outputNode, toneMapping, outputColorSpace );
+
+		} else {
+
+			contextData.toneMapping = toneMapping;
+			contextData.outputColorSpace = outputColorSpace;
+
+		}
+
+		this._contextData = contextData;
+
+		this._quadMesh.material.contextNode = context( contextData );
+		this._quadMesh.material.fragmentNode = outputNode;
+		this._quadMesh.material.needsUpdate = true;
 
 	}
 
@@ -194,36 +231,7 @@ class RenderPipeline {
 
 		if ( this.needsUpdate === true ) {
 
-			const toneMapping = this._toneMapping;
-			const outputColorSpace = this._outputColorSpace;
-
-			const context = {
-				renderPipeline: this,
-				onBeforeRenderPipeline: null,
-				onAfterRenderPipeline: null
-			};
-
-			let outputNode = this.outputNode;
-
-			if ( this.outputColorTransform === true ) {
-
-				outputNode = outputNode.context( context );
-
-				outputNode = renderOutput( outputNode, toneMapping, outputColorSpace );
-
-			} else {
-
-				context.toneMapping = toneMapping;
-				context.outputColorSpace = outputColorSpace;
-
-				outputNode = outputNode.context( context );
-
-			}
-
-			this._context = context;
-
-			this._quadMesh.material.fragmentNode = outputNode;
-			this._quadMesh.material.needsUpdate = true;
+			this._updateContext();
 
 			this.needsUpdate = false;