Unify overlay level calculation for planar and ellipsoid projections (#1543)

* Unify overlay level calculation for planar and ellipsoid projections

* Update gitignore

* Properly handle tilesets not defining all levels

* Remove outdated comment

Author: xawill

.gitignore

@@ -66,6 +66,7 @@ typings/
 
 example/local-data
 example/dev-bundle
+example/bundle
 build
 
 pnpm-lock.yaml

src/three/plugins/images/ImageOverlayPlugin.js

@@ -290,7 +290,7 @@ export class ImageOverlayPlugin {
 
 				if ( range !== null ) {
 
-					overlay.releaseTexture( range, tile );
+					overlay.releaseTexture( range );
 
 				}
 
@@ -511,7 +511,7 @@ export class ImageOverlayPlugin {
 			// if the tile has a render target associated with the overlay and the last level of detail
 			// is not being displayed, yet, then we need to split
 			const info = tileInfo.get( tile );
-			if ( info && info.target && overlay.shouldSplit( info.range, tile ) ) {
+			if ( info && info.target && overlay.shouldSplit( info.range ) ) {
 
 				// get the vector representing the projection direction
 				if ( overlay.frame ) {
@@ -857,7 +857,7 @@ export class ImageOverlayPlugin {
 				// release the ranges
 				if ( range !== null ) {
 
-					overlay.releaseTexture( range, tile );
+					overlay.releaseTexture( range );
 
 				}
 
@@ -1012,7 +1012,7 @@ export class ImageOverlayPlugin {
 				range = overlay.projection.toNormalizedRange( range );
 
 				info.range = range;
-				overlay.lockTexture( range, tile );
+				overlay.lockTexture( range );
 
 			}
 
@@ -1104,14 +1104,14 @@ export class ImageOverlayPlugin {
 		if ( info.range === null ) {
 
 			info.range = range;
-			overlay.lockTexture( range, tile );
+			overlay.lockTexture( range );
 
 		}
 
 		// if the image projection is outside the 0, 1 uvw range or there are no textures to draw in
 		// the tiled image set the don't allocate a texture for it.
 		let target = null;
-		if ( heightInRange && overlay.hasContent( range, tile ) ) {
+		if ( heightInRange && overlay.hasContent( range ) ) {
 
 			target = await processQueue
 				.add( { tile, overlay }, async () => {
@@ -1124,7 +1124,7 @@ export class ImageOverlayPlugin {
 					}
 
 					// Get the texture from the overlay
-					const regionTarget = await overlay.getTexture( range, tile );
+					const regionTarget = await overlay.getTexture( range );
 
 					// check if the overlay has been disposed since starting this function
 					if ( controller.signal.aborted || tileController.signal.aborted ) {
@@ -1349,33 +1349,33 @@ class ImageOverlay {
 
 	}
 
-	hasContent( range, tile ) {
+	hasContent( range ) {
 
 		return false;
 
 	}
 
-	async getTexture( range, tile ) {
+	async getTexture( range ) {
 
 		return null;
 
 	}
 
-	async lockTexture( range, tile ) {
+	async lockTexture( range ) {
 
 		return null;
 
 	}
 
-	releaseTexture( range, tile ) {
+	releaseTexture( range ) {
 
 	}
 
 	setResolution( resolution ) {
 
 	}
 
-	shouldSplit( range, tile ) {
+	shouldSplit( range ) {
 
 		return false;
 
@@ -1450,64 +1450,62 @@ class TiledImageOverlay extends ImageOverlay {
 	}
 
 	// Texture acquisition API implementations
-	calculateLevel( range, tile ) {
-
-		if ( this.isPlanarProjection ) {
+	calculateLevel( range ) {
 
-			const [ minX, minY, maxX, maxY ] = range;
-			const w = maxX - minX;
-			const h = maxY - minY;
+		const [ minX, minY, maxX, maxY ] = range;
+		const w = maxX - minX;
+		const h = maxY - minY;
 
-			let level = 0;
-			const resolution = this.regionImageSource.resolution;
-			const maxLevel = this.tiling.maxLevel;
-			for ( ; level < maxLevel; level ++ ) {
+		let level = 0;
+		const resolution = this.regionImageSource.resolution;
+		const maxLevel = this.tiling.maxLevel;
+		for ( ; level < maxLevel; level ++ ) {
 
-				// the number of pixels per image on each axis
-				const wProj = resolution / w;
-				const hProj = resolution / h;
+			// the number of pixels per image on each axis
+			const wProj = resolution / w;
+			const hProj = resolution / h;
 
-				const { pixelWidth, pixelHeight } = this.tiling.getLevel( level );
-				if ( pixelWidth >= wProj || pixelHeight >= hProj ) {
+			const levelData = this.tiling.getLevel( level );
+			if ( levelData === null || levelData === undefined ) {
 
-					break;
-
-				}
+				continue;
 
 			}
 
-			// TODO: should this be one layer higher LoD?
-			return level;
+			const { pixelWidth, pixelHeight } = levelData;
+			if ( pixelWidth >= wProj || pixelHeight >= hProj ) {
 
-		} else {
+				break;
 
-			return tile.internal.depthFromRenderedParent - 1;
+			}
 
 		}
 
+		return level;
+
 	}
 
-	hasContent( range, tile ) {
+	hasContent( range ) {
 
-		return this.regionImageSource.hasContent( ...range, this.calculateLevel( range, tile ) );
+		return this.regionImageSource.hasContent( ...range, this.calculateLevel( range ) );
 
 	}
 
-	getTexture( range, tile ) {
+	getTexture( range ) {
 
-		return this.regionImageSource.get( ...range, this.calculateLevel( range, tile ) );
+		return this.regionImageSource.get( ...range, this.calculateLevel( range ) );
 
 	}
 
-	lockTexture( range, tile ) {
+	lockTexture( range ) {
 
-		return this.regionImageSource.lock( ...range, this.calculateLevel( range, tile ) );
+		return this.regionImageSource.lock( ...range, this.calculateLevel( range ) );
 
 	}
 
-	releaseTexture( range, tile ) {
+	releaseTexture( range ) {
 
-		this.regionImageSource.release( ...range, this.calculateLevel( range, tile ) );
+		this.regionImageSource.release( ...range, this.calculateLevel( range ) );
 
 	}
 
@@ -1517,10 +1515,10 @@ class TiledImageOverlay extends ImageOverlay {
 
 	}
 
-	shouldSplit( range, tile ) {
+	shouldSplit( range ) {
 
 		// if we haven't reached the max level yet then continue splitting
-		return this.tiling.maxLevel > this.calculateLevel( range, tile );
+		return this.tiling.maxLevel > this.calculateLevel( range );
 
 	}
 
@@ -1693,7 +1691,7 @@ export class GeoJSONOverlay extends ImageOverlay {
 
 	}
 
-	shouldSplit( range, tile ) {
+	shouldSplit( range ) {
 
 		// geojson can always split
 		return true;