Merge pull request #135 from daniel86/develop

Fixed mouse ray for touch events
RobotWebTools · Jan 18, 2016 · b88d798 · b88d798
2 parents b5d9a3e + 3e8f0be
commit b88d798
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/visualization/interaction/MouseHandler.js b/src/visualization/interaction/MouseHandler.js
@@ -51,8 +51,14 @@ ROS3D.MouseHandler.prototype.processDomEvent = function(domEvent) {
   var pos_x, pos_y;
 
   if(domEvent.type.indexOf('touch') !== -1) {
-	pos_x = domEvent.changedTouches[0].clientX;
-	pos_y = domEvent.changedTouches[0].clientY;
+    pos_x = 0;
+    pos_y = 0;
+    for(var i=0; i<domEvent.touches.length; ++i) {
+        pos_x += domEvent.touches[i].clientX;
+        pos_y += domEvent.touches[i].clientY;
+    }
+    pos_x /= domEvent.touches.length;
+    pos_y /= domEvent.touches.length;
   }
   else {
 	pos_x = domEvent.clientX;

diff --git a/src/visualization/interaction/OrbitControls.js b/src/visualization/interaction/OrbitControls.js
@@ -340,6 +340,9 @@ ROS3D.OrbitControls = function(options) {
       rotateStart.set(event.touches[0].pageX - window.scrollX,
                       event.touches[0].pageY - window.scrollY);
     }
+    else {
+        state = STATE.NONE;
+    }
   }
 
   // add event listeners