diff --git a/src/framework/handlers/anim-clip.js b/src/framework/handlers/anim-clip.js index b1d3009c347..35ad4db9883 100644 --- a/src/framework/handlers/anim-clip.js +++ b/src/framework/handlers/anim-clip.js @@ -12,8 +12,9 @@ import { ResourceHandler } from './handler.js'; * @ignore */ class AnimClipHandler extends ResourceHandler { - constructor() { - super('animclip'); + constructor(app) { + super(app); + this.handlerType = 'animclip'; } load(url, callback) { diff --git a/src/framework/handlers/anim-state-graph.js b/src/framework/handlers/anim-state-graph.js index 1cd2318ac58..d2c7cb4e08a 100644 --- a/src/framework/handlers/anim-state-graph.js +++ b/src/framework/handlers/anim-state-graph.js @@ -9,8 +9,9 @@ import { ResourceHandler } from './handler.js'; * @ignore */ class AnimStateGraphHandler extends ResourceHandler { - constructor() { - super('animstategraph'); + constructor(app) { + super(app); + this.handlerType = 'animstategraph'; } load(url, callback) { diff --git a/src/framework/handlers/animation.js b/src/framework/handlers/animation.js index 66727a352b8..dece0df61d5 100644 --- a/src/framework/handlers/animation.js +++ b/src/framework/handlers/animation.js @@ -23,7 +23,8 @@ class AnimationHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('animation'); + super(app); + this.handlerType = 'animation'; this.device = app.graphicsDevice; this.assets = app.assets; diff --git a/src/framework/handlers/audio.js b/src/framework/handlers/audio.js index e10dcfcd375..5eb54e848f4 100644 --- a/src/framework/handlers/audio.js +++ b/src/framework/handlers/audio.js @@ -57,7 +57,8 @@ class AudioHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('audio'); + super(app); + this.handlerType = 'audio'; this.manager = app.soundManager; Debug.assert(this.manager, "AudioSourceComponentSystem cannot be created without sound manager"); diff --git a/src/framework/handlers/binary.js b/src/framework/handlers/binary.js index 72a7b321d49..0417037503c 100644 --- a/src/framework/handlers/binary.js +++ b/src/framework/handlers/binary.js @@ -3,8 +3,9 @@ import { http, Http } from '../../platform/net/http.js'; import { ResourceHandler } from './handler.js'; class BinaryHandler extends ResourceHandler { - constructor() { - super('binary'); + constructor(app) { + super(app); + this.handlerType = 'binary'; } load(url, callback) { diff --git a/src/framework/handlers/bundle.js b/src/framework/handlers/bundle.js index 268f2e3488d..98075f37160 100644 --- a/src/framework/handlers/bundle.js +++ b/src/framework/handlers/bundle.js @@ -19,7 +19,8 @@ class BundleHandler extends ResourceHandler { * @param {import('../app-base.js').AppBase} app - The running {@link AppBase}. */ constructor(app) { - super('bundle'); + super(app); + this.handlerType = 'bundle'; this._assets = app.assets; this._worker = null; diff --git a/src/framework/handlers/container.js b/src/framework/handlers/container.js index 2e39496d598..697a3026078 100644 --- a/src/framework/handlers/container.js +++ b/src/framework/handlers/container.js @@ -170,7 +170,8 @@ class ContainerHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('container'); + super(app); + this.handlerType = 'container'; this.glbContainerParser = new GlbContainerParser(app.graphicsDevice, app.assets, 0); this.parsers = { }; diff --git a/src/framework/handlers/css.js b/src/framework/handlers/css.js index 73be8cee473..56fd0c7a845 100644 --- a/src/framework/handlers/css.js +++ b/src/framework/handlers/css.js @@ -3,8 +3,9 @@ import { http } from '../../platform/net/http.js'; import { ResourceHandler } from './handler.js'; class CssHandler extends ResourceHandler { - constructor() { - super('css'); + constructor(app) { + super(app); + this.handlerType = 'css'; } load(url, callback) { diff --git a/src/framework/handlers/cubemap.js b/src/framework/handlers/cubemap.js index 2b5bbe7e3cf..830eefcee02 100644 --- a/src/framework/handlers/cubemap.js +++ b/src/framework/handlers/cubemap.js @@ -21,7 +21,8 @@ class CubemapHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('cubemap'); + super(app); + this.handlerType = 'cubemap'; this._device = app.graphicsDevice; this._registry = app.assets; diff --git a/src/framework/handlers/folder.js b/src/framework/handlers/folder.js index 40a206e7481..e40a188169b 100644 --- a/src/framework/handlers/folder.js +++ b/src/framework/handlers/folder.js @@ -1,8 +1,9 @@ import { ResourceHandler } from './handler.js'; class FolderHandler extends ResourceHandler { - constructor() { - super('folder'); + constructor(app) { + super(app); + this.handlerType = 'folder'; } load(url, callback) { diff --git a/src/framework/handlers/font.js b/src/framework/handlers/font.js index f346c725508..9001b7c63c9 100644 --- a/src/framework/handlers/font.js +++ b/src/framework/handlers/font.js @@ -44,7 +44,8 @@ class FontHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('font'); + super(app); + this.handlerType = 'font'; this._loader = app.loader; this.maxRetries = 0; diff --git a/src/framework/handlers/gsplat.js b/src/framework/handlers/gsplat.js index fb48fff3726..400aa83d518 100644 --- a/src/framework/handlers/gsplat.js +++ b/src/framework/handlers/gsplat.js @@ -10,7 +10,8 @@ class GSplatHandler extends ResourceHandler { * @hideconstructor */ constructor(app) { - super('gsplat'); + super(app); + this.handlerType = 'gsplat'; this.parser = new PlyParser(app.graphicsDevice, app.assets, 3); } diff --git a/src/framework/handlers/handler.js b/src/framework/handlers/handler.js index fb47364afed..d0452828792 100644 --- a/src/framework/handlers/handler.js +++ b/src/framework/handlers/handler.js @@ -15,16 +15,23 @@ class ResourceHandler { * * @type {string} */ - handlerType; + handlerType = ''; + + /** + * The running app instance. + * + * @type {import('../app-base').AppBase} + */ + _app; /** @private */ _maxRetries = 0; /** - * @param {string} type - The type of resource the handler will load. + * @param {import('../app-base').AppBase} app - The running {@link AppBase}. */ - constructor(type) { - this.handlerType = type; + constructor(app) { + this._app = app; } /** diff --git a/src/framework/handlers/hierarchy.js b/src/framework/handlers/hierarchy.js index 7c34e604dde..58d11259dba 100644 --- a/src/framework/handlers/hierarchy.js +++ b/src/framework/handlers/hierarchy.js @@ -4,10 +4,12 @@ import { SceneUtils } from './scene-utils.js'; import { ResourceHandler } from './handler.js'; class HierarchyHandler extends ResourceHandler { + /** + * @param {import('../app-base').AppBase} app - The running {@link AppBase}. + */ constructor(app) { - super('hierarchy'); - - this._app = app; + super(app); + this.handlerType = 'hierarchy'; } load(url, callback) { diff --git a/src/framework/handlers/html.js b/src/framework/handlers/html.js index e388cf92069..6c0a00c2a72 100644 --- a/src/framework/handlers/html.js +++ b/src/framework/handlers/html.js @@ -3,8 +3,9 @@ import { http } from '../../platform/net/http.js'; import { ResourceHandler } from './handler.js'; class HtmlHandler extends ResourceHandler { - constructor() { - super('html'); + constructor(app) { + super(app); + this.handlerType = 'html'; } load(url, callback) { diff --git a/src/framework/handlers/json.js b/src/framework/handlers/json.js index b5ce29b7513..c5a7233824b 100644 --- a/src/framework/handlers/json.js +++ b/src/framework/handlers/json.js @@ -3,8 +3,9 @@ import { http, Http } from '../../platform/net/http.js'; import { ResourceHandler } from './handler.js'; class JsonHandler extends ResourceHandler { - constructor() { - super('json'); + constructor(app) { + super(app); + this.handlerType = 'json'; } load(url, callback) { diff --git a/src/framework/handlers/material.js b/src/framework/handlers/material.js index e2664424ad9..74849bdc4d0 100644 --- a/src/framework/handlers/material.js +++ b/src/framework/handlers/material.js @@ -45,7 +45,8 @@ class MaterialHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('material'); + super(app); + this.handlerType = 'material'; this._assets = app.assets; this._device = app.graphicsDevice; diff --git a/src/framework/handlers/model.js b/src/framework/handlers/model.js index 4910cc650ac..438b16c28d2 100644 --- a/src/framework/handlers/model.js +++ b/src/framework/handlers/model.js @@ -32,7 +32,8 @@ class ModelHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('model'); + super(app); + this.handlerType = 'model'; this._parsers = []; this.device = app.graphicsDevice; diff --git a/src/framework/handlers/render.js b/src/framework/handlers/render.js index 3712d328c12..f1bfb40d714 100644 --- a/src/framework/handlers/render.js +++ b/src/framework/handlers/render.js @@ -54,7 +54,8 @@ class RenderHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('render'); + super(app); + this.handlerType = 'render'; this._registry = app.assets; } diff --git a/src/framework/handlers/scene-settings.js b/src/framework/handlers/scene-settings.js index 443792c7c20..509ecf7b93c 100644 --- a/src/framework/handlers/scene-settings.js +++ b/src/framework/handlers/scene-settings.js @@ -4,9 +4,8 @@ import { ResourceHandler } from './handler.js'; class SceneSettingsHandler extends ResourceHandler { constructor(app) { - super('scenesettings'); - - this._app = app; + super(app); + this.handlerType = 'scenesettings'; } load(url, callback) { diff --git a/src/framework/handlers/scene.js b/src/framework/handlers/scene.js index 0bce646d2ec..18672ba68a8 100644 --- a/src/framework/handlers/scene.js +++ b/src/framework/handlers/scene.js @@ -16,9 +16,8 @@ class SceneHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('scene'); - - this._app = app; + super(app); + this.handlerType = 'scene'; } load(url, callback) { diff --git a/src/framework/handlers/script.js b/src/framework/handlers/script.js index 399a0a50252..7564fab8220 100644 --- a/src/framework/handlers/script.js +++ b/src/framework/handlers/script.js @@ -22,9 +22,9 @@ class ScriptHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('script'); + super(app); + this.handlerType = 'script'; - this._app = app; this._scripts = { }; this._cache = { }; } diff --git a/src/framework/handlers/shader.js b/src/framework/handlers/shader.js index 0776a3b5484..8dcc70bc07f 100644 --- a/src/framework/handlers/shader.js +++ b/src/framework/handlers/shader.js @@ -3,8 +3,9 @@ import { http } from '../../platform/net/http.js'; import { ResourceHandler } from './handler.js'; class ShaderHandler extends ResourceHandler { - constructor() { - super('shader'); + constructor(app) { + super(app); + this.handlerType = 'shader'; } load(url, callback) { diff --git a/src/framework/handlers/sprite.js b/src/framework/handlers/sprite.js index 592b0474299..6d4f708fd13 100644 --- a/src/framework/handlers/sprite.js +++ b/src/framework/handlers/sprite.js @@ -33,7 +33,8 @@ class SpriteHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('sprite'); + super(app); + this.handlerType = 'sprite'; this._assets = app.assets; this._device = app.graphicsDevice; diff --git a/src/framework/handlers/template.js b/src/framework/handlers/template.js index 4bfe55466ca..f9939aa2398 100644 --- a/src/framework/handlers/template.js +++ b/src/framework/handlers/template.js @@ -6,9 +6,8 @@ import { ResourceHandler } from './handler.js'; class TemplateHandler extends ResourceHandler { constructor(app) { - super('template'); - - this._app = app; + super(app); + this.handlerType = 'template'; } load(url, callback) { diff --git a/src/framework/handlers/text.js b/src/framework/handlers/text.js index b5bf28d29fc..0019406e597 100644 --- a/src/framework/handlers/text.js +++ b/src/framework/handlers/text.js @@ -4,7 +4,8 @@ import { ResourceHandler } from './handler.js'; class TextHandler extends ResourceHandler { constructor(app) { - super('text'); + super(app); + this.handlerType = 'text'; } load(url, callback) { diff --git a/src/framework/handlers/texture-atlas.js b/src/framework/handlers/texture-atlas.js index 8c4b1a4b750..46fa730cd41 100644 --- a/src/framework/handlers/texture-atlas.js +++ b/src/framework/handlers/texture-atlas.js @@ -43,7 +43,8 @@ class TextureAtlasHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('textureatlas'); + super(app); + this.handlerType = 'textureatlas'; this._loader = app.loader; } diff --git a/src/framework/handlers/texture.js b/src/framework/handlers/texture.js index 8b066dc3176..369279dcc54 100644 --- a/src/framework/handlers/texture.js +++ b/src/framework/handlers/texture.js @@ -169,7 +169,8 @@ class TextureHandler extends ResourceHandler { * @ignore */ constructor(app) { - super('texture'); + super(app); + this.handlerType = 'texture'; const assets = app.assets; const device = app.graphicsDevice;