Skip to content

Commit fcaaaab

Browse files
authored
OrbitControls: Add "sticky controls patch" back. (#22862)
1 parent f72449c commit fcaaaab

File tree

1 file changed

+8
-50
lines changed

1 file changed

+8
-50
lines changed

examples/jsm/controls/OrbitControls.js

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -581,12 +581,6 @@ class OrbitControls extends EventDispatcher {
581581

582582
}
583583

584-
function handleMouseUp( /*event*/ ) {
585-
586-
// no-op
587-
588-
}
589-
590584
function handleMouseWheel( event ) {
591585

592586
if ( event.deltaY < 0 ) {
@@ -793,12 +787,6 @@ class OrbitControls extends EventDispatcher {
793787

794788
}
795789

796-
function handleTouchEnd( /*event*/ ) {
797-
798-
// no-op
799-
800-
}
801-
802790
//
803791
// event handlers - FSM: listen for events and reset state
804792
//
@@ -850,30 +838,20 @@ class OrbitControls extends EventDispatcher {
850838

851839
function onPointerUp( event ) {
852840

853-
if ( scope.enabled === false ) return;
841+
removePointer( event );
854842

855-
if ( event.pointerType === 'touch' ) {
843+
if ( pointers.length === 0 ) {
856844

857-
onTouchEnd();
845+
scope.domElement.releasePointerCapture( event.pointerId );
858846

859-
} else {
860-
861-
onMouseUp( event );
847+
scope.domElement.removeEventListener( 'pointermove', onPointerMove );
848+
scope.domElement.removeEventListener( 'pointerup', onPointerUp );
862849

863-
}
864-
865-
removePointer( event );
866-
867-
//
868-
869-
if ( pointers.length === 0 ) {
850+
}
870851

871-
scope.domElement.releasePointerCapture( event.pointerId );
852+
scope.dispatchEvent( _endEvent );
872853

873-
scope.domElement.removeEventListener( 'pointermove', onPointerMove );
874-
scope.domElement.removeEventListener( 'pointerup', onPointerUp );
875-
876-
}
854+
state = STATE.NONE;
877855

878856
}
879857

@@ -1014,16 +992,6 @@ class OrbitControls extends EventDispatcher {
1014992

1015993
}
1016994

1017-
function onMouseUp( event ) {
1018-
1019-
handleMouseUp( event );
1020-
1021-
scope.dispatchEvent( _endEvent );
1022-
1023-
state = STATE.NONE;
1024-
1025-
}
1026-
1027995
function onMouseWheel( event ) {
1028996

1029997
if ( scope.enabled === false || scope.enableZoom === false || state !== STATE.NONE ) return;
@@ -1184,16 +1152,6 @@ class OrbitControls extends EventDispatcher {
11841152

11851153
}
11861154

1187-
function onTouchEnd( event ) {
1188-
1189-
handleTouchEnd( event );
1190-
1191-
scope.dispatchEvent( _endEvent );
1192-
1193-
state = STATE.NONE;
1194-
1195-
}
1196-
11971155
function onContextMenu( event ) {
11981156

11991157
if ( scope.enabled === false ) return;

0 commit comments

Comments
 (0)