Final "Tile Set" -> "Tileset" migration (#1379)

* loadRootTileSet to loadRootTileset

* Add function detection

* processTileSet -> preprocessTileset

Author: gkjohnson

src/core/plugins/CesiumIonAuthPlugin.js

@@ -71,7 +71,7 @@ export class CesiumIonAuthPlugin {
 
 	}
 
-	loadRootTileSet() {
+	loadRootTileset() {
 
 		// ensure we have an up-to-date token and root url, then trigger the internal
 		// root tileset load function
@@ -81,7 +81,7 @@ export class CesiumIonAuthPlugin {
 			.then( json => {
 
 				this._initializeFromAsset( json );
-				return this.tiles.invokeOnePlugin( plugin => plugin !== this && plugin.loadRootTileSet && plugin.loadRootTileSet() );
+				return this.tiles.invokeOnePlugin( plugin => plugin !== this && plugin.loadRootTileset && plugin.loadRootTileset() );
 
 			} )
 			.catch( error => {

src/core/renderer/tiles/TilesRendererBase.js

@@ -198,6 +198,13 @@ export class TilesRendererBase {
 
 		}
 
+		// Warn if plugin implements deprecated loadRootTileSet method
+		if ( plugin.loadRootTileSet && ! plugin.loadRootTileset ) {
+
+			console.warn( 'TilesRendererBase: Plugin implements deprecated "loadRootTileSet" method. Please rename to "loadRootTileset".' );
+
+		}
+
 		// insert the plugin based on the priority registered on the plugin
 		const plugins = this.plugins;
 		const priority = plugin.priority || 0;
@@ -326,7 +333,7 @@ export class TilesRendererBase {
 		if ( this.rootLoadingState === UNLOADED ) {
 
 			this.rootLoadingState = LOADING;
-			this.invokeOnePlugin( plugin => plugin.loadRootTileSet && plugin.loadRootTileSet() )
+			this.invokeOnePlugin( plugin => plugin.loadRootTileset && plugin.loadRootTileset() )
 				.then( root => {
 
 					let processedUrl = this.rootURL;
@@ -753,7 +760,15 @@ export class TilesRendererBase {
 
 	}
 
-	preprocessTileSet( json, url, parent = null ) {
+	preprocessTileset( json, url, parent = null ) {
+
+		// check for deprecated function usage
+		const proto = Object.getPrototypeOf( this );
+		if ( Object.hasOwn( proto, 'preprocessTileSet' ) ) {
+
+			console.warn( `${ proto.constructor.name }: Class overrides deprecated "preprocessTileSet" method. Please rename to "preprocessTileset".` );
+
+		}
 
 		const version = json.asset.version;
 		const [ major, minor ] = version.split( '.' ).map( v => parseInt( v ) );
@@ -775,7 +790,21 @@ export class TilesRendererBase {
 
 	}
 
-	loadRootTileSet() {
+	preprocessTileSet( json, url, parent = null ) {
+
+		console.warn( 'TilesRenderer: "preprocessTileSet" has been deprecated. Use "preprocessTileset" instead.' );
+
+	}
+
+	loadRootTileset() {
+
+		// check for deprecated function usage
+		const proto = Object.getPrototypeOf( this );
+		if ( Object.hasOwn( proto, 'loadRootTileSet' ) ) {
+
+			console.warn( `${ proto.constructor.name }: Class overrides deprecated "loadRootTileSet" method. Please rename to "loadRootTileset".` );
+
+		}
 
 		// transform the url
 		let processedUrl = this.rootURL;
@@ -803,7 +832,7 @@ export class TilesRendererBase {
 			} )
 			.then( root => {
 
-				this.preprocessTileSet( root, processedUrl );
+				this.preprocessTileset( root, processedUrl );
 				return root;
 
 			} );
@@ -812,6 +841,12 @@ export class TilesRendererBase {
 
 	}
 
+	loadRootTileSet() {
+
+		console.warn( 'TilesRenderer: "loadRootTileSet" has been deprecated. Use "loadRootTileset" instead.' );
+
+	}
+
 	requestTileContents( tile ) {
 
 		// If the tile is already being loaded then don't
@@ -966,7 +1001,7 @@ export class TilesRendererBase {
 
 					if ( extension === 'json' && content.root ) {
 
-						this.preprocessTileSet( content, uri, tile );
+						this.preprocessTileset( content, uri, tile );
 						tile.children.push( content.root );
 						externalTileset = content;
 						isExternalTileset = true;

src/three/plugins/QuantizedMeshPlugin.js

@@ -122,7 +122,7 @@ export class QuantizedMeshPlugin {
 
 	}
 
-	loadRootTileSet() {
+	loadRootTileset() {
 
 		const { tiles } = this;
 
@@ -208,7 +208,7 @@ export class QuantizedMeshPlugin {
 
 				let baseUrl = tiles.rootURL;
 				tiles.invokeAllPlugins( plugin => baseUrl = plugin.preprocessURL ? plugin.preprocessURL( baseUrl, null ) : baseUrl );
-				tiles.preprocessTileSet( tileset, baseUrl );
+				tiles.preprocessTileset( tileset, baseUrl );
 
 				return tileset;
 

src/three/plugins/images/ImageFormatPlugin.js

@@ -65,7 +65,7 @@ export class ImageFormatPlugin {
 
 	}
 
-	async loadRootTileSet() {
+	async loadRootTileset() {
 
 		const { tiles, imageSource } = this;
 		imageSource.url = imageSource.url || tiles.rootURL;
@@ -209,7 +209,7 @@ export class ImageFormatPlugin {
 			}
 		};
 
-		tiles.preprocessTileSet( tileset, baseUrl );
+		tiles.preprocessTileset( tileset, baseUrl );
 
 		return tileset;
 

src/three/renderer/tiles/TilesRenderer.js

@@ -345,9 +345,9 @@ export class TilesRenderer extends TilesRendererBase {
 	}
 
 	/* Overriden */
-	loadRootTileSet( ...args ) {
+	loadRootTileset( ...args ) {
 
-		return super.loadRootTileSet( ...args )
+		return super.loadRootTileset( ...args )
 			.then( root => {
 
 				// cache the gltf tileset rotation matrix