Merge pull request #3428 from BabylonJS/master

Nightly

src/Cameras/VR/babylon.vrExperienceHelper.ts

@@ -2,6 +2,7 @@ module BABYLON {
     export interface VRTeleportationOptions {
         floorMeshName?: string; // If you'd like to provide a mesh acting as the floor
         floorMeshes?: Mesh[];
+        disableInteractions?: boolean
     }
 
     export interface VRExperienceHelperOptions extends WebVROptions {
@@ -483,6 +484,8 @@ module BABYLON {
 
             if (this._scene.activeCamera) {
                 this._position = this._scene.activeCamera.position.clone();
+                // make sure that we return to the last active camera
+                this._existingCamera = this._scene.activeCamera;
             }
 
             if (this._webVRrequesting)
@@ -633,15 +636,15 @@ module BABYLON {
             if (!this._teleportationEnabled) {
                 this._teleportationRequested = true;
 
-                this.enableInteractions();
+                if (!vrTeleportationOptions.disableInteractions) {
+                    this.enableInteractions();
+                }    
 
-                if (vrTeleportationOptions) {
-                    if (vrTeleportationOptions.floorMeshName) {
-                        this._floorMeshName = vrTeleportationOptions.floorMeshName;
-                    }
-                    if (vrTeleportationOptions.floorMeshes) {
-                        this._floorMeshesCollection = vrTeleportationOptions.floorMeshes;
-                    }
+                if (vrTeleportationOptions.floorMeshName) {
+                    this._floorMeshName = vrTeleportationOptions.floorMeshName;
+                }
+                if (vrTeleportationOptions.floorMeshes) {
+                    this._floorMeshesCollection = vrTeleportationOptions.floorMeshes;
                 }
 
                 if (this._leftControllerReady && this._webVRCamera.leftController) {

src/Collisions/babylon.collisionCoordinator.ts

@@ -220,7 +220,7 @@ module BABYLON {
         public init(scene: Scene): void {
             this._scene = scene;
             this._scene.registerAfterRender(this._afterRender);
-            var workerUrl = BABYLON.WorkerIncluded ? Engine.CodeRepository + "Collisions/babylon.collisionWorker.js" : URL.createObjectURL(new Blob([BABYLON.CollisionWorker], { type: 'application/javascript' }));
+            var workerUrl = WorkerIncluded ? Engine.CodeRepository + "Collisions/babylon.collisionWorker.js" : URL.createObjectURL(new Blob([CollisionWorker], { type: 'application/javascript' }));
             this._worker = new Worker(workerUrl);
             this._worker.onmessage = this._onMessageFromWorker;
             var message: BabylonMessage = {

src/Debug/babylon.axesViewer.ts

@@ -1,7 +1,7 @@
 module BABYLON.Debug {
 
     export class AxesViewer {
-        
+
         private _xline = [Vector3.Zero(), Vector3.Zero()];
         private _yline = [Vector3.Zero(), Vector3.Zero()];
         private _zline = [Vector3.Zero(), Vector3.Zero()];
@@ -26,17 +26,17 @@
             this._zmesh.renderingGroupId = 2;
 
             this._xmesh.material.checkReadyOnlyOnce = true;
-            this._xmesh.color = new BABYLON.Color3(1, 0, 0);
+            this._xmesh.color = new Color3(1, 0, 0);
             this._ymesh.material.checkReadyOnlyOnce = true;
-            this._ymesh.color = new BABYLON.Color3(0, 1, 0);
+            this._ymesh.color = new Color3(0, 1, 0);
             this._zmesh.material.checkReadyOnlyOnce = true;
-            this._zmesh.color = new BABYLON.Color3(0, 0, 1);
+            this._zmesh.color = new Color3(0, 0, 1);
 
             this.scene = scene;
 
         }
 
-        public update (position: Vector3, xaxis: Vector3, yaxis: Vector3, zaxis: Vector3): void {
+        public update(position: Vector3, xaxis: Vector3, yaxis: Vector3, zaxis: Vector3): void {
 
             var scaleLines = this.scaleLines;
 
@@ -72,7 +72,7 @@
 
         public dispose() {
 
-            if (this._xmesh ) {
+            if (this._xmesh) {
                 this._xmesh.dispose();
             }
 

src/Materials/babylon.effect.ts

@@ -27,7 +27,7 @@
             this._defines[rank].push(define);
         }
 
-        public addCPUSkinningFallback(rank: number, mesh: BABYLON.AbstractMesh) {
+        public addCPUSkinningFallback(rank: number, mesh: AbstractMesh) {
             this._mesh = mesh;
 
             if (rank < this._currentRank) {
@@ -362,16 +362,16 @@
 
             // Dump shaders name and formatted source code
             if (this.name.vertexElement) {
-                BABYLON.Tools.Error("Vertex shader: " + this.name.vertexElement + formattedVertexCode);
-                BABYLON.Tools.Error("Fragment shader: " + this.name.fragmentElement + formattedFragmentCode);
+                Tools.Error("Vertex shader: " + this.name.vertexElement + formattedVertexCode);
+                Tools.Error("Fragment shader: " + this.name.fragmentElement + formattedFragmentCode);
             }
             else if (this.name.vertex) {
-                BABYLON.Tools.Error("Vertex shader: " + this.name.vertex + formattedVertexCode);
-                BABYLON.Tools.Error("Fragment shader: " + this.name.fragment + formattedFragmentCode);
+                Tools.Error("Vertex shader: " + this.name.vertex + formattedVertexCode);
+                Tools.Error("Fragment shader: " + this.name.fragment + formattedFragmentCode);
             }
             else {
-                BABYLON.Tools.Error("Vertex shader: " + this.name + formattedVertexCode);
-                BABYLON.Tools.Error("Fragment shader: " + this.name + formattedFragmentCode);
+                Tools.Error("Vertex shader: " + this.name + formattedVertexCode);
+                Tools.Error("Fragment shader: " + this.name + formattedFragmentCode);
             }
         };
 
@@ -605,10 +605,10 @@
 
                 // Let's go through fallbacks then
                 Tools.Error("Unable to compile effect:");
-                BABYLON.Tools.Error("Uniforms: " + this._uniformsNames.map(function (uniform) {
+                Tools.Error("Uniforms: " + this._uniformsNames.map(function (uniform) {
                     return " " + uniform;
                 }));
-                BABYLON.Tools.Error("Attributes: " + attributesNames.map(function (attribute) {
+                Tools.Error("Attributes: " + attributesNames.map(function (attribute) {
                     return " " + attribute;
                 }));
                 this._dumpShadersSource(this._vertexSourceCode, this._fragmentSourceCode, defines);

src/Shaders/ShadersInclude/helperFunctions.fx

@@ -72,6 +72,7 @@ float getRand(vec2 seed) {
 
 vec3 dither(vec2 seed, vec3 color) {
 	float rand = getRand(seed);
-	color.rgb += mix(-0.5/255.0, 0.5/255.0, rand);
+	color += mix(-0.5/255.0, 0.5/255.0, rand);
+	color = max(color, 0.0);
 	return color;
 }