Remove load index from TilesRenderer

NASA-AMMOS · Jan 9, 2025 · 1f0cae0 · 1f0cae0
1 parent e6cc699
commit 1f0cae0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/base/TilesRendererBase.js b/src/base/TilesRendererBase.js
@@ -749,7 +749,7 @@ export class TilesRendererBase {
 
 					} else {
 
-						return this.invokeOnePlugin( plugin => plugin.parseTile && plugin.parseTile( content, parseTile, extension, uri ) );
+						return this.invokeOnePlugin( plugin => plugin.parseTile && plugin.parseTile( content, parseTile, extension, uri, signal ) );
 
 					}
 

diff --git a/src/three/TilesRenderer.js b/src/three/TilesRenderer.js
@@ -546,7 +546,6 @@ export class TilesRenderer extends TilesRendererBase {
 
 		tile.cached = {
 
-			_loadIndex: 0,
 			transform,
 			transformInverse,
 
@@ -571,18 +570,15 @@ export class TilesRenderer extends TilesRendererBase {
 
 	}
 
-	async parseTile( buffer, tile, extension, uri ) {
+	async parseTile( buffer, tile, extension, uri, abortSignal ) {
 
 		const cached = tile.cached;
-		cached._loadIndex ++;
-
 		const uriSplits = uri.split( /[\\/]/g );
 		uriSplits.pop();
 		const workingPath = uriSplits.join( '/' );
 		const fetchOptions = this.fetchOptions;
 
 		const manager = this.manager;
-		const loadIndex = cached._loadIndex;
 		let promise = null;
 
 		const cachedTransform = cached.transform;
@@ -697,7 +693,7 @@ export class TilesRenderer extends TilesRendererBase {
 		} );
 
 		// exit early if a new request has already started
-		if ( cached._loadIndex !== loadIndex ) {
+		if ( abortSignal.aborted ) {
 
 			return;
 
@@ -859,8 +855,6 @@ export class TilesRenderer extends TilesRendererBase {
 
 		}
 
-		cached._loadIndex ++;
-
 	}
 
 	setTileVisible( tile, visible ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -749,7 +749,7 @@ export class TilesRendererBase { @@
     					} else {
-    						return this.invokeOnePlugin( plugin => plugin.parseTile && plugin.parseTile( content, parseTile, extension, uri ) );
+    						return this.invokeOnePlugin( plugin => plugin.parseTile && plugin.parseTile( content, parseTile, extension, uri, signal ) );
     					}
@@ Expand Down @@