small changes and fixing tests

Viewer/src/loader/modelLoader.ts

@@ -2,10 +2,8 @@ import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, Tools, SceneLoader, Tags }
 import { GLTFFileLoader, GLTFLoaderAnimationStartMode } from "babylonjs-loaders";
 import { IModelConfiguration, ViewerConfiguration } from "../configuration";
 import { ViewerModel, ModelState } from "../model/viewerModel";
-import { ILoaderPlugin } from './plugins/loaderPlugin';
-import { TelemetryLoaderPlugin } from './plugins/telemetryLoaderPlugin';
-import { getLoaderPluginByName } from './plugins/';
-import { ObservablesManager } from "managers/observablesManager";
+import { getLoaderPluginByName, TelemetryLoaderPlugin, ILoaderPlugin } from './plugins/';
+import { ObservablesManager } from "../managers/observablesManager";
 import { ConfigurationContainer } from "../configuration/configurationContainer";
 
 /**

Viewer/src/loader/plugins/extendedMaterialLoaderPlugin.ts

@@ -1,6 +1,6 @@
 import { ILoaderPlugin } from "./loaderPlugin";
 import { telemetryManager } from "../../telemetryManager";
-import { ViewerModel } from "../..";
+import { ViewerModel } from "../../model/viewerModel";
 import { Color3, Texture, BaseTexture, Tools, ISceneLoaderPlugin, ISceneLoaderPluginAsync, Material, PBRMaterial, Engine } from "babylonjs";
 
 /**

Viewer/src/loader/plugins/index.ts

@@ -7,6 +7,8 @@ import { Tools } from "babylonjs";
 
 const pluginCache: { [key: string]: ILoaderPlugin } = {};
 
+export { TelemetryLoaderPlugin, ILoaderPlugin, MSFTLodLoaderPlugin, ApplyMaterialConfigPlugin, ExtendedMaterialLoaderPlugin };
+
 /**
  * Get a loader plugin according to its name.
  * The plugin will be cached and will be reused if called for again.

Viewer/src/model/viewerModel.ts

@@ -4,8 +4,8 @@ import { IModelConfiguration, IModelAnimationConfiguration } from "../configurat
 import { IModelAnimation, GroupModelAnimation, AnimationPlayMode, ModelAnimationConfiguration, EasingFunction, AnimationState } from "./modelAnimation";
 
 import { deepmerge, extendClassWithConfig } from '../helper/';
-import { ObservablesManager } from "managers/observablesManager";
-import { ConfigurationContainer } from "configuration/configurationContainer";
+import { ObservablesManager } from "../managers/observablesManager";
+import { ConfigurationContainer } from "../configuration/configurationContainer";
 
 
 /**

Viewer/tests/commons/helper.ts

@@ -117,7 +117,7 @@ export class NullEngineAbstractViewer extends AbstractViewer {
     }
 
     protected _initEngine() {
-        let config: any = this._configuration.engine || {};
+        let config: any = this.configuration.engine || {};
 
         // TDO enable further configuration
         config.engineOptions = config.engineOptions || {};
@@ -145,7 +145,7 @@ export class NullEngineAbstractViewer extends AbstractViewer {
             window.addEventListener('resize', this._resize);
         }
 
-        if (this._configuration.engine && this._configuration.engine.adaptiveQuality) {
+        if (this.configuration.engine && this.configuration.engine.adaptiveQuality) {
             var scale = Math.max(0.5, 1 / (window.devicePixelRatio || 2));
             this.engine.setHardwareScalingLevel(scale);
         }
@@ -161,7 +161,7 @@ export class NullEngineAbstractViewer extends AbstractViewer {
 export class NullEngineDefaultViewer extends DefaultViewer {
 
     protected _initEngine() {
-        let config: any = this._configuration.engine || {};
+        let config: any = this.configuration.engine || {};
         // TDO enable further configuration
         config.engineOptions = config.engineOptions || {};
 
@@ -187,7 +187,7 @@ export class NullEngineDefaultViewer extends DefaultViewer {
             window.addEventListener('resize', this._resize);
         }
 
-        if (this._configuration.engine && this._configuration.engine.adaptiveQuality) {
+        if (this.configuration.engine && this.configuration.engine.adaptiveQuality) {
             var scale = Math.max(0.5, 1 / (window.devicePixelRatio || 2));
             this.engine.setHardwareScalingLevel(scale);
         }