Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/core/renderer/tiles/TilesRendererBase.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Tileset } from './Tileset.js';
// Events dispatched by TilesRendererBase, available across all renderer implementations.
export interface TilesRendererBaseEventMap<TScene = unknown> {
'needs-update': {};
/** @deprecated */
'load-content': {};
'load-tileset': { tileset : Tileset, /* @deprecated Use tileset instead */ tileSet? : Tileset, url : string };
/* @deprecated Use 'load-tileset' instead */
Expand Down
5 changes: 3 additions & 2 deletions src/core/renderer/tiles/TilesRendererBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ const unifiedPriorityCallback = ( a, b ) => {

/**
* Fired when any tile content (model or external tileset) finishes loading.
* @deprecated
* @event TilesRendererBase#load-content
*/

Expand Down Expand Up @@ -835,7 +836,7 @@ export class TilesRendererBase {
this.rootLoadingState = LOADED;
this.rootTileset = root;
this.dispatchEvent( { type: 'needs-update' } );
this.dispatchEvent( { type: 'load-content' } );
this.dispatchEvent( { type: 'load-content' } ); // @deprecated
this.dispatchEvent( {
type: 'load-tileset',
tileset: root,
Expand Down Expand Up @@ -1800,7 +1801,7 @@ export class TilesRendererBase {
// dispatch an event indicating that this model has completed and that a new
// call to "update" is needed.
this.dispatchEvent( { type: 'needs-update' } );
this.dispatchEvent( { type: 'load-content' } );
this.dispatchEvent( { type: 'load-content' } ); // @deprecated
if ( isExternalTileset ) {

this.dispatchEvent( {
Expand Down
4 changes: 2 additions & 2 deletions src/three/plugins/images/ImageOverlayPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export class ImageOverlayPlugin {
this.resetVirtualChildren( ! this.enableTileSplitting );
tiles.recalculateBytesUsed();

tiles.dispatchEvent( { type: 'needs-rerender' } );
tiles.dispatchEvent( { type: 'needs-render' } );

}

Expand Down Expand Up @@ -1191,7 +1191,7 @@ export class ImageOverlayPlugin {
}

info.failed = true;
tiles.dispatchEvent( { type: 'load-error', tile, overlay, error: err } );
tiles.dispatchEvent( { type: 'load-error', tile, overlay, error: err, url: null } );
return null;

} );
Expand Down
12 changes: 12 additions & 0 deletions src/three/renderer/tiles/TilesRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ export class TilesRenderer extends TilesRendererBase {
console.warn( 'TilesRenderer: "load-tile-set" event has been deprecated. Use "load-tileset" instead.' );
type = 'load-tileset';

} else if ( type === 'load-content' ) {

console.warn( 'TilesRenderer: "load-content" event has been deprecated. Use "load-model" or "load-tileset" instead.' );

}

EventDispatcher.prototype.addEventListener.call( this, type, listener );
Expand All @@ -159,6 +163,10 @@ export class TilesRenderer extends TilesRendererBase {
console.warn( 'TilesRenderer: "load-tile-set" event has been deprecated. Use "load-tileset" instead.' );
type = 'load-tileset';

} else if ( type === 'load-content' ) {

console.warn( 'TilesRenderer: "load-content" event has been deprecated. Use "load-model" or "load-tileset" instead.' );

}

return EventDispatcher.prototype.hasEventListener.call( this, type, listener );
Expand All @@ -172,6 +180,10 @@ export class TilesRenderer extends TilesRendererBase {
console.warn( 'TilesRenderer: "load-tile-set" event has been deprecated. Use "load-tileset" instead.' );
type = 'load-tileset';

} else if ( type === 'load-content' ) {

console.warn( 'TilesRenderer: "load-content" event has been deprecated. Use "load-model" or "load-tileset" instead.' );

}

EventDispatcher.prototype.removeEventListener.call( this, type, listener );
Expand Down
1 change: 0 additions & 1 deletion test/three/TilesRenderer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ function typecheck( renderer: TilesRenderer ) {
renderer.addEventListener( 'load-tileset', loadTileset );
renderer.addEventListener( 'tiles-load-start', emptyEvent );
renderer.addEventListener( 'tiles-load-end', emptyEvent );
renderer.addEventListener( 'load-content', emptyEvent );
renderer.addEventListener( 'load-model', loadModel );
renderer.addEventListener( 'dispose-model', disposeModel );
renderer.addEventListener( 'tile-visibility-change', tileVisibilityChange );
Expand Down
Loading