Selaa lähdekoodia

Finsihed pinchDeltaPercentage

David Catuhe 7 vuotta sitten
vanhempi
commit
61d3927fa8

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12937 - 12937
dist/preview release/babylon.d.ts


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12937 - 12937
dist/preview release/babylon.module.d.ts


+ 2 - 1
sandbox/index.js

@@ -94,7 +94,8 @@ if (BABYLON.Engine.isSupported()) {
             currentScene.activeCamera.pinchPrecision = 200 / currentScene.activeCamera.radius;
             currentScene.activeCamera.upperRadiusLimit = 5 * currentScene.activeCamera.radius;
 
-            currentScene.activeCamera.wheelPrecisionPercentage = 0.01;
+            currentScene.activeCamera.wheelDeltaPercentage = 0.01;
+            currentScene.activeCamera.pinchDeltaPercentage = 0.01;
         }
 
         currentScene.activeCamera.attachControl(canvas); 

+ 2 - 2
src/Cameras/Inputs/babylon.arcRotateCameraPointersInput.ts

@@ -179,7 +179,7 @@ module BABYLON {
 
                         if (this.multiTouchPanAndZoom) {
                             if (this.pinchDeltaPercentage) {
-                                this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) * this.camera.radius * this.pinchDeltaPercentage; 
+                                this.camera.inertialRadiusOffset += ((pinchSquaredDistance - previousPinchSquaredDistance) * 0.001)* this.camera.radius * this.pinchDeltaPercentage; 
                             } else {
                                 this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                 (this.pinchPrecision *
@@ -205,7 +205,7 @@ module BABYLON {
 
                             if (previousMultiTouchPanPosition.isPinching || (twoFingerActivityCount < 20 && Math.abs(pinchDistance - initialDistance) > this.camera.pinchToPanMaxDistance)) {                   
                                 if (this.pinchDeltaPercentage) {
-                                    this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) * this.camera.radius * this.pinchDeltaPercentage;
+                                    this.camera.inertialRadiusOffset += ((pinchSquaredDistance - previousPinchSquaredDistance) * 0.001) * this.camera.radius * this.pinchDeltaPercentage;
                                 } else {
                                     this.camera.inertialRadiusOffset += (pinchSquaredDistance - previousPinchSquaredDistance) /
                                     (this.pinchPrecision *

+ 4 - 4
src/Cameras/babylon.arcRotateCamera.ts

@@ -194,16 +194,16 @@ module BABYLON {
                 mousewheel.wheelPrecision = value;
         }
 
-        public get wheelPrecisionPercentage(): number {
+        public get wheelDeltaPercentage(): number {
             var mousewheel = <ArcRotateCameraMouseWheelInput>this.inputs.attached["mousewheel"];
             if (mousewheel)
-                return mousewheel.wheelPrecisionPercentage;
+                return mousewheel.wheelDeltaPercentage;
         }
 
-        public set wheelPrecisionPercentage(value: number) {
+        public set wheelDeltaPercentage(value: number) {
             var mousewheel = <ArcRotateCameraMouseWheelInput>this.inputs.attached["mousewheel"];
             if (mousewheel)
-                mousewheel.wheelPrecisionPercentage = value;
+                mousewheel.wheelDeltaPercentage = value;
         }        
 
         //-- end properties for backward compatibility for inputs

+ 5 - 1
src/Loading/babylon.sceneLoader.ts

@@ -185,7 +185,11 @@
             }
             // Loading file from disk via input file or drag'n'drop
             else {
-                if (FilesInput.FilesToLoad[sceneFilename]) {
+                var fileOrString = <any> sceneFilename;
+
+                if (fileOrString.name) { // File
+                    Tools.ReadFile(fileOrString, dataCallback, onProgress, useArrayBuffer);
+                } else if (FilesInput.FilesToLoad[sceneFilename]) {
                     Tools.ReadFile(FilesInput.FilesToLoad[sceneFilename], dataCallback, onProgress, useArrayBuffer);
                 } else {
                     onError("Unable to find file named " + sceneFilename);