Merge pull request #6102 from BabylonJS/master

Nightly

Tools/Gulp/tasks/gulpTasks-whatsNew.js

@@ -6,22 +6,25 @@ var fs = require("fs");
  * Tests the whats new file to ensure changes have been made in the PR.
  */
 gulp.task("tests-whatsnew", function(done) {
-    // Only checks on Travis
-    if (!process.env.TRAVIS) {
-        done();
-        return;
-    }
+    // Check status on azure
+    if (!process.env["AZURE_PULLREQUESTID"]) {
+        // Only checks on Travis
+        if (!process.env.TRAVIS) {
+            done();
+            return;
+        }
 
-    // Only checks on Pull Requests
-    if (process.env.TRAVIS_PULL_REQUEST == "false") {
-        done();
-        return;
-    }
+        // Only checks on Pull Requests
+        if (process.env.TRAVIS_PULL_REQUEST == "false") {
+            done();
+            return;
+        }
 
-    // Do not check deploy
-    if (process.env.TRAVIS_BRANCH == "preview") {
-        done();
-        return;
+        // Do not check deploy
+        if (process.env.TRAVIS_BRANCH == "preview") {
+            done();
+            return;
+        }
     }
 
     // Compare what's new with the current one in the preview release folder.

azure-pipelines.yml

@@ -9,7 +9,7 @@ pr:
 
 jobs:
 - job: WhatsNewUpdate
-  displayName: 'What s New Update'
+  displayName: '1. What s New Update'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -26,7 +26,7 @@ jobs:
       AZURE_PULLREQUESTID: $(System.PullRequest.PullRequestId)
 
 - job: DocumentationCheck
-  displayName: 'Documentation Check'
+  displayName: '2. Documentation Check'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -41,6 +41,7 @@ jobs:
     displayName: 'Typedoc check'
 
 - job: Linting
+  displayName: '3. Linting'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -55,6 +56,7 @@ jobs:
     displayName: 'Full Lint'
 
 - job: Build
+  displayName: '4. Build'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -69,6 +71,7 @@ jobs:
     displayName: 'Typescript all'
 
 - job: Tests
+  displayName: '5. Core Tests'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -92,8 +95,32 @@ jobs:
     workingDirectory: Tools/Gulp
     displayName: 'Visual Tests'
 
+- job: ModuleTests
+  displayName: '6. Module Tests'
+  pool:
+    vmImage: 'Ubuntu-16.04'
+    demands: npm
+  steps:
+  - task: Npm@1
+    displayName: 'npm install'
+    inputs:
+      workingDir: Tools/Gulp
+      verbose: false
+  - script: 'gulp typescript-all'
+    workingDirectory: Tools/Gulp
+    displayName: 'Typescript all'
+  - script: 'gulp tests-modules'
+    workingDirectory: Tools/Gulp
+    displayName: 'Tests modules'
+  - script: 'sudo gulp localdev-es6'
+    workingDirectory: Tools/Gulp
+    displayName: 'Npm link ES6'
+  - script: 'gulp tests-es6Modules'
+    workingDirectory: Tools/Gulp
+    displayName: 'Tests ES6'
+
 - job: ViewerTests
-  displayName: 'Viewer Tests'
+  displayName: '7. Viewer Tests'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm

dist/preview release/packagesSizeBaseLine.json

@@ -1 +1 @@
-{"engineOnly":308950,"sceneOnly":510511,"minGridMaterial":634280,"minStandardMaterial":758099}
+{"engineOnly":308951,"sceneOnly":510752,"minGridMaterial":634521,"minStandardMaterial":758340}

dist/preview release/viewer/babylon.viewer.d.ts

@@ -951,7 +951,7 @@ declare module BabylonViewer {
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 declare module BabylonViewer {
@@ -1594,20 +1594,6 @@ declare module BabylonViewer {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 declare module BabylonViewer {
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-declare module BabylonViewer {
     export interface IEnvironmentMapConfiguration {
             /**
                 * Environment map texture path in relative to the asset folder.

dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -1031,14 +1031,13 @@ declare module 'babylonjs-viewer/templating/viewerTemplatePlugin' {
 }
 
 declare module 'babylonjs-viewer/optimizer/custom' {
-    import { extendedUpgrade } from "babylonjs-viewer/optimizer/custom/extended";
     import { SceneManager } from "babylonjs-viewer/managers/sceneManager";
     /**
       *
       * @param name the name of the custom optimizer configuration
       * @param upgrade set to true if you want to upgrade optimizer and false if you want to degrade
       */
-    export function getCustomOptimizerByName(name: string, upgrade?: boolean): typeof extendedUpgrade;
+    export function getCustomOptimizerByName(name: string, upgrade?: boolean): (sceneManager: SceneManager) => boolean;
     export function registerCustomOptimizer(name: string, optimizer: (sceneManager: SceneManager) => boolean): void;
 }
 
@@ -1738,22 +1737,6 @@ declare module 'babylonjs-viewer/loader/plugins' {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 
-declare module 'babylonjs-viewer/optimizer/custom/extended' {
-    import { SceneManager } from 'babylonjs-viewer/managers/sceneManager';
-    /**
-        * A custom upgrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedUpgrade(sceneManager: SceneManager): boolean;
-    /**
-        * A custom degrade-oriented function configuration for the scene optimizer.
-        *
-        * @param viewer the viewer to optimize
-        */
-    export function extendedDegrade(sceneManager: SceneManager): boolean;
-}
-
 declare module 'babylonjs-viewer/configuration/interfaces' {
     export * from 'babylonjs-viewer/configuration/interfaces/cameraConfiguration';
     export * from 'babylonjs-viewer/configuration/interfaces/colorGradingConfiguration';

dist/preview release/what's new.md

@@ -157,8 +157,6 @@
 
 - Added support for exporting `KHR_lights_punctual`
 
-### Viewer
-
 ### Post-Processes Library
 - Added the [Ocean](https://doc.babylonjs.com/extensions/oceanpostprocess) post-process ([julien-moreau](https://github.com/julien-moreau))
 
@@ -169,6 +167,12 @@
 - Fixed `TerrainMaterial.isReadyForSubMesh` to remove WebGL warnings ([julien-moreau](https://github.com/julien-moreau))
 - Fixed `MixMaterial.isReadyForSubMesh` to remove WebGL warnings ([dad72](https://github.com/dad72))
 
+### Infrastructure
+
+- Adding Azure DevOps Build ([Sebavan](https://github.com/Sebavan))
+
+### Viewer
+
 ## Bug fixes
 - Fixed ArcRotateCamera.setTarget (position was sometimes wrong) ([Deltakosh](https://github.com/deltakosh))
 - Fixed TransformNode.setDirection (orientation was wrong) ([Deltakosh](https://github.com/deltakosh))

src/Meshes/abstractMesh.ts

@@ -1018,7 +1018,7 @@ export class AbstractMesh extends TransformNode implements IDisposable, ICullabl
      * @returns a Matrix
      */
     public getWorldMatrix(): Matrix {
-        if (this._masterMesh) {
+        if (this._masterMesh && this.billboardMode === TransformNode.BILLBOARDMODE_NONE) {
             return this._masterMesh.getWorldMatrix();
         }
 

src/scene.ts

@@ -3930,6 +3930,12 @@ export class Scene extends AbstractScene implements IAnimatable {
                 continue;
             }
 
+            // Compute world matrix if LOD is billboard
+            if (meshLOD !== mesh && meshLOD.billboardMode !== TransformNode.BILLBOARDMODE_NONE) {
+                meshLOD.parent = mesh;
+                meshLOD.computeWorldMatrix();
+            }
+
             mesh._preActivate();
 
             if (mesh.isVisible && mesh.visibility > 0 && ((mesh.layerMask & this.activeCamera.layerMask) !== 0) && (mesh.alwaysSelectAsActiveMesh || mesh.isInFrustum(this._frustumPlanes))) {