From 41bc488b01b6c33473feefe12793f8acf0b4b6e8 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Thu, 18 Apr 2024 13:01:58 -0700 Subject: [PATCH] Fix a few files that are not part of the regular dev build --- .../accessibility/src/HtmlTwin/htmlTwinGUIItem.ts | 2 +- .../src/HtmlTwin/htmlTwinHostComponent.tsx | 2 +- .../accessibility/src/HtmlTwin/htmlTwinNodeItem.ts | 2 +- packages/tools/viewer/src/configuration/loader.ts | 2 +- packages/tools/viewer/src/viewer/defaultViewer.ts | 12 ++++++------ .../tools/viewer/src/viewer/viewerWithTemplate.ts | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/tools/accessibility/src/HtmlTwin/htmlTwinGUIItem.ts b/packages/tools/accessibility/src/HtmlTwin/htmlTwinGUIItem.ts index 1eff339273e..85b1a361b42 100644 --- a/packages/tools/accessibility/src/HtmlTwin/htmlTwinGUIItem.ts +++ b/packages/tools/accessibility/src/HtmlTwin/htmlTwinGUIItem.ts @@ -15,7 +15,7 @@ export class HTMLTwinGUIItem extends HTMLTwinItem { /** * The corresponding BabylonJS entity. Can be a Node or a Control. */ - public entity: Control; + public override entity: Control; constructor(entity: Control, scene: Scene) { super(entity, scene); diff --git a/packages/tools/accessibility/src/HtmlTwin/htmlTwinHostComponent.tsx b/packages/tools/accessibility/src/HtmlTwin/htmlTwinHostComponent.tsx index 9ef0932a58e..343be9bb17c 100644 --- a/packages/tools/accessibility/src/HtmlTwin/htmlTwinHostComponent.tsx +++ b/packages/tools/accessibility/src/HtmlTwin/htmlTwinHostComponent.tsx @@ -22,7 +22,7 @@ export class HTMLTwinHostComponent extends React.Component diff --git a/packages/tools/accessibility/src/HtmlTwin/htmlTwinNodeItem.ts b/packages/tools/accessibility/src/HtmlTwin/htmlTwinNodeItem.ts index 25e1c8c9718..ca8d2f14309 100644 --- a/packages/tools/accessibility/src/HtmlTwin/htmlTwinNodeItem.ts +++ b/packages/tools/accessibility/src/HtmlTwin/htmlTwinNodeItem.ts @@ -13,7 +13,7 @@ export class HTMLTwinNodeItem extends HTMLTwinItem { /** * The corresponding BabylonJS entity. Can be a Node or a Control. */ - public entity: Node; + public override entity: Node; constructor(entity: Node, scene: Scene) { super(entity, scene); diff --git a/packages/tools/viewer/src/configuration/loader.ts b/packages/tools/viewer/src/configuration/loader.ts index 9653c160edd..b174e88135b 100644 --- a/packages/tools/viewer/src/configuration/loader.ts +++ b/packages/tools/viewer/src/configuration/loader.ts @@ -4,7 +4,7 @@ import { getConfigurationType } from "./types/index"; export class ConfigurationLoader extends RenderOnlyConfigurationLoader { // eslint-disable-next-line @typescript-eslint/naming-convention - protected getExtendedConfig(type: string | undefined) { + protected override getExtendedConfig(type: string | undefined) { return getConfigurationType(type || "extended"); } } diff --git a/packages/tools/viewer/src/viewer/defaultViewer.ts b/packages/tools/viewer/src/viewer/defaultViewer.ts index 418b1581035..7b913a6cfff 100644 --- a/packages/tools/viewer/src/viewer/defaultViewer.ts +++ b/packages/tools/viewer/src/viewer/defaultViewer.ts @@ -41,7 +41,7 @@ export class DefaultViewer extends AbstractViewerWithTemplate { * @param initialConfiguration the initial configuration. Defaults to extending the default configuration */ constructor( - public containerElement: Element, + public override containerElement: Element, initialConfiguration: ViewerConfiguration = { extends: "default" } ) { super(containerElement, initialConfiguration); @@ -118,7 +118,7 @@ export class DefaultViewer extends AbstractViewerWithTemplate { * This will be executed when the templates initialize. * @returns a promise that will be resolved when the templates are loaded */ - protected _onTemplatesLoaded() { + protected override _onTemplatesLoaded() { this.showLoadingScreen(); // navbar @@ -411,7 +411,7 @@ export class DefaultViewer extends AbstractViewerWithTemplate { this._updateAnimationSpeed("1.0", paramsObject); }; - protected _initVR() { + protected override _initVR() { if (this.sceneManager.vrHelper) { // due to the way the experience helper is exisintg VR, this must be added. this.sceneManager.vrHelper.onExitingVR.add(() => { @@ -519,7 +519,7 @@ export class DefaultViewer extends AbstractViewerWithTemplate { * @param model the configuration object (or URL) to load. * @returns a promise that will be resolved when the model is loaded */ - public async loadModel(model?: string | File | IModelConfiguration): Promise { + public override async loadModel(model?: string | File | IModelConfiguration): Promise { if (!model) { model = this.configuration.model; } @@ -690,12 +690,12 @@ export class DefaultViewer extends AbstractViewerWithTemplate { }); } - public dispose() { + public override dispose() { this.templateManager.dispose(); super.dispose(); } - protected _onConfigurationLoaded(configuration: ViewerConfiguration) { + protected override _onConfigurationLoaded(configuration: ViewerConfiguration) { super._onConfigurationLoaded(configuration); this.templateManager = new TemplateManager(this.containerElement); diff --git a/packages/tools/viewer/src/viewer/viewerWithTemplate.ts b/packages/tools/viewer/src/viewer/viewerWithTemplate.ts index 1bb3ad3aba3..f1426ca2b3b 100644 --- a/packages/tools/viewer/src/viewer/viewerWithTemplate.ts +++ b/packages/tools/viewer/src/viewer/viewerWithTemplate.ts @@ -7,7 +7,7 @@ import { ConfigurationLoader } from "../configuration/loader"; */ export abstract class AbstractViewerWithTemplate extends AbstractViewer { // eslint-disable-next-line @typescript-eslint/naming-convention - protected getConfigurationLoader() { + protected override getConfigurationLoader() { return new ConfigurationLoader(); } }