Skip to content

Commit 369daf6

Browse files
committed
Merge branch 'dev' of github.com:yomotsu/camera-controls into dev
2 parents 74fa38c + 5328167 commit 369daf6

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/CameraControls.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,8 @@ export class CameraControls extends EventDispatcher {
765765

766766
// Ref: https://github.com/cedricpinson/osgjs/blob/00e5a7e9d9206c06fdde0436e1d62ab7cb5ce853/sources/osgViewer/input/source/InputSourceMouse.js#L89-L103
767767
const deltaYFactor = isMac ? - 1 : - 3;
768-
const delta = ( event.deltaMode === 1 ) ? event.deltaY / deltaYFactor : event.deltaY / ( deltaYFactor * 10 );
768+
// Checks event.ctrlKey to detect multi-touch gestures on a trackpad.
769+
const delta = ( event.deltaMode === 1 || event.ctrlKey ) ? event.deltaY / deltaYFactor : event.deltaY / ( deltaYFactor * 10 );
769770
const x = this.dollyToCursor ? ( event.clientX - this._elementRect.x ) / this._elementRect.width * 2 - 1 : 0;
770771
const y = this.dollyToCursor ? ( event.clientY - this._elementRect.y ) / this._elementRect.height * - 2 + 1 : 0;
771772

0 commit comments

Comments
 (0)