Browse Source

Fixed mousewheel zooming in TrackpadControls when staticMovig was set to true.
_zoomStart = _zoomEnd; <-- grrr

Mr.doob 13 years ago
parent
commit
da693b20e9
2 changed files with 175 additions and 174 deletions
  1. 164 164
      build/three.min.js
  2. 11 10
      src/extras/controls/TrackballControls.js

File diff suppressed because it is too large
+ 164 - 164
build/three.min.js


+ 11 - 10
src/extras/controls/TrackballControls.js

@@ -142,7 +142,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 			if ( _this.staticMoving ) {
 
-				_rotateStart = _rotateEnd;
+				_rotateStart.copy( _rotateEnd );
 
 			} else {
 
@@ -165,7 +165,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 			if ( _this.staticMoving ) {
 
-				_zoomStart = _zoomEnd;
+				_zoomStart.copy( _zoomEnd );
 
 			} else {
 
@@ -392,16 +392,17 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 		var delta = 0;
 
-		// WebKit / Opera / Explorer 9
-		if ( event.wheelDelta ) {
-			delta = event.wheelDelta/40;
-		// Firefox
-		} else if ( event.detail ) {
-			delta = -event.detail/3;
+		if ( event.wheelDelta ) { // WebKit / Opera / Explorer 9
+
+			delta = event.wheelDelta / 40;
+
+		} else if ( event.detail ) { // Firefox
+
+			delta = - event.detail / 3;
+
 		}
 
-		_zoomStart.y = delta*0.05;
-		_zoomEnd.y = 0;
+		_zoomStart.y += ( 1 / delta ) * 0.05;
 
 	}
 

Some files were not shown because too many files changed in this diff