浏览代码

REvert touchangularsensibility

David Catuhe 7 年之前
父节点
当前提交
a54db33a6e

文件差异内容过多而无法显示
+ 9379 - 9385
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 23 - 23
dist/preview release/babylon.js


+ 4 - 48
dist/preview release/babylon.max.js

@@ -38290,8 +38290,6 @@ var BABYLON;
             this.buttons = [0, 1, 2];
             this.buttons = [0, 1, 2];
             this.angularSensibilityX = 1000.0;
             this.angularSensibilityX = 1000.0;
             this.angularSensibilityY = 1000.0;
             this.angularSensibilityY = 1000.0;
-            this.angularTouchSensibilityX = this.angularSensibilityX;
-            this.angularTouchSensibilityY = this.angularSensibilityY;
             this.pinchPrecision = 12.0;
             this.pinchPrecision = 12.0;
             /**
             /**
              * pinchDeltaPercentage will be used instead of pinchPrecision if different from 0.
              * pinchDeltaPercentage will be used instead of pinchPrecision if different from 0.
@@ -38303,8 +38301,6 @@ var BABYLON;
             this.multiTouchPanAndZoom = true;
             this.multiTouchPanAndZoom = true;
             this._isPanClick = false;
             this._isPanClick = false;
             this.pinchInwards = true;
             this.pinchInwards = true;
-            this._angularSensibilityX = this.angularSensibilityX;
-            this._angularSensibilityY = this.angularSensibilityY;
         }
         }
         ArcRotateCameraPointersInput.prototype.attachControl = function (element, noPreventDefault) {
         ArcRotateCameraPointersInput.prototype.attachControl = function (element, noPreventDefault) {
             var _this = this;
             var _this = this;
@@ -38319,8 +38315,6 @@ var BABYLON;
             this._pointerInput = function (p, s) {
             this._pointerInput = function (p, s) {
                 var evt = p.event;
                 var evt = p.event;
                 var isTouch = p.event.pointerType === "touch";
                 var isTouch = p.event.pointerType === "touch";
-                _this._angularSensibilityX = isTouch ? _this.angularTouchSensibilityX : _this.angularSensibilityX;
-                _this._angularSensibilityY = isTouch ? _this.angularTouchSensibilityY : _this.angularSensibilityY;
                 if (engine.isInVRExclusivePointerMode) {
                 if (engine.isInVRExclusivePointerMode) {
                     return;
                     return;
                 }
                 }
@@ -38410,8 +38404,8 @@ var BABYLON;
                         else {
                         else {
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
-                            _this.camera.inertialAlphaOffset -= offsetX / _this._angularSensibilityX;
-                            _this.camera.inertialBetaOffset -= offsetY / _this._angularSensibilityY;
+                            _this.camera.inertialAlphaOffset -= offsetX / _this.angularSensibilityX;
+                            _this.camera.inertialBetaOffset -= offsetY / _this.angularSensibilityY;
                         }
                         }
                         cacheSoloPointer.x = evt.clientX;
                         cacheSoloPointer.x = evt.clientX;
                         cacheSoloPointer.y = evt.clientY;
                         cacheSoloPointer.y = evt.clientY;
@@ -38440,7 +38434,7 @@ var BABYLON;
                             else {
                             else {
                                 _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                 _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     (_this.pinchPrecision *
                                     (_this.pinchPrecision *
-                                        ((_this._angularSensibilityX + _this._angularSensibilityY) / 2) *
+                                        ((_this.angularSensibilityX + _this.angularSensibilityY) / 2) *
                                         direction);
                                         direction);
                             }
                             }
                             if (_this.panningSensibility !== 0) {
                             if (_this.panningSensibility !== 0) {
@@ -38463,7 +38457,7 @@ var BABYLON;
                                 else {
                                 else {
                                     _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                         (_this.pinchPrecision *
                                         (_this.pinchPrecision *
-                                            ((_this._angularSensibilityX + _this._angularSensibilityY) / 2) *
+                                            ((_this.angularSensibilityX + _this.angularSensibilityY) / 2) *
                                             direction);
                                             direction);
                                 }
                                 }
                                 previousMultiTouchPanPosition.isPaning = false;
                                 previousMultiTouchPanPosition.isPaning = false;
@@ -38594,12 +38588,6 @@ var BABYLON;
         ], ArcRotateCameraPointersInput.prototype, "angularSensibilityY", void 0);
         ], ArcRotateCameraPointersInput.prototype, "angularSensibilityY", void 0);
         __decorate([
         __decorate([
             BABYLON.serialize()
             BABYLON.serialize()
-        ], ArcRotateCameraPointersInput.prototype, "angularTouchSensibilityX", void 0);
-        __decorate([
-            BABYLON.serialize()
-        ], ArcRotateCameraPointersInput.prototype, "angularTouchSensibilityY", void 0);
-        __decorate([
-            BABYLON.serialize()
         ], ArcRotateCameraPointersInput.prototype, "pinchPrecision", void 0);
         ], ArcRotateCameraPointersInput.prototype, "pinchPrecision", void 0);
         __decorate([
         __decorate([
             BABYLON.serialize()
             BABYLON.serialize()
@@ -38751,38 +38739,6 @@ var BABYLON;
             enumerable: true,
             enumerable: true,
             configurable: true
             configurable: true
         });
         });
-        Object.defineProperty(ArcRotateCamera.prototype, "angularTouchSensibilityX", {
-            get: function () {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers)
-                    return pointers.angularTouchSensibilityX;
-                return 0;
-            },
-            set: function (value) {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers) {
-                    pointers.angularTouchSensibilityX = value;
-                }
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(ArcRotateCamera.prototype, "angularTouchSensibilityY", {
-            get: function () {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers)
-                    return pointers.angularTouchSensibilityY;
-                return 0;
-            },
-            set: function (value) {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers) {
-                    pointers.angularTouchSensibilityY = value;
-                }
-            },
-            enumerable: true,
-            configurable: true
-        });
         Object.defineProperty(ArcRotateCamera.prototype, "pinchPrecision", {
         Object.defineProperty(ArcRotateCamera.prototype, "pinchPrecision", {
             get: function () {
             get: function () {
                 var pointers = this.inputs.attached["pointers"];
                 var pointers = this.inputs.attached["pointers"];

文件差异内容过多而无法显示
+ 9379 - 9385
dist/preview release/babylon.module.d.ts


文件差异内容过多而无法显示
+ 23 - 23
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 3851 - 3857
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


文件差异内容过多而无法显示
+ 9 - 9
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 4 - 48
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -38290,8 +38290,6 @@ var BABYLON;
             this.buttons = [0, 1, 2];
             this.buttons = [0, 1, 2];
             this.angularSensibilityX = 1000.0;
             this.angularSensibilityX = 1000.0;
             this.angularSensibilityY = 1000.0;
             this.angularSensibilityY = 1000.0;
-            this.angularTouchSensibilityX = this.angularSensibilityX;
-            this.angularTouchSensibilityY = this.angularSensibilityY;
             this.pinchPrecision = 12.0;
             this.pinchPrecision = 12.0;
             /**
             /**
              * pinchDeltaPercentage will be used instead of pinchPrecision if different from 0.
              * pinchDeltaPercentage will be used instead of pinchPrecision if different from 0.
@@ -38303,8 +38301,6 @@ var BABYLON;
             this.multiTouchPanAndZoom = true;
             this.multiTouchPanAndZoom = true;
             this._isPanClick = false;
             this._isPanClick = false;
             this.pinchInwards = true;
             this.pinchInwards = true;
-            this._angularSensibilityX = this.angularSensibilityX;
-            this._angularSensibilityY = this.angularSensibilityY;
         }
         }
         ArcRotateCameraPointersInput.prototype.attachControl = function (element, noPreventDefault) {
         ArcRotateCameraPointersInput.prototype.attachControl = function (element, noPreventDefault) {
             var _this = this;
             var _this = this;
@@ -38319,8 +38315,6 @@ var BABYLON;
             this._pointerInput = function (p, s) {
             this._pointerInput = function (p, s) {
                 var evt = p.event;
                 var evt = p.event;
                 var isTouch = p.event.pointerType === "touch";
                 var isTouch = p.event.pointerType === "touch";
-                _this._angularSensibilityX = isTouch ? _this.angularTouchSensibilityX : _this.angularSensibilityX;
-                _this._angularSensibilityY = isTouch ? _this.angularTouchSensibilityY : _this.angularSensibilityY;
                 if (engine.isInVRExclusivePointerMode) {
                 if (engine.isInVRExclusivePointerMode) {
                     return;
                     return;
                 }
                 }
@@ -38410,8 +38404,8 @@ var BABYLON;
                         else {
                         else {
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
-                            _this.camera.inertialAlphaOffset -= offsetX / _this._angularSensibilityX;
-                            _this.camera.inertialBetaOffset -= offsetY / _this._angularSensibilityY;
+                            _this.camera.inertialAlphaOffset -= offsetX / _this.angularSensibilityX;
+                            _this.camera.inertialBetaOffset -= offsetY / _this.angularSensibilityY;
                         }
                         }
                         cacheSoloPointer.x = evt.clientX;
                         cacheSoloPointer.x = evt.clientX;
                         cacheSoloPointer.y = evt.clientY;
                         cacheSoloPointer.y = evt.clientY;
@@ -38440,7 +38434,7 @@ var BABYLON;
                             else {
                             else {
                                 _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                 _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     (_this.pinchPrecision *
                                     (_this.pinchPrecision *
-                                        ((_this._angularSensibilityX + _this._angularSensibilityY) / 2) *
+                                        ((_this.angularSensibilityX + _this.angularSensibilityY) / 2) *
                                         direction);
                                         direction);
                             }
                             }
                             if (_this.panningSensibility !== 0) {
                             if (_this.panningSensibility !== 0) {
@@ -38463,7 +38457,7 @@ var BABYLON;
                                 else {
                                 else {
                                     _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     _this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                         (_this.pinchPrecision *
                                         (_this.pinchPrecision *
-                                            ((_this._angularSensibilityX + _this._angularSensibilityY) / 2) *
+                                            ((_this.angularSensibilityX + _this.angularSensibilityY) / 2) *
                                             direction);
                                             direction);
                                 }
                                 }
                                 previousMultiTouchPanPosition.isPaning = false;
                                 previousMultiTouchPanPosition.isPaning = false;
@@ -38594,12 +38588,6 @@ var BABYLON;
         ], ArcRotateCameraPointersInput.prototype, "angularSensibilityY", void 0);
         ], ArcRotateCameraPointersInput.prototype, "angularSensibilityY", void 0);
         __decorate([
         __decorate([
             BABYLON.serialize()
             BABYLON.serialize()
-        ], ArcRotateCameraPointersInput.prototype, "angularTouchSensibilityX", void 0);
-        __decorate([
-            BABYLON.serialize()
-        ], ArcRotateCameraPointersInput.prototype, "angularTouchSensibilityY", void 0);
-        __decorate([
-            BABYLON.serialize()
         ], ArcRotateCameraPointersInput.prototype, "pinchPrecision", void 0);
         ], ArcRotateCameraPointersInput.prototype, "pinchPrecision", void 0);
         __decorate([
         __decorate([
             BABYLON.serialize()
             BABYLON.serialize()
@@ -38751,38 +38739,6 @@ var BABYLON;
             enumerable: true,
             enumerable: true,
             configurable: true
             configurable: true
         });
         });
-        Object.defineProperty(ArcRotateCamera.prototype, "angularTouchSensibilityX", {
-            get: function () {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers)
-                    return pointers.angularTouchSensibilityX;
-                return 0;
-            },
-            set: function (value) {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers) {
-                    pointers.angularTouchSensibilityX = value;
-                }
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(ArcRotateCamera.prototype, "angularTouchSensibilityY", {
-            get: function () {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers)
-                    return pointers.angularTouchSensibilityY;
-                return 0;
-            },
-            set: function (value) {
-                var pointers = this.inputs.attached["pointers"];
-                if (pointers) {
-                    pointers.angularTouchSensibilityY = value;
-                }
-            },
-            enumerable: true,
-            configurable: true
-        });
         Object.defineProperty(ArcRotateCamera.prototype, "pinchPrecision", {
         Object.defineProperty(ArcRotateCamera.prototype, "pinchPrecision", {
             get: function () {
             get: function () {
                 var pointers = this.inputs.attached["pointers"];
                 var pointers = this.inputs.attached["pointers"];

文件差异内容过多而无法显示
+ 3851 - 3857
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.module.d.ts


+ 4 - 16
src/Cameras/Inputs/babylon.arcRotateCameraPointersInput.ts

@@ -12,12 +12,6 @@ module BABYLON {
         public angularSensibilityY = 1000.0;
         public angularSensibilityY = 1000.0;
 
 
         @serialize()
         @serialize()
-        public angularTouchSensibilityX = this.angularSensibilityX;
-
-        @serialize()
-        public angularTouchSensibilityY = this.angularSensibilityY;
-
-        @serialize()
         public pinchPrecision = 12.0;
         public pinchPrecision = 12.0;
 
 
         /**
         /**
@@ -39,9 +33,6 @@ module BABYLON {
         private _isPanClick: boolean = false;
         private _isPanClick: boolean = false;
         public pinchInwards = true;
         public pinchInwards = true;
 
 
-        private _angularSensibilityX = this.angularSensibilityX;
-        private _angularSensibilityY = this.angularSensibilityY;
-
         private _pointerInput: (p: PointerInfo, s: EventState) => void;
         private _pointerInput: (p: PointerInfo, s: EventState) => void;
         private _observer: Nullable<Observer<PointerInfo>>;
         private _observer: Nullable<Observer<PointerInfo>>;
         private _onMouseMove: Nullable<(e: MouseEvent) => any>;
         private _onMouseMove: Nullable<(e: MouseEvent) => any>;
@@ -65,9 +56,6 @@ module BABYLON {
                 var evt = <PointerEvent>p.event;
                 var evt = <PointerEvent>p.event;
                 let isTouch = (<any>p.event).pointerType === "touch";
                 let isTouch = (<any>p.event).pointerType === "touch";
                 
                 
-                this._angularSensibilityX = isTouch ? this.angularTouchSensibilityX : this.angularSensibilityX;
-                this._angularSensibilityY = isTouch ? this.angularTouchSensibilityY : this.angularSensibilityY;
-                
                 if (engine.isInVRExclusivePointerMode) {
                 if (engine.isInVRExclusivePointerMode) {
                     return;
                     return;
                 }
                 }
@@ -163,8 +151,8 @@ module BABYLON {
                         } else {
                         } else {
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetX = evt.clientX - cacheSoloPointer.x;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
                             var offsetY = evt.clientY - cacheSoloPointer.y;
-                            this.camera.inertialAlphaOffset -= offsetX / this._angularSensibilityX;
-                            this.camera.inertialBetaOffset -= offsetY / this._angularSensibilityY;
+                            this.camera.inertialAlphaOffset -= offsetX / this.angularSensibilityX;
+                            this.camera.inertialBetaOffset -= offsetY / this.angularSensibilityY;
                         }
                         }
 
 
                         cacheSoloPointer.x = evt.clientX;
                         cacheSoloPointer.x = evt.clientX;
@@ -197,7 +185,7 @@ module BABYLON {
                             } else {
                             } else {
                                 this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                 this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     (this.pinchPrecision *
                                     (this.pinchPrecision *
-                                        ((this._angularSensibilityX + this._angularSensibilityY) / 2) *
+                                        ((this.angularSensibilityX + this.angularSensibilityY) / 2) *
                                         direction);
                                         direction);
                             }
                             }
 
 
@@ -223,7 +211,7 @@ module BABYLON {
                                 } else {
                                 } else {
                                     this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                         (this.pinchPrecision *
                                         (this.pinchPrecision *
-                                            ((this._angularSensibilityX + this._angularSensibilityY) / 2) *
+                                            ((this.angularSensibilityX + this.angularSensibilityY) / 2) *
                                             direction);
                                             direction);
                                 }
                                 }
                                 previousMultiTouchPanPosition.isPaning = false;
                                 previousMultiTouchPanPosition.isPaning = false;

+ 0 - 30
src/Cameras/babylon.arcRotateCamera.ts

@@ -96,36 +96,6 @@
             }
             }
         }
         }
 
 
-        public get angularTouchSensibilityX(): number {
-            var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
-            if (pointers)
-                return pointers.angularTouchSensibilityX;
-
-            return 0;
-        }
-
-        public set angularTouchSensibilityX(value: number) {
-            var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
-            if (pointers) {
-                pointers.angularTouchSensibilityX = value;
-            }
-        }
-
-        public get angularTouchSensibilityY(): number {
-            var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
-            if (pointers)
-                return pointers.angularTouchSensibilityY;
-
-            return 0;
-        }
-
-        public set angularTouchSensibilityY(value: number) {
-            var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
-            if (pointers) {
-                pointers.angularTouchSensibilityY = value;
-            }
-        }
-
         public get pinchPrecision(): number {
         public get pinchPrecision(): number {
             var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
             var pointers = <ArcRotateCameraPointersInput>this.inputs.attached["pointers"];
             if (pointers)
             if (pointers)