Merge pull request #7703 from BabylonJS/master

4.1.0-rc.5

dist/preview release/documentation.d.ts

@@ -70466,6 +70466,7 @@ declare module BABYLON.GUI {
         private _renderScale;
         private _rootElement;
         private _cursorChanged;
+        private _defaultMousePointerId;
         /** @hidden */
         _numLayoutCalls: number;
         /** Gets the number of layout calls made the last time the ADT has been rendered */

dist/preview release/glTF2Interface/package.json

@@ -1,7 +1,7 @@
 {
     "name": "babylonjs-gltf2interface",
     "description": "A typescript declaration of babylon's gltf2 inteface.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

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

@@ -367,6 +367,7 @@ declare module BABYLON.GUI {
         private _renderScale;
         private _rootElement;
         private _cursorChanged;
+        private _defaultMousePointerId;
         /** @hidden */
         _numLayoutCalls: number;
         /** Gets the number of layout calls made the last time the ADT has been rendered */

dist/preview release/gui/babylon.gui.js

@@ -572,6 +572,7 @@ var AdvancedDynamicTexture = /** @class */ (function (_super) {
         _this._blockNextFocusCheck = false;
         _this._renderScale = 1;
         _this._cursorChanged = false;
+        _this._defaultMousePointerId = 0;
         /** @hidden */
         _this._numLayoutCalls = 0;
         /** @hidden */
@@ -1250,6 +1251,9 @@ var AdvancedDynamicTexture = /** @class */ (function (_super) {
             if (!scene) {
                 return;
             }
+            if (pi.type === babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__["PointerEventTypes"].POINTERMOVE && pi.event.pointerId) {
+                _this._defaultMousePointerId = pi.event.pointerId; // This is required to make sure we have the correct pointer ID for wheel
+            }
             var camera = scene.cameraToUseForPointers || scene.activeCamera;
             var engine = scene.getEngine();
             if (!camera) {
@@ -1265,7 +1269,8 @@ var AdvancedDynamicTexture = /** @class */ (function (_super) {
             var y = scene.pointerY / engine.getHardwareScalingLevel() - (engine.getRenderHeight() - tempViewport.y - tempViewport.height);
             _this._shouldBlockPointer = false;
             // Do picking modifies _shouldBlockPointer
-            _this._doPicking(x, y, pi.type, pi.event.pointerId || 0, pi.event.button, pi.event.deltaX, pi.event.deltaY);
+            var pointerId = pi.event.pointerId || _this._defaultMousePointerId;
+            _this._doPicking(x, y, pi.type, pointerId, pi.event.button, pi.event.deltaX, pi.event.deltaY);
             // Avoid overwriting a true skipOnPointerObservable to false
             if (_this._shouldBlockPointer) {
                 pi.skipOnPointerObservable = _this._shouldBlockPointer;
@@ -1307,7 +1312,7 @@ var AdvancedDynamicTexture = /** @class */ (function (_super) {
                 && pi.type !== babylonjs_Misc_observable__WEBPACK_IMPORTED_MODULE_1__["PointerEventTypes"].POINTERDOWN) {
                 return;
             }
-            var pointerId = pi.event.pointerId || 0;
+            var pointerId = pi.event.pointerId || _this._defaultMousePointerId;
             if (pi.pickInfo && pi.pickInfo.hit && pi.pickInfo.pickedMesh === mesh) {
                 var uv = pi.pickInfo.getTextureCoordinates();
                 if (uv) {

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

@@ -387,6 +387,7 @@ declare module "babylonjs-gui/2D/advancedDynamicTexture" {
         private _renderScale;
         private _rootElement;
         private _cursorChanged;
+        private _defaultMousePointerId;
         /** @hidden */
         _numLayoutCalls: number;
         /** Gets the number of layout calls made the last time the ADT has been rendered */
@@ -4734,6 +4735,7 @@ declare module BABYLON.GUI {
         private _renderScale;
         private _rootElement;
         private _cursorChanged;
+        private _defaultMousePointerId;
         /** @hidden */
         _numLayoutCalls: number;
         /** Gets the number of layout calls made the last time the ADT has been rendered */

dist/preview release/gui/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-gui",
     "description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

dist/preview release/inspector/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-inspector",
     "description": "The Babylon.js inspector.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -29,12 +29,12 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4",
-        "babylonjs-gui": "4.1.0-rc.4",
-        "babylonjs-loaders": "4.1.0-rc.4",
-        "babylonjs-materials": "4.1.0-rc.4",
-        "babylonjs-serializers": "4.1.0-rc.4",
-        "babylonjs-gltf2interface": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5",
+        "babylonjs-gui": "4.1.0-rc.5",
+        "babylonjs-loaders": "4.1.0-rc.5",
+        "babylonjs-materials": "4.1.0-rc.5",
+        "babylonjs-serializers": "4.1.0-rc.5",
+        "babylonjs-gltf2interface": "4.1.0-rc.5"
     },
     "devDependencies": {
         "@types/react": "~16.7.3",

dist/preview release/loaders/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-loaders",
     "description": "The Babylon.js file loaders library is an extension you can use to load different 3D file types into a Babylon scene.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,8 +28,8 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "4.1.0-rc.4",
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs-gltf2interface": "4.1.0-rc.5",
+        "babylonjs": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

dist/preview release/materialsLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-materials",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

dist/preview release/nodeEditor/package.json

@@ -4,14 +4,14 @@
     },
     "name": "babylonjs-node-editor",
     "description": "The Babylon.js node material editor.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5"
     },
     "files": [
         "babylon.nodeEditor.max.js.map",

dist/preview release/package.json

@@ -7,7 +7,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

dist/preview release/postProcessesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-post-process",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

dist/preview release/proceduralTexturesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-procedural-textures",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,7 +28,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

dist/preview release/serializers/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-serializers",
     "description": "The Babylon.js serializers library is an extension you can use to serialize Babylon scenes.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -28,8 +28,8 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs": "4.1.0-rc.4",
-        "babylonjs-gltf2interface": "4.1.0-rc.4"
+        "babylonjs": "4.1.0-rc.5",
+        "babylonjs-gltf2interface": "4.1.0-rc.5"
     },
     "engines": {
         "node": "*"

gui/src/2D/advancedDynamicTexture.ts

@@ -84,6 +84,7 @@ export class AdvancedDynamicTexture extends DynamicTexture {
     private _renderScale = 1;
     private _rootElement: Nullable<HTMLElement>;
     private _cursorChanged = false;
+    private _defaultMousePointerId = 0;
 
     /** @hidden */
     public _numLayoutCalls = 0;
@@ -710,6 +711,11 @@ export class AdvancedDynamicTexture extends DynamicTexture {
             if (!scene) {
                 return;
             }
+
+            if (pi.type === PointerEventTypes.POINTERMOVE && (pi.event as PointerEvent).pointerId) {
+                this._defaultMousePointerId = (pi.event as PointerEvent).pointerId; // This is required to make sure we have the correct pointer ID for wheel
+            }
+
             let camera = scene.cameraToUseForPointers || scene.activeCamera;
             let engine = scene.getEngine();
 
@@ -726,7 +732,8 @@ export class AdvancedDynamicTexture extends DynamicTexture {
             let y = scene.pointerY / engine.getHardwareScalingLevel() - (engine.getRenderHeight() - tempViewport.y - tempViewport.height);
             this._shouldBlockPointer = false;
             // Do picking modifies _shouldBlockPointer
-            this._doPicking(x, y, pi.type, (pi.event as PointerEvent).pointerId || 0, pi.event.button, (<MouseWheelEvent>pi.event).deltaX, (<MouseWheelEvent>pi.event).deltaY);
+            let pointerId = (pi.event as PointerEvent).pointerId || this._defaultMousePointerId;
+            this._doPicking(x, y, pi.type, pointerId, pi.event.button, (<MouseWheelEvent>pi.event).deltaX, (<MouseWheelEvent>pi.event).deltaY);
             // Avoid overwriting a true skipOnPointerObservable to false
             if (this._shouldBlockPointer) {
                 pi.skipOnPointerObservable = this._shouldBlockPointer;
@@ -787,7 +794,8 @@ export class AdvancedDynamicTexture extends DynamicTexture {
                 && pi.type !== PointerEventTypes.POINTERDOWN) {
                 return;
             }
-            var pointerId = (pi.event as PointerEvent).pointerId || 0;
+
+            var pointerId = (pi.event as PointerEvent).pointerId || this._defaultMousePointerId;
             if (pi.pickInfo && pi.pickInfo.hit && pi.pickInfo.pickedMesh === mesh) {
                 var uv = pi.pickInfo.getTextureCoordinates();
                 if (uv) {

package.json

@@ -7,7 +7,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "4.1.0-rc.4",
+    "version": "4.1.0-rc.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

src/Engines/thinEngine.ts

@@ -132,14 +132,14 @@ export class ThinEngine {
      */
     // Not mixed with Version for tooling purpose.
     public static get NpmPackage(): string {
-        return "babylonjs@4.1.0-rc.4";
+        return "babylonjs@4.1.0-rc.5";
     }
 
     /**
      * Returns the current version of the framework
      */
     public static get Version(): string {
-        return "4.1.0-rc.4";
+        return "4.1.0-rc.5";
     }
 
     /**