OutlinePass: Improve performance of VisibilityChangeCallBack(). (#2…

…9220) * Optimise selected object check to improve outline performance in situations with a lot of objects. * Update OutlinePass.js Clean up. * Store selected meshes per Outlinepass * missed semicolon * Make selectedMesh set module scope and remove flag tracking. * Missing semicolons * cleanup formatting * Update OutlinePass.js Clean up. * Update OutlinePass.js Refactor selection cache. --------- Co-authored-by: Michael Herzog <michael.herzog@human-interactive.org>
mrdoob · Aug 26, 2024 · d7f2d9a · d7f2d9a
1 parent 8a8a060
commit d7f2d9a
Showing 1 changed file with 31 additions and 46 deletions.
diff --git a/examples/jsm/postprocessing/OutlinePass.js b/examples/jsm/postprocessing/OutlinePass.js
@@ -35,7 +35,7 @@ class OutlinePass extends Pass {
 		this.pulsePeriod = 0;
 
 		this._visibilityCache = new Map();
-
+		this._selectionCache = new Set();
 
 		this.resolution = ( resolution !== undefined ) ? new Vector2( resolution.x, resolution.y ) : new Vector2( 256, 256 );
 
@@ -172,29 +172,18 @@ class OutlinePass extends Pass {
 
 	}
 
-	changeVisibilityOfSelectedObjects( bVisible ) {
+	updateSelectionCache() {
 
-		const cache = this._visibilityCache;
+		const cache = this._selectionCache;
 
 		function gatherSelectedMeshesCallBack( object ) {
 
-			if ( object.isMesh ) {
-
-				if ( bVisible === true ) {
-
-					object.visible = cache.get( object );
-
-				} else {
-
-					cache.set( object, object.visible );
-					object.visible = bVisible;
-
-				}
-
-			}
+			if ( object.isMesh ) cache.add( object );
 
 		}
 
+		cache.clear();
+
 		for ( let i = 0; i < this.selectedObjects.length; i ++ ) {
 
 			const selectedObject = this.selectedObjects[ i ];
@@ -204,56 +193,49 @@ class OutlinePass extends Pass {
 
 	}
 
-	changeVisibilityOfNonSelectedObjects( bVisible ) {
+	changeVisibilityOfSelectedObjects( bVisible ) {
 
 		const cache = this._visibilityCache;
-		const selectedMeshes = [];
-
-		function gatherSelectedMeshesCallBack( object ) {
-
-			if ( object.isMesh ) selectedMeshes.push( object );
 
-		}
-
-		for ( let i = 0; i < this.selectedObjects.length; i ++ ) {
+		for ( const mesh of this._selectionCache ) {
 
-			const selectedObject = this.selectedObjects[ i ];
-			selectedObject.traverse( gatherSelectedMeshesCallBack );
+			if ( bVisible === true ) {
 
-		}
+				mesh.visible = cache.get( mesh );
 
-		function VisibilityChangeCallBack( object ) {
+			} else {
 
-			if ( object.isMesh || object.isSprite ) {
+				cache.set( mesh, mesh.visible );
+				mesh.visible = bVisible;
 
-				// only meshes and sprites are supported by OutlinePass
+			}
 
-				let bFound = false;
+		}
 
-				for ( let i = 0; i < selectedMeshes.length; i ++ ) {
+	}
 
-					const selectedObjectId = selectedMeshes[ i ].id;
+	changeVisibilityOfNonSelectedObjects( bVisible ) {
 
-					if ( selectedObjectId === object.id ) {
+		const visibilityCache = this._visibilityCache;
+		const selectionCache = this._selectionCache;
 
-						bFound = true;
-						break;
+		function VisibilityChangeCallBack( object ) {
 
-					}
+			if ( object.isMesh || object.isSprite ) {
 
-				}
+				// only meshes and sprites are supported by OutlinePass
 
-				if ( bFound === false ) {
+				if ( ! selectionCache.has( object ) ) {
 
 					const visibility = object.visible;
 
-					if ( bVisible === false || cache.get( object ) === true ) {
+					if ( bVisible === false || visibilityCache.get( object ) === true ) {
 
 						object.visible = bVisible;
 
 					}
 
-					cache.set( object, visibility );
+					visibilityCache.set( object, visibility );
 
 				}
 
@@ -264,11 +246,11 @@ class OutlinePass extends Pass {
 
 				if ( bVisible === true ) {
 
-					object.visible = cache.get( object ); // restore
+					object.visible = visibilityCache.get( object ); // restore
 
 				} else {
 
-					cache.set( object, object.visible );
+					visibilityCache.set( object, object.visible );
 					object.visible = bVisible;
 
 				}
@@ -306,6 +288,8 @@ class OutlinePass extends Pass {
 
 			renderer.setClearColor( 0xffffff, 1 );
 
+			this.updateSelectionCache();
+
 			// Make selected objects invisible
 			this.changeVisibilityOfSelectedObjects( false );
 
@@ -337,6 +321,7 @@ class OutlinePass extends Pass {
 			this.renderScene.overrideMaterial = null;
 			this.changeVisibilityOfNonSelectedObjects( true );
 			this._visibilityCache.clear();
+			this._selectionCache.clear();
 
 			this.renderScene.background = currentBackground;
 
@@ -462,7 +447,7 @@ class OutlinePass extends Pass {
 						worldPosition = instanceMatrix * worldPosition;
 
 					#endif
-					
+
 					worldPosition = modelMatrix * worldPosition;
 
 					projTexCoord = textureMatrix * worldPosition;