Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

dist/preview release/babylon.max.js

@@ -71514,6 +71514,7 @@ var BABYLON;
                 if (!this._webVRpresenting) {
                     this._webVRCamera.position = this._position;
                     this._scene.activeCamera = this._webVRCamera;
+                    this._scene.imageProcessingConfiguration.applyByPostProcess = true;
                 }
             }
             else {
@@ -71545,6 +71546,7 @@ var BABYLON;
                 this._scene.activeCamera.attachControl(this._canvas);
             }
             this.updateButtonVisibility();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
         };
         Object.defineProperty(VRExperienceHelper.prototype, "position", {
             get: function () {
@@ -71580,6 +71582,8 @@ var BABYLON;
             this._postProcessMove.vignetteColor = new BABYLON.Color4(0, 0, 0, 0);
             this._postProcessMove.vignetteEnabled = false;
             new BABYLON.PassPostProcess("pass", 1.0, this._webVRCamera);
+            this._postProcessMove.imageProcessingConfiguration = new BABYLON.ImageProcessingConfiguration();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false;
             this._createTeleportationCircles();
             this.meshSelectionPredicate = function (mesh) {
                 if (mesh.name.indexOf(_this._floorMeshName) !== -1) {

src/Cameras/VR/babylon.vrExperienceHelper.ts

@@ -301,6 +301,7 @@ module BABYLON {
                 if (!this._webVRpresenting) {
                     this._webVRCamera.position = this._position;
                     this._scene.activeCamera = this._webVRCamera;
+                    this._scene.imageProcessingConfiguration.applyByPostProcess = true; 
                 }
             }
             else {
@@ -337,6 +338,7 @@ module BABYLON {
             }
 
             this.updateButtonVisibility();
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false; 
         }
 
         public get position(): Vector3 {
@@ -373,6 +375,8 @@ module BABYLON {
             this._postProcessMove.vignetteColor = new BABYLON.Color4(0, 0, 0, 0);
             this._postProcessMove.vignetteEnabled = false;
             new BABYLON.PassPostProcess("pass", 1.0, this._webVRCamera);
+            this._postProcessMove.imageProcessingConfiguration = new ImageProcessingConfiguration(); 
+            this._scene.imageProcessingConfiguration.applyByPostProcess = false; 
 
             this._createTeleportationCircles();
 

src/Helpers/babylon.environmentHelper.ts

@@ -299,8 +299,8 @@ namespace BABYLON {
         /**
          * Stores the creation options.
          */
-        private readonly _options: IEnvironmentHelperOptions;
         private readonly _scene: Scene;
+        private _options: IEnvironmentHelperOptions;
 
         /**
          * constructor
@@ -363,12 +363,13 @@ namespace BABYLON {
                 this._groundMirror = null;
             }
 
-            this._setupBackground();
-
             if (this._options.environmentTexture && !newOptions.environmentTexture && this._scene.environmentTexture) {
                 this._scene.environmentTexture.dispose();
             }
 
+            this._options = newOptions;
+
+            this._setupBackground();
             this._setupImageProcessing();
         }
 
@@ -436,8 +437,8 @@ namespace BABYLON {
 
                 if (this._options.enableGroundMirror) {
                     this._setupGroundMirrorTexture(sceneSize);
-                    this._setupMirrorInGroundMaterial();
                 }
+                this._setupMirrorInGroundMaterial();
             }
 
             if (this._options.createSkybox) {

src/Shaders/ShadersInclude/backgroundFragmentDeclaration.fx

@@ -20,4 +20,8 @@
 
 #ifdef REFLECTIONFRESNEL
     uniform vec4 vReflectionControl;
+#endif
+
+#if defined(REFLECTIONMAP_SPHERICAL) || defined(REFLECTIONMAP_PROJECTION) || defined(REFRACTION)
+uniform mat4 view;
 #endif

src/babylon.scene.ts

@@ -3410,7 +3410,7 @@
                     stepsTaken++;
                     deltaTime -= defaultFrameTime;
 
-                } while (deltaTime > 0 && stepsTaken > maxSubSteps);
+                } while (deltaTime > 0 && stepsTaken < maxSubSteps);
 
                 this._timeAccumulator = deltaTime;