Skip to content
Snippets Groups Projects
Commit 7ffc2db7 authored by Alexander Rose's avatar Alexander Rose
Browse files

fix trackball controls dropping inputs

parent 03067ca6
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ import { ParamDefinition as PD } from '../../mol-util/param-definition'; ...@@ -17,7 +17,7 @@ import { ParamDefinition as PD } from '../../mol-util/param-definition';
export const TrackballControlsParams = { export const TrackballControlsParams = {
noScroll: PD.Boolean(true, { isHidden: true }), noScroll: PD.Boolean(true, { isHidden: true }),
rotateSpeed: PD.Numeric(5.0, { min: 0.1, max: 10, step: 0.1 }), rotateSpeed: PD.Numeric(3.0, { min: 0.1, max: 10, step: 0.1 }),
zoomSpeed: PD.Numeric(6.0, { min: 0.1, max: 10, step: 0.1 }), zoomSpeed: PD.Numeric(6.0, { min: 0.1, max: 10, step: 0.1 }),
panSpeed: PD.Numeric(0.8, { min: 0.1, max: 5, step: 0.1 }), panSpeed: PD.Numeric(0.8, { min: 0.1, max: 5, step: 0.1 }),
...@@ -217,9 +217,7 @@ namespace TrackballControls { ...@@ -217,9 +217,7 @@ namespace TrackballControls {
panCamera() panCamera()
Vec3.add(object.position, target, _eye) Vec3.add(object.position, target, _eye)
checkDistances() checkDistances()
cameraLookAt(object.position, object.up, object.direction, target) cameraLookAt(object.position, object.up, object.direction, target)
if (Vec3.squaredDistance(lastPosition, object.position) > EPSILON.Value) { if (Vec3.squaredDistance(lastPosition, object.position) > EPSILON.Value) {
...@@ -259,7 +257,6 @@ namespace TrackballControls { ...@@ -259,7 +257,6 @@ namespace TrackballControls {
} }
if (buttons === ButtonsType.Flag.Primary) { if (buttons === ButtonsType.Flag.Primary) {
Vec2.copy(_movePrev, _moveCurr)
Vec2.copy(_moveCurr, getMouseOnCircle(pageX, pageY)) Vec2.copy(_moveCurr, getMouseOnCircle(pageX, pageY))
} else if (buttons === ButtonsType.Flag.Auxilary) { } else if (buttons === ButtonsType.Flag.Auxilary) {
Vec2.copy(_zoomEnd, getMouseOnScreen(pageX, pageY)) Vec2.copy(_zoomEnd, getMouseOnScreen(pageX, pageY))
...@@ -273,12 +270,12 @@ namespace TrackballControls { ...@@ -273,12 +270,12 @@ namespace TrackballControls {
} }
function onWheel({ dy }: WheelInput) { function onWheel({ dy }: WheelInput) {
_zoomStart[1] -= dy * 0.0001 _zoomEnd[1] += dy * 0.0001
} }
function onPinch({ fraction }: PinchInput) { function onPinch({ fraction }: PinchInput) {
_isInteracting = true; _isInteracting = true;
_zoomStart[1] -= (fraction - 1) * 0.1 _zoomEnd[1] += (fraction - 1) * 0.1
} }
function dispose() { function dispose() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment