2
0
Эх сурвалжийг харах

Merge pull request #10072 from fredludlow/mousewheel-deltamode

Detect deltaMode - fixes IE11/FF49/Chrome54 on Win7, see #9526
Mr.doob 8 жил өмнө
parent
commit
bf5a2b9f86

+ 19 - 2
examples/js/controls/TrackballControls.js

@@ -218,7 +218,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 			if ( factor !== 1.0 && factor > 0.0 ) {
 			if ( factor !== 1.0 && factor > 0.0 ) {
 
 
 				_eye.multiplyScalar( factor );
 				_eye.multiplyScalar( factor );
-				
+
 			}
 			}
 
 
 			if ( _this.staticMoving ) {
 			if ( _this.staticMoving ) {
@@ -473,7 +473,24 @@ THREE.TrackballControls = function ( object, domElement ) {
 		event.preventDefault();
 		event.preventDefault();
 		event.stopPropagation();
 		event.stopPropagation();
 
 
-		_zoomStart.y -= event.deltaY * 0.01;
+		switch ( event.deltaMode ) {
+
+                        case 2:
+                                // Zoom in pages
+                                _zoomStart.y -= event.deltaY * 0.025;
+                                break;
+
+			case 1:
+                                // Zoom in lines
+				_zoomStart.y -= event.deltaY * 0.01;
+				break;
+
+			default:
+				// undefined, 0, assume pixels
+				_zoomStart.y -= event.deltaY * 0.00025;
+				break;
+
+		}
 
 
 		_this.dispatchEvent( startEvent );
 		_this.dispatchEvent( startEvent );
 		_this.dispatchEvent( endEvent );
 		_this.dispatchEvent( endEvent );