Viewer Compilation

Viewer/src/loader/plugins/msftLodLoaderPlugin.ts

@@ -17,7 +17,7 @@ export class MSFTLodLoaderPlugin implements ILoaderPlugin {
 
     public onExtensionLoaded(extension: IGLTFLoaderExtension) {
         if (extension.name === "MSFT_lod" && this._model.configuration.loaderConfiguration) {
-            const MSFT_lod = extension as GLTF2.Loader.Extensions.MSFT_lod;
+            const MSFT_lod = extension as GLTF2.MSFT_lod;
             MSFT_lod.enabled = !!this._model.configuration.loaderConfiguration.progressiveLoading;
             MSFT_lod.maxLODsToLoad = this._model.configuration.loaderConfiguration.maxLODsToLoad || Number.MAX_VALUE;
         }

Viewer/src/model/viewerModel.ts

@@ -620,7 +620,7 @@ export class ViewerModel implements IDisposable {
         animations: Animation[],
         duration: number,
         easingFunction: any,
-        easingMode: number = BABYLON.EasingFunction.EASINGMODE_EASEINOUT,
+        easingMode: number = 2, // BABYLON.EasingFunction.EASINGMODE_EASEINOUT,
         onAnimationEnd: () => void): void {
 
         if (easingFunction) {

Viewer/src/viewer/viewer.ts

@@ -461,7 +461,7 @@ export abstract class AbstractViewer {
         // Create the screenshot
         return new Promise<string>((resolve, reject) => {
             try {
-                BABYLON.Tools.CreateScreenshot(this.engine, this.sceneManager.camera, { width, height }, (data) => {
+                Tools.CreateScreenshot(this.engine, this.sceneManager.camera, { width, height }, (data) => {
                     if (callback) {
                         callback(data);
                     }

Viewer/tests/unit/src/configuration/updateConfiguration.ts

@@ -1,5 +1,6 @@
 import { Helper } from "../../../commons/helper";
 import { assert, expect, should } from "../viewerReference";
+import { SceneOptimizer } from "babylonjs";
 
 export let name = "configuration update";
 
@@ -264,22 +265,22 @@ describe(name + " scene optimizer", () => {
         let started = false;
         let constructed = false;
 
-        let optimizerFunction = BABYLON.SceneOptimizer;
+        let optimizerFunction = SceneOptimizer;
 
         //mock!
-        (<any>BABYLON.SceneOptimizer) = function() {
+        (<any>SceneOptimizer) = function() {
             constructed = true;
         };
 
-        BABYLON.SceneOptimizer.prototype.start = function() {
+        SceneOptimizer.prototype.start = function() {
             started = true;
         };
 
-        BABYLON.SceneOptimizer.prototype.stop = function() {
+        SceneOptimizer.prototype.stop = function() {
             started = false;
         };
 
-        BABYLON.SceneOptimizer.prototype.dispose = function() {
+        SceneOptimizer.prototype.dispose = function() {
         };
 
         viewer.onInitDoneObservable.add(() => {
@@ -301,7 +302,7 @@ describe(name + " scene optimizer", () => {
             assert.isUndefined(viewer.sceneManager.sceneOptimizer);
             assert.isFalse(started);
 
-            BABYLON.SceneOptimizer = optimizerFunction;
+            //SceneOptimizer = optimizerFunction;
 
             viewer.dispose();
             done();

Viewer/tests/unit/src/viewer/sceneManager.ts

@@ -1,6 +1,7 @@
 import { Helper } from "../../../commons/helper";
 import { assert, expect, should } from "../viewerReference";
 import { DefaultViewer, AbstractViewer, Version, viewerManager } from "../../../../src";
+import { PBRMaterial } from "babylonjs";
 
 export let name = "scene manager";
 
@@ -43,7 +44,7 @@ describe(name, function() {
     it("should set the default material to be PBR-Enabled per default", (done) => {
         let viewer = Helper.getNewViewerInstance();
         viewer.onInitDoneObservable.add(() => {
-            assert.isTrue(viewer.sceneManager.scene.defaultMaterial instanceof BABYLON.PBRMaterial);
+            assert.isTrue(viewer.sceneManager.scene.defaultMaterial instanceof PBRMaterial);
 
             viewer.dispose();
             done();

Viewer/tests/unit/src/viewer/viewer.ts

@@ -1,6 +1,7 @@
 import { Helper } from "../../../commons/helper";
 import { assert, expect, should } from "../viewerReference";
 import { DefaultViewer, AbstractViewer, Version, viewerManager } from "../../../../src";
+import { Engine } from "babylonjs";
 
 export let name = "viewer Tests";
 
@@ -119,7 +120,7 @@ describe('Viewer', function() {
 
     it('should have a version', (done) => {
         assert.exists(Version, "Viewer should have a version");
-        assert.equal(Version, BABYLON.Engine.Version, "Viewer version should equal to Babylon's engine version");
+        assert.equal(Version, Engine.Version, "Viewer version should equal to Babylon's engine version");
         done();
     });
 

Viewer/tsconfig.json

@@ -23,7 +23,7 @@
         "rootDir": "./",
         "paths": {
             "babylonjs": [
-                "../../dist/preview release/babylon.d.ts"
+                "../../dist/preview release/babylon.module.d.ts"
             ],
             "babylonjs-loaders": [
                 "../../dist/preview release/loaders/babylonjs.loaders.module.d.ts"

loaders/src/STL/stlFileLoader.ts

@@ -1,5 +1,4 @@
 import { Scene, SceneLoader, ISceneLoaderPlugin, ISceneLoaderPluginExtensions, Nullable, AbstractMesh, IParticleSystem, Skeleton, Mesh, Tools, AssetContainer, VertexBuffer } from "babylonjs";
-import "babylonjs/Helpers/sceneHelpers";
 
 /**
  * STL file type loader.