super-three 0.141.0 → 0.147.0

package/examples/js/controls/PointerLockControls.js

@@ -1,9 +1,7 @@
 ( function () {
 
 	const _euler = new THREE.Euler( 0, 0, 0, 'YXZ' );
-
 	const _vector = new THREE.Vector3();
-
 	const _changeEvent = {
 		type: 'change'
 	};
@@ -13,41 +11,28 @@
 	const _unlockEvent = {
 		type: 'unlock'
 	};
-
 	const _PI_2 = Math.PI / 2;
-
 	class PointerLockControls extends THREE.EventDispatcher {
 
 		constructor( camera, domElement ) {
 
 			super();
-
-			if ( domElement === undefined ) {
-
-				console.warn( 'THREE.PointerLockControls: The second parameter "domElement" is now mandatory.' );
-				domElement = document.body;
-
-			}
-
 			this.domElement = domElement;
-			this.isLocked = false; // Set to constrain the pitch of the camera
-			// Range is 0 to Math.PI radians
+			this.isLocked = false;
 
+			// Set to constrain the pitch of the camera
+			// Range is 0 to Math.PI radians
 			this.minPolarAngle = 0; // radians
-
 			this.maxPolarAngle = Math.PI; // radians
 
 			this.pointerSpeed = 1.0;
 			const scope = this;
-
 			function onMouseMove( event ) {
 
 				if ( scope.isLocked === false ) return;
 				const movementX = event.movementX || event.mozMovementX || event.webkitMovementX || 0;
 				const movementY = event.movementY || event.mozMovementY || event.webkitMovementY || 0;
-
 				_euler.setFromQuaternion( camera.quaternion );
-
 				_euler.y -= movementX * 0.002 * scope.pointerSpeed;
 				_euler.x -= movementY * 0.002 * scope.pointerSpeed;
 				_euler.x = Math.max( _PI_2 - scope.maxPolarAngle, Math.min( _PI_2 - scope.minPolarAngle, _euler.x ) );
@@ -103,6 +88,7 @@
 			this.getObject = function () {
 
 				// retaining this method for backward compatibility
+
 				return camera;
 
 			};
@@ -117,15 +103,13 @@
 				};
 
 			}();
-
 			this.moveForward = function ( distance ) {
 
 				// move forward parallel to the xz-plane
 				// assumes camera.up is y-up
-				_vector.setFromMatrixColumn( camera.matrix, 0 );
 
+				_vector.setFromMatrixColumn( camera.matrix, 0 );
 				_vector.crossVectors( camera.up, _vector );
-
 				camera.position.addScaledVector( _vector, distance );
 
 			};
@@ -133,7 +117,6 @@
 			this.moveRight = function ( distance ) {
 
 				_vector.setFromMatrixColumn( camera.matrix, 0 );
-
 				camera.position.addScaledVector( _vector, distance );
 
 			};

package/examples/js/controls/TrackballControls.js

@@ -9,14 +9,11 @@
 	const _endEvent = {
 		type: 'end'
 	};
-
 	class TrackballControls extends THREE.EventDispatcher {
 
 		constructor( object, domElement ) {
 
 			super();
-			if ( domElement === undefined ) console.warn( 'THREE.TrackballControls: The second parameter "domElement" is now mandatory.' );
-			if ( domElement === document ) console.error( 'THREE.TrackballControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' );
 			const scope = this;
 			const STATE = {
 				NONE: - 1,
@@ -29,6 +26,7 @@
 			this.object = object;
 			this.domElement = domElement;
 			this.domElement.style.touchAction = 'none'; // disable touch scroll
+
 			// API
 
 			this.enabled = true;
@@ -48,18 +46,15 @@
 			this.dynamicDampingFactor = 0.2;
 			this.minDistance = 0;
 			this.maxDistance = Infinity;
-			this.keys = [ 'KeyA',
-				/*A*/
-				'KeyS',
-				/*S*/
-				'KeyD'
-				/*D*/
-			];
+			this.keys = [ 'KeyA' /*A*/, 'KeyS' /*S*/, 'KeyD' /*D*/];
+
 			this.mouseButtons = {
 				LEFT: THREE.MOUSE.ROTATE,
 				MIDDLE: THREE.MOUSE.DOLLY,
 				RIGHT: THREE.MOUSE.PAN
-			}; // internals
+			};
+
+			// internals
 
 			this.target = new THREE.Vector3();
 			const EPS = 0.000001;
@@ -70,7 +65,6 @@
 				_touchZoomDistanceStart = 0,
 				_touchZoomDistanceEnd = 0,
 				_lastAngle = 0;
-
 			const _eye = new THREE.Vector3(),
 				_movePrev = new THREE.Vector2(),
 				_moveCurr = new THREE.Vector2(),
@@ -80,18 +74,21 @@
 				_panStart = new THREE.Vector2(),
 				_panEnd = new THREE.Vector2(),
 				_pointers = [],
-				_pointerPositions = {}; // for reset
+				_pointerPositions = {};
 
+			// for reset
 
 			this.target0 = this.target.clone();
 			this.position0 = this.object.position.clone();
 			this.up0 = this.object.up.clone();
-			this.zoom0 = this.object.zoom; // methods
+			this.zoom0 = this.object.zoom;
 
-			this.handleResize = function () {
+			// methods
 
-				const box = scope.domElement.getBoundingClientRect(); // adjustments come from similar code in the jquery offset() function
+			this.handleResize = function () {
 
+				const box = scope.domElement.getBoundingClientRect();
+				// adjustments come from similar code in the jquery offset() function
 				const d = scope.domElement.ownerDocument.documentElement;
 				scope.screen.left = box.left + window.pageXOffset - d.clientLeft;
 				scope.screen.top = box.top + window.pageYOffset - d.clientTop;
@@ -111,7 +108,6 @@
 				};
 
 			}();
-
 			const getMouseOnCircle = function () {
 
 				const vector = new THREE.Vector2();
@@ -119,12 +115,12 @@
 
 					vector.set( ( pageX - scope.screen.width * 0.5 - scope.screen.left ) / ( scope.screen.width * 0.5 ), ( scope.screen.height + 2 * ( scope.screen.top - pageY ) ) / scope.screen.width // screen.width intentional
 					);
+
 					return vector;
 
 				};
 
 			}();
-
 			this.rotateCamera = function () {
 
 				const axis = new THREE.Vector3(),
@@ -137,11 +133,9 @@
 
 					moveDirection.set( _moveCurr.x - _movePrev.x, _moveCurr.y - _movePrev.y, 0 );
 					let angle = moveDirection.length();
-
 					if ( angle ) {
 
 						_eye.copy( scope.object.position ).sub( scope.target );
-
 						eyeDirection.copy( _eye ).normalize();
 						objectUpDirection.copy( scope.object.up ).normalize();
 						objectSidewaysDirection.crossVectors( objectUpDirection, eyeDirection ).normalize();
@@ -151,25 +145,17 @@
 						axis.crossVectors( moveDirection, _eye ).normalize();
 						angle *= scope.rotateSpeed;
 						quaternion.setFromAxisAngle( axis, angle );
-
 						_eye.applyQuaternion( quaternion );
-
 						scope.object.up.applyQuaternion( quaternion );
-
 						_lastAxis.copy( axis );
-
 						_lastAngle = angle;
 
 					} else if ( ! scope.staticMoving && _lastAngle ) {
 
 						_lastAngle *= Math.sqrt( 1.0 - scope.dynamicDampingFactor );
-
 						_eye.copy( scope.object.position ).sub( scope.target );
-
 						quaternion.setFromAxisAngle( _lastAxis, _lastAngle );
-
 						_eye.applyQuaternion( quaternion );
-
 						scope.object.up.applyQuaternion( quaternion );
 
 					}
@@ -179,16 +165,13 @@
 				};
 
 			}();
-
 			this.zoomCamera = function () {
 
 				let factor;
-
 				if ( _state === STATE.TOUCH_ZOOM_PAN ) {
 
 					factor = _touchZoomDistanceStart / _touchZoomDistanceEnd;
 					_touchZoomDistanceStart = _touchZoomDistanceEnd;
-
 					if ( scope.object.isPerspectiveCamera ) {
 
 						_eye.multiplyScalar( factor );
@@ -207,7 +190,6 @@
 				} else {
 
 					factor = 1.0 + ( _zoomEnd.y - _zoomStart.y ) * scope.zoomSpeed;
-
 					if ( factor !== 1.0 && factor > 0.0 ) {
 
 						if ( scope.object.isPerspectiveCamera ) {
@@ -249,7 +231,6 @@
 				return function panCamera() {
 
 					mouseChange.copy( _panEnd ).sub( _panStart );
-
 					if ( mouseChange.lengthSq() ) {
 
 						if ( scope.object.isOrthographicCamera ) {
@@ -266,7 +247,6 @@
 						pan.add( objectUp.copy( scope.object.up ).setLength( mouseChange.y ) );
 						scope.object.position.add( pan );
 						scope.target.add( pan );
-
 						if ( scope.staticMoving ) {
 
 							_panStart.copy( _panEnd );
@@ -282,7 +262,6 @@
 				};
 
 			}();
-
 			this.checkDistances = function () {
 
 				if ( ! scope.noZoom || ! scope.noPan ) {
@@ -290,7 +269,6 @@
 					if ( _eye.lengthSq() > scope.maxDistance * scope.maxDistance ) {
 
 						scope.object.position.addVectors( scope.target, _eye.setLength( scope.maxDistance ) );
-
 						_zoomStart.copy( _zoomEnd );
 
 					}
@@ -298,7 +276,6 @@
 					if ( _eye.lengthSq() < scope.minDistance * scope.minDistance ) {
 
 						scope.object.position.addVectors( scope.target, _eye.setLength( scope.minDistance ) );
-
 						_zoomStart.copy( _zoomEnd );
 
 					}
@@ -310,7 +287,6 @@
 			this.update = function () {
 
 				_eye.subVectors( scope.object.position, scope.target );
-
 				if ( ! scope.noRotate ) {
 
 					scope.rotateCamera();
@@ -330,12 +306,10 @@
 				}
 
 				scope.object.position.addVectors( scope.target, _eye );
-
 				if ( scope.object.isPerspectiveCamera ) {
 
 					scope.checkDistances();
 					scope.object.lookAt( scope.target );
-
 					if ( lastPosition.distanceToSquared( scope.object.position ) > EPS ) {
 
 						scope.dispatchEvent( _changeEvent );
@@ -346,7 +320,6 @@
 				} else if ( scope.object.isOrthographicCamera ) {
 
 					scope.object.lookAt( scope.target );
-
 					if ( lastPosition.distanceToSquared( scope.object.position ) > EPS || lastZoom !== scope.object.zoom ) {
 
 						scope.dispatchEvent( _changeEvent );
@@ -372,32 +345,30 @@
 				scope.object.up.copy( scope.up0 );
 				scope.object.zoom = scope.zoom0;
 				scope.object.updateProjectionMatrix();
-
 				_eye.subVectors( scope.object.position, scope.target );
-
 				scope.object.lookAt( scope.target );
 				scope.dispatchEvent( _changeEvent );
 				lastPosition.copy( scope.object.position );
 				lastZoom = scope.object.zoom;
 
-			}; // listeners
+			};
 
+			// listeners
 
 			function onPointerDown( event ) {
 
 				if ( scope.enabled === false ) return;
-
 				if ( _pointers.length === 0 ) {
 
 					scope.domElement.setPointerCapture( event.pointerId );
 					scope.domElement.addEventListener( 'pointermove', onPointerMove );
 					scope.domElement.addEventListener( 'pointerup', onPointerUp );
 
-				} //
+				}
 
+				//
 
 				addPointer( event );
-
 				if ( event.pointerType === 'touch' ) {
 
 					onTouchStart( event );
@@ -413,7 +384,6 @@
 			function onPointerMove( event ) {
 
 				if ( scope.enabled === false ) return;
-
 				if ( event.pointerType === 'touch' ) {
 
 					onTouchMove( event );
@@ -429,7 +399,6 @@
 			function onPointerUp( event ) {
 
 				if ( scope.enabled === false ) return;
-
 				if ( event.pointerType === 'touch' ) {
 
 					onTouchEnd( event );
@@ -438,11 +407,11 @@
 
 					onMouseUp();
 
-				} //
+				}
 
+				//
 
 				removePointer( event );
-
 				if ( _pointers.length === 0 ) {
 
 					scope.domElement.releasePointerCapture( event.pointerId );
@@ -463,7 +432,6 @@
 
 				if ( scope.enabled === false ) return;
 				window.removeEventListener( 'keydown', keydown );
-
 				if ( _keyState !== STATE.NONE ) {
 
 					return;
@@ -501,11 +469,9 @@
 						case scope.mouseButtons.LEFT:
 							_state = STATE.ROTATE;
 							break;
-
 						case scope.mouseButtons.MIDDLE:
 							_state = STATE.ZOOM;
 							break;
-
 						case scope.mouseButtons.RIGHT:
 							_state = STATE.PAN;
 							break;
@@ -515,23 +481,19 @@
 				}
 
 				const state = _keyState !== STATE.NONE ? _keyState : _state;
-
 				if ( state === STATE.ROTATE && ! scope.noRotate ) {
 
 					_moveCurr.copy( getMouseOnCircle( event.pageX, event.pageY ) );
-
 					_movePrev.copy( _moveCurr );
 
 				} else if ( state === STATE.ZOOM && ! scope.noZoom ) {
 
 					_zoomStart.copy( getMouseOnScreen( event.pageX, event.pageY ) );
-
 					_zoomEnd.copy( _zoomStart );
 
 				} else if ( state === STATE.PAN && ! scope.noPan ) {
 
 					_panStart.copy( getMouseOnScreen( event.pageX, event.pageY ) );
-
 					_panEnd.copy( _panStart );
 
 				}
@@ -543,11 +505,9 @@
 			function onMouseMove( event ) {
 
 				const state = _keyState !== STATE.NONE ? _keyState : _state;
-
 				if ( state === STATE.ROTATE && ! scope.noRotate ) {
 
 					_movePrev.copy( _moveCurr );
-
 					_moveCurr.copy( getMouseOnCircle( event.pageX, event.pageY ) );
 
 				} else if ( state === STATE.ZOOM && ! scope.noZoom ) {
@@ -574,19 +534,16 @@
 				if ( scope.enabled === false ) return;
 				if ( scope.noZoom === true ) return;
 				event.preventDefault();
-
 				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;
@@ -602,18 +559,13 @@
 			function onTouchStart( event ) {
 
 				trackPointer( event );
-
 				switch ( _pointers.length ) {
 
 					case 1:
 						_state = STATE.TOUCH_ROTATE;
-
 						_moveCurr.copy( getMouseOnCircle( _pointers[ 0 ].pageX, _pointers[ 0 ].pageY ) );
-
 						_movePrev.copy( _moveCurr );
-
 						break;
-
 					default:
 						// 2 or more
 						_state = STATE.TOUCH_ZOOM_PAN;
@@ -622,11 +574,8 @@
 						_touchZoomDistanceEnd = _touchZoomDistanceStart = Math.sqrt( dx * dx + dy * dy );
 						const x = ( _pointers[ 0 ].pageX + _pointers[ 1 ].pageX ) / 2;
 						const y = ( _pointers[ 0 ].pageY + _pointers[ 1 ].pageY ) / 2;
-
 						_panStart.copy( getMouseOnScreen( x, y ) );
-
 						_panEnd.copy( _panStart );
-
 						break;
 
 				}
@@ -638,27 +587,22 @@
 			function onTouchMove( event ) {
 
 				trackPointer( event );
-
 				switch ( _pointers.length ) {
 
 					case 1:
 						_movePrev.copy( _moveCurr );
-
 						_moveCurr.copy( getMouseOnCircle( event.pageX, event.pageY ) );
-
 						break;
-
 					default:
 						// 2 or more
+
 						const position = getSecondPointerPosition( event );
 						const dx = event.pageX - position.x;
 						const dy = event.pageY - position.y;
 						_touchZoomDistanceEnd = Math.sqrt( dx * dx + dy * dy );
 						const x = ( event.pageX + position.x ) / 2;
 						const y = ( event.pageY + position.y ) / 2;
-
 						_panEnd.copy( getMouseOnScreen( x, y ) );
-
 						break;
 
 				}
@@ -672,22 +616,25 @@
 					case 0:
 						_state = STATE.NONE;
 						break;
-
 					case 1:
 						_state = STATE.TOUCH_ROTATE;
-
 						_moveCurr.copy( getMouseOnCircle( event.pageX, event.pageY ) );
-
 						_movePrev.copy( _moveCurr );
-
 						break;
-
 					case 2:
 						_state = STATE.TOUCH_ZOOM_PAN;
+						for ( let i = 0; i < _pointers.length; i ++ ) {
 
-						_moveCurr.copy( getMouseOnCircle( event.pageX - _movePrev.x, event.pageY - _movePrev.y ) );
+							if ( _pointers[ i ].pointerId !== event.pointerId ) {
 
-						_movePrev.copy( _moveCurr );
+								const position = _pointerPositions[ _pointers[ i ].pointerId ];
+								_moveCurr.copy( getMouseOnCircle( position.x, position.y ) );
+								_movePrev.copy( _moveCurr );
+								break;
+
+							}
+
+						}
 
 						break;
 
@@ -713,13 +660,11 @@
 			function removePointer( event ) {
 
 				delete _pointerPositions[ event.pointerId ];
-
 				for ( let i = 0; i < _pointers.length; i ++ ) {
 
 					if ( _pointers[ i ].pointerId == event.pointerId ) {
 
 						_pointers.splice( i, 1 );
-
 						return;
 
 					}
@@ -731,7 +676,6 @@
 			function trackPointer( event ) {
 
 				let position = _pointerPositions[ event.pointerId ];
-
 				if ( position === undefined ) {
 
 					position = new THREE.Vector2();
@@ -771,8 +715,9 @@
 			} );
 			window.addEventListener( 'keydown', keydown );
 			window.addEventListener( 'keyup', keyup );
-			this.handleResize(); // force an update at start
+			this.handleResize();
 
+			// force an update at start
 			this.update();
 
 		}