From 2479f4005a0ee6b1a9c553b7fb61775ca26ba751 Mon Sep 17 00:00:00 2001 From: Nils Berg Date: Tue, 20 May 2014 20:50:59 +0200 Subject: [PATCH 1/2] use the total length of zoomDelta, not just the y component, for multi-touch zooming this means the 'pinch' gesture can be oriented any way the user desires (in fact, pinching along the x axis is the more natural variant) and still yield the desired result --- src/visualization/interaction/OrbitControls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualization/interaction/OrbitControls.js b/src/visualization/interaction/OrbitControls.js index 81fb7c59..f6bb0138 100644 --- a/src/visualization/interaction/OrbitControls.js +++ b/src/visualization/interaction/OrbitControls.js @@ -280,7 +280,7 @@ ROS3D.OrbitControls = function(options) { zoomEnd.set((event.changedTouches[0].pageX - event.changedTouches[1].pageX)*(event.changedTouches[0].pageX - event.changedTouches[1].pageX), (event.changedTouches[0].pageY - event.changedTouches[1].pageY)*(event.changedTouches[0].pageY - event.changedTouches[1].pageY)); zoomDelta.subVectors(zoomEnd, zoomStart); - if (zoomDelta.y > 0) { + if (zoomDelta.y + zoomDelta.x > 0) { that.zoomOut(); } else { that.zoomIn(); From add941d24167a8bf8bef277928453f690f1fc34c Mon Sep 17 00:00:00 2001 From: Nils Berg Date: Tue, 20 May 2014 20:51:44 +0200 Subject: [PATCH 2/2] fix typo in description of onMouseMove() --- src/visualization/interaction/OrbitControls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualization/interaction/OrbitControls.js b/src/visualization/interaction/OrbitControls.js index f6bb0138..a353d96a 100644 --- a/src/visualization/interaction/OrbitControls.js +++ b/src/visualization/interaction/OrbitControls.js @@ -106,7 +106,7 @@ ROS3D.OrbitControls = function(options) { } /** - * Handle the movemove 3D event. + * Handle the mousemove 3D event. * * @param event3D - the 3D event to handle */