Skip to content

OrbitControls: customizable touch binds #16803

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

Closed
wants to merge 1 commit into from
Closed

OrbitControls: customizable touch binds #16803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions docs/examples/en/controls/OrbitControls.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,18 @@ <h3>[property:Vector3 target]</h3>
the focus of the controls.
</p>

<h3>
[property:Object touches]</h3>
<p>
This object contains references to the number of touches used for the controls.
<code>
controls.touches = {
ROTATE: 1,
DOLLY_PAN: 2
}
</code>
</p>

<h3>[property:Float zoom0]</h3>
<p>
Used internally by the [method:saveState] and [method:reset] methods.
Expand Down
11 changes: 7 additions & 4 deletions examples/js/controls/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ THREE.OrbitControls = function ( object, domElement ) {
// Mouse buttons
this.mouseButtons = { LEFT: THREE.MOUSE.LEFT, MIDDLE: THREE.MOUSE.MIDDLE, RIGHT: THREE.MOUSE.RIGHT };

// Touch fingers
this.touches = { ROTATE: 1, DOLLY_PAN: 2 };

// for reset
this.target0 = this.target.clone();
this.position0 = this.object.position.clone();
Expand Down Expand Up @@ -833,7 +836,7 @@ THREE.OrbitControls = function ( object, domElement ) {

switch ( event.touches.length ) {

case 1: // one-fingered touch: rotate
case scope.touches.ROTATE:

if ( scope.enableRotate === false ) return;

Expand All @@ -843,7 +846,7 @@ THREE.OrbitControls = function ( object, domElement ) {

break;

case 2: // two-fingered touch: dolly-pan
case scope.touches.DOLLY_PAN:

if ( scope.enableZoom === false && scope.enablePan === false ) return;

Expand Down Expand Up @@ -876,7 +879,7 @@ THREE.OrbitControls = function ( object, domElement ) {

switch ( event.touches.length ) {

case 1: // one-fingered touch: rotate
case scope.touches.ROTATE:

if ( scope.enableRotate === false ) return;
if ( state !== STATE.TOUCH_ROTATE ) return; // is this needed?
Expand All @@ -885,7 +888,7 @@ THREE.OrbitControls = function ( object, domElement ) {

break;

case 2: // two-fingered touch: dolly-pan
case scope.touches.DOLLY_PAN:

if ( scope.enableZoom === false && scope.enablePan === false ) return;
if ( state !== STATE.TOUCH_DOLLY_PAN ) return; // is this needed?
Expand Down
1 change: 1 addition & 0 deletions examples/jsm/controls/OrbitControls.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export class OrbitControls {
enableKeys: boolean;
keys: { LEFT: number; UP: number; RIGHT: number; BOTTOM: number; };
mouseButtons: { LEFT: MOUSE; MIDDLE: MOUSE; RIGHT: MOUSE; };
touches: { ROTATE: number; DOLLY_PAN: number; };

rotateLeft(angle?: number): void;

Expand Down
11 changes: 7 additions & 4 deletions examples/jsm/controls/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ var OrbitControls = function ( object, domElement ) {
// Mouse buttons
this.mouseButtons = { LEFT: MOUSE.LEFT, MIDDLE: MOUSE.MIDDLE, RIGHT: MOUSE.RIGHT };

// Touch fingers
this.touches = { ROTATE: 1, DOLLY_PAN: 2 };

// for reset
this.target0 = this.target.clone();
this.position0 = this.object.position.clone();
Expand Down Expand Up @@ -842,7 +845,7 @@ var OrbitControls = function ( object, domElement ) {

switch ( event.touches.length ) {

case 1: // one-fingered touch: rotate
case scope.touches.ROTATE:

if ( scope.enableRotate === false ) return;

Expand All @@ -852,7 +855,7 @@ var OrbitControls = function ( object, domElement ) {

break;

case 2: // two-fingered touch: dolly-pan
case scope.touches.DOLLY_PAN:

if ( scope.enableZoom === false && scope.enablePan === false ) return;

Expand Down Expand Up @@ -885,7 +888,7 @@ var OrbitControls = function ( object, domElement ) {

switch ( event.touches.length ) {

case 1: // one-fingered touch: rotate
case scope.touches.ROTATE:

if ( scope.enableRotate === false ) return;
if ( state !== STATE.TOUCH_ROTATE ) return; // is this needed?
Expand All @@ -894,7 +897,7 @@ var OrbitControls = function ( object, domElement ) {

break;

case 2: // two-fingered touch: dolly-pan
case scope.touches.DOLLY_PAN:

if ( scope.enableZoom === false && scope.enablePan === false ) return;
if ( state !== STATE.TOUCH_DOLLY_PAN ) return; // is this needed?
Expand Down