Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EnvironmentControls remove pinchState #536

Merged
merged 3 commits into from
Apr 28, 2024
Merged

EnvironmentControls remove pinchState #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1971dc0
Remove some pinch state
gkjohnson Apr 28, 2024
8fcd687
Remove use of pinchState
gkjohnson Apr 28, 2024
1fff6d8
More simplification
gkjohnson Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 42 additions & 57 deletions src/three/controls/EnvironmentControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export class EnvironmentControls extends EventDispatcher {
// settings
this._enabled = true;
this.state = NONE;
this.pinchState = NONE;
this.cameraRadius = 5;
this.rotationSpeed = 1;
this.minAltitude = 0;
Expand Down Expand Up @@ -196,7 +195,7 @@ export class EnvironmentControls extends EventDispatcher {

// handle cases where we need to capture the pointer or
// reset state when we have too many pointers
if ( pointerTracker.getPointerType() === 'touch' ) {
if ( pointerTracker.isPointerTouch() ) {

pivotMesh.visible = false;

Expand Down Expand Up @@ -230,9 +229,9 @@ export class EnvironmentControls extends EventDispatcher {
pointerTracker.isLeftClicked() && shiftClicked
) {

this.setState( ROTATE );
this.pivotPoint.copy( hit.point );
this.setState( pointerTracker.isPointerTouch() ? WAITING : ROTATE );

this.pivotPoint.copy( hit.point );
this.pivotMesh.position.copy( hit.point );
this.pivotMesh.updateMatrixWorld();
this.scene.add( this.pivotMesh );
Expand Down Expand Up @@ -275,72 +274,62 @@ export class EnvironmentControls extends EventDispatcher {

}

if ( pointerTracker.getPointerType() === 'touch' ) {

if ( pointerTracker.getPointerCount() === 2 ) {
if ( pointerTracker.isPointerTouch() && pointerTracker.getPointerCount() === 2 ) {

if ( this.state === DRAG ) {
// We queue this event to ensure that all pointers have been updated
if ( ! _pointerMoveQueued ) {

this.setState( NONE, WAITING, false );

}
_pointerMoveQueued = true;
queueMicrotask( () => {

// We queue this event to ensure that all pointers have been updated
if ( ! _pointerMoveQueued ) {
_pointerMoveQueued = false;

_pointerMoveQueued = true;
queueMicrotask( () => {
// adjust the pointer position to be the center point
pointerTracker.getCenterPoint( _centerPoint );

_pointerMoveQueued = false;
// detect zoom transition
const startDist = pointerTracker.getStartPointerDistance();
const pointerDist = pointerTracker.getPointerDistance();
const separateDelta = pointerDist - startDist;
if ( this.state === NONE || this.state === WAITING ) {

// adjust the pointer position to be the center point
// check which direction was moved in first - if the pointers are pinching then
// it's a zoom. But if they move in parallel it's a rotation
pointerTracker.getCenterPoint( _centerPoint );
pointerTracker.getStartCenterPoint( _startCenterPoint );

// detect zoom transition
const startDist = pointerTracker.getStartPointerDistance();
const pointerDist = pointerTracker.getPointerDistance();
const separateDelta = pointerDist - startDist;
if ( this.pinchState === NONE || this.pinchState === WAITING ) {
// adjust the drag requirement by the dpr
const dpr = window.devicePixelRatio;
const parallelDelta = _centerPoint.distanceTo( _startCenterPoint );
if ( Math.abs( separateDelta ) > dpr || parallelDelta > dpr ) {

// check which direction was moved in first - if the pointers are pinching then
// it's a zoom. But if they move in parallel it's a rotation
pointerTracker.getCenterPoint( _centerPoint );
pointerTracker.getStartCenterPoint( _startCenterPoint );
if ( Math.abs( separateDelta ) > parallelDelta ) {

// adjust the drag requirement by the dpr
const dpr = window.devicePixelRatio;
const parallelDelta = _centerPoint.distanceTo( _startCenterPoint );
if ( Math.abs( separateDelta ) > dpr || parallelDelta > dpr ) {
this.setState( ZOOM );
this.zoomDirectionSet = false;

if ( Math.abs( separateDelta ) > parallelDelta ) {
} else {

this.setState( NONE, ZOOM );
this.zoomDirectionSet = false;

} else {

this.setState( NONE, ROTATE );

}
this.setState( ROTATE );

}

}

if ( this.pinchState === ZOOM ) {
}

const previousDist = pointerTracker.getPreviousPointerDistance();
this.zoomDelta += pointerDist - previousDist;
if ( this.state === ZOOM ) {

} else if ( this.pinchState === ROTATE ) {
const previousDist = pointerTracker.getPreviousPointerDistance();
this.zoomDelta += pointerDist - previousDist;

this.pivotMesh.visible = true;
} else if ( this.state === ROTATE ) {

}
this.pivotMesh.visible = true;

} );
}

}
} );

}

Expand Down Expand Up @@ -464,36 +453,34 @@ export class EnvironmentControls extends EventDispatcher {

resetState() {

if ( this.state !== NONE || this.pinchState !== NONE ) {
if ( this.state !== NONE ) {

this.dispatchEvent( _endEvent );

}

this.state = NONE;
this.pinchState = NONE;
this.scene.remove( this.pivotMesh );
this.pivotMesh.visible = true;
this.actionHeightOffset = 0;

}

setState( state = this.state, pinchState = this.pinchState, fireEvent = true ) {
setState( state = this.state, fireEvent = true ) {

if ( this.state === state && this.pinchState === pinchState ) {
if ( this.state === state ) {

return;

}

if ( this.state === NONE && this.pinchState === NONE && fireEvent ) {
if ( this.state === NONE && fireEvent ) {

this.dispatchEvent( _startEvent );

}

this.state = state;
this.pinchState = pinchState;

}

Expand All @@ -511,14 +498,13 @@ export class EnvironmentControls extends EventDispatcher {
pivotPoint,
up,
state,
pinchState,
adjustHeight,
} = this;

// update the actions
if ( this.needsUpdate ) {

const action = state || pinchState;
const action = state;
const zoomDelta = this.zoomDelta;
if ( action === DRAG ) {

Expand Down Expand Up @@ -899,7 +885,6 @@ export class EnvironmentControls extends EventDispatcher {
up,
camera,
state,
pinchState,
zoomPoint,
zoomDirection,
zoomDirectionSet,
Expand All @@ -914,7 +899,7 @@ export class EnvironmentControls extends EventDispatcher {
_quaternion.setFromUnitVectors( up, newUp );

// If we're zooming then reorient around the zoom point
const action = state || pinchState;
const action = state;
if ( zoomDirectionSet && ( zoomPointSet || this._updateZoomPoint() ) ) {

if ( reorientOnZoom ) {
Expand Down
6 changes: 6 additions & 0 deletions src/three/controls/PointerTracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,12 @@ export class PointerTracker {

}

isPointerTouch() {

return this.getPointerType() === 'touch';

}

getPointerButtons() {

return this.buttons;
Expand Down
Loading