|
@@ -581,12 +581,6 @@ class OrbitControls extends EventDispatcher {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- function handleMouseUp( /*event*/ ) {
|
|
|
|
-
|
|
|
|
- // no-op
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
function handleMouseWheel( event ) {
|
|
function handleMouseWheel( event ) {
|
|
|
|
|
|
if ( event.deltaY < 0 ) {
|
|
if ( event.deltaY < 0 ) {
|
|
@@ -793,12 +787,6 @@ class OrbitControls extends EventDispatcher {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- function handleTouchEnd( /*event*/ ) {
|
|
|
|
-
|
|
|
|
- // no-op
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
//
|
|
//
|
|
// event handlers - FSM: listen for events and reset state
|
|
// event handlers - FSM: listen for events and reset state
|
|
//
|
|
//
|
|
@@ -850,30 +838,20 @@ class OrbitControls extends EventDispatcher {
|
|
|
|
|
|
function onPointerUp( event ) {
|
|
function onPointerUp( event ) {
|
|
|
|
|
|
- if ( scope.enabled === false ) return;
|
|
|
|
|
|
+ removePointer( event );
|
|
|
|
|
|
- if ( event.pointerType === 'touch' ) {
|
|
|
|
|
|
+ if ( pointers.length === 0 ) {
|
|
|
|
|
|
- onTouchEnd();
|
|
|
|
|
|
+ scope.domElement.releasePointerCapture( event.pointerId );
|
|
|
|
|
|
- } else {
|
|
|
|
-
|
|
|
|
- onMouseUp( event );
|
|
|
|
|
|
+ scope.domElement.removeEventListener( 'pointermove', onPointerMove );
|
|
|
|
+ scope.domElement.removeEventListener( 'pointerup', onPointerUp );
|
|
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- removePointer( event );
|
|
|
|
-
|
|
|
|
- //
|
|
|
|
-
|
|
|
|
- if ( pointers.length === 0 ) {
|
|
|
|
|
|
+ }
|
|
|
|
|
|
- scope.domElement.releasePointerCapture( event.pointerId );
|
|
|
|
|
|
+ scope.dispatchEvent( _endEvent );
|
|
|
|
|
|
- scope.domElement.removeEventListener( 'pointermove', onPointerMove );
|
|
|
|
- scope.domElement.removeEventListener( 'pointerup', onPointerUp );
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
|
|
+ state = STATE.NONE;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1014,16 +992,6 @@ class OrbitControls extends EventDispatcher {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- function onMouseUp( event ) {
|
|
|
|
-
|
|
|
|
- handleMouseUp( event );
|
|
|
|
-
|
|
|
|
- scope.dispatchEvent( _endEvent );
|
|
|
|
-
|
|
|
|
- state = STATE.NONE;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
function onMouseWheel( event ) {
|
|
function onMouseWheel( event ) {
|
|
|
|
|
|
if ( scope.enabled === false || scope.enableZoom === false || state !== STATE.NONE ) return;
|
|
if ( scope.enabled === false || scope.enableZoom === false || state !== STATE.NONE ) return;
|
|
@@ -1184,16 +1152,6 @@ class OrbitControls extends EventDispatcher {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- function onTouchEnd( event ) {
|
|
|
|
-
|
|
|
|
- handleTouchEnd( event );
|
|
|
|
-
|
|
|
|
- scope.dispatchEvent( _endEvent );
|
|
|
|
-
|
|
|
|
- state = STATE.NONE;
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
function onContextMenu( event ) {
|
|
function onContextMenu( event ) {
|
|
|
|
|
|
if ( scope.enabled === false ) return;
|
|
if ( scope.enabled === false ) return;
|