ImageOverlayPlugin: Simplify plugin, use normalized ranges (#1414)

* Switch to use normalized ranges

* Cleanup further

Author: gkjohnson

src/three/plugins/images/ImageOverlayPlugin.js

@@ -58,7 +58,7 @@ function markOverlayImages( range, level, overlay, doRelease ) {
 
 		const promises = [];
 		const { imageSource, tiling } = overlay;
-		forEachTileInBounds( range, level, tiling, overlay.isPlanarProjection, ( tx, ty, tl ) => {
+		forEachTileInBounds( range, level, tiling, ( tx, ty, tl ) => {
 
 			if ( doRelease ) {
 
@@ -91,7 +91,7 @@ function markOverlayImages( range, level, overlay, doRelease ) {
 function countTilesInRange( range, level, overlay ) {
 
 	let total = 0;
-	forEachTileInBounds( range, level, overlay.tiling, overlay.isPlanarProjection, ( x, y, l ) => {
+	forEachTileInBounds( range, level, overlay.tiling, ( x, y, l ) => {
 
 		total ++;
 
@@ -973,15 +973,14 @@ export class ImageOverlayPlugin {
 	}
 
 	// internal
-	_calculateLevelFromOverlay( overlay, range, tile, normalized = false ) {
+	_calculateLevelFromOverlay( overlay, range, tile ) {
 
 		if ( overlay.isPlanarProjection ) {
 
 			const { resolution } = this;
 			const { tiling } = overlay;
 
-			const normalizedRange = normalized ? range : tiling.toNormalizedRange( range );
-			const [ minX, minY, maxX, maxY ] = normalizedRange;
+			const [ minX, minY, maxX, maxY ] = range;
 			const w = maxX - minX;
 			const h = maxY - minY;
 
@@ -1117,17 +1116,18 @@ export class ImageOverlayPlugin {
 			.tileInfo
 			.set( tile, info );
 
-		if ( overlay.isPlanarProjection ) {
+		// if the overlay isn't ready then we can't convert the range correctly, yet
+		if ( overlay.isReady ) {
 
-			// TODO: we could project the shape into the frame, compute 2d bounds, and then mark tiles
+			if ( overlay.isPlanarProjection ) {
 
-		} else {
+				// TODO: we could project the shape into the frame, compute 2d bounds, and then mark tiles
 
-			// If the tile has a region bounding volume then mark the tiles to preload
-			if ( tile.boundingVolume.region ) {
+			} else if ( tile.boundingVolume.region ) {
 
+				// If the tile has a region bounding volume then mark the tiles to preload
 				const [ minLon, minLat, maxLon, maxLat ] = tile.boundingVolume.region;
-				const range = [ minLon, minLat, maxLon, maxLat ];
+				const range = overlay.tiling.toNormalizedRange( [ minLon, minLat, maxLon, maxLat ] );
 				info.range = range;
 				info.level = this._calculateLevelFromOverlay( overlay, range, tile );
 
@@ -1224,25 +1224,15 @@ export class ImageOverlayPlugin {
 			}
 
 			( { range, uvs } = getMeshesCartographicRange( meshes, ellipsoid, _matrix, tiling ) );
+			range = tiling.toNormalizedRange( range );
 			heightInRange = true;
 
 		}
 
-		let normalizedRange;
-		if ( ! overlay.isPlanarProjection ) {
-
-			normalizedRange = tiling.toNormalizedRange( range );
-
-		} else {
-
-			normalizedRange = range;
-
-		}
-
 		// calculate the tiling level here if not already created
 		if ( info.level === null ) {
 
-			info.level = this._calculateLevelFromOverlay( overlay, normalizedRange, tile, true );
+			info.level = this._calculateLevelFromOverlay( overlay, range, tile );
 
 		}
 
@@ -1283,10 +1273,10 @@ export class ImageOverlayPlugin {
 
 						// if the previous layer is present then draw it as an overlay to fill in any gaps while we wait for
 						// the next set of textures
-						tileComposer.setRenderTarget( target, normalizedRange );
+						tileComposer.setRenderTarget( target, range );
 						tileComposer.clear( 0xffffff, 0 );
 
-						forEachTileInBounds( range, info.level - 1, tiling, overlay.isPlanarProjection, ( tx, ty, tl ) => {
+						forEachTileInBounds( range, info.level - 1, tiling, ( tx, ty, tl ) => {
 
 							// draw using normalized bounds since the mercator bounds are non-linear
 							const span = tiling.getTileBounds( tx, ty, tl, true, false );
@@ -1322,10 +1312,10 @@ export class ImageOverlayPlugin {
 					}
 
 					// draw the textures
-					tileComposer.setRenderTarget( target, normalizedRange );
+					tileComposer.setRenderTarget( target, range );
 					tileComposer.clear( 0xffffff, 0 );
 
-					forEachTileInBounds( range, info.level, tiling, overlay.isPlanarProjection, ( tx, ty, tl ) => {
+					forEachTileInBounds( range, info.level, tiling, ( tx, ty, tl ) => {
 
 						// draw using normalized bounds since the mercator bounds are non-linear
 						const span = tiling.getTileBounds( tx, ty, tl, true, false );

src/three/plugins/images/overlays/utils.js

@@ -1,7 +1,7 @@
 import { Vector3, Matrix4, MathUtils } from 'three';
 
 // iterates over all present tiles in the given tileset at the given level in the given range
-export function forEachTileInBounds( range, level, tiling, normalized, callback ) {
+export function forEachTileInBounds( range, level, tiling, callback ) {
 
 	// pull the bounds in a bit to avoid loading unnecessary tiles. 1e-8 was chosen since smaller values
 	// are not larger enough and cause extra tiles to load in cases where 1-to-1 tile-to-image should occur
@@ -12,7 +12,7 @@ export function forEachTileInBounds( range, level, tiling, normalized, callback
 	maxLon -= 1e-8;
 
 	const clampedLevel = Math.max( Math.min( level, tiling.maxLevel ), tiling.minLevel );
-	const [ minX, minY, maxX, maxY ] = tiling.getTilesInRange( minLon, minLat, maxLon, maxLat, clampedLevel, normalized );
+	const [ minX, minY, maxX, maxY ] = tiling.getTilesInRange( minLon, minLat, maxLon, maxLat, clampedLevel, true );
 	for ( let x = minX; x <= maxX; x ++ ) {
 
 		for ( let y = minY; y <= maxY; y ++ ) {