@openglobus/og 0.11.6 → 0.12.1

package/src/og/renderer/RendererEvents.js

@@ -84,10 +84,14 @@ class RendererEvents extends Events {
                     ms.moving ||
                     ms.justStopped
                 );
-            },
-            /** Current mouse X position. */
+            },
+            /** Current screen mouse X position. */
+            clientX: 0,
+            /** Current screen mouse Y position. */
+            clientY: 0,
+            /** Current viewport mouse X position. */
             x: 0,
-            /** Current mouse Y position. */
+            /** Current viewport mouse Y position. */
             y: 0,
             /** Current mouse X position from 0 to 1 */
             nx: 0,
@@ -357,16 +361,20 @@ class RendererEvents extends Events {
             this._mClkBegins = 0;
         }
 
-        if (ms.x === event.clientX && ms.y === event.clientY) {
+        if (ms.clientX === event.clientX && ms.clientY === event.clientY) {
             return;
-        }
+        }
 
-        ms.x = event.clientX;
-        ms.y = event.clientY;
+        ms.clientX = event.clientX;
+        ms.clientY = event.clientY;
+
+        let h = this.renderer.handler;
+
+        ms.x = event.clientX * h.pixelRatio;
+        ms.y = event.clientY * h.pixelRatio;
 
-        var cnv = this.renderer.handler.canvas;
-        ms.nx = ms.x / cnv.width;
-        ms.ny = ms.y / cnv.height;
+        ms.nx = ms.x / h.canvas.width;
+        ms.ny = ms.y / h.canvas.height;
 
         ms.moving = true;
 
@@ -492,12 +500,18 @@ class RendererEvents extends Events {
      */
     onTouchStart(event) {
         var ts = this.touchState;
-        ts.sys = event;
-        ts.x = event.touches.item(0).clientX - event.offsetLeft;
-        ts.y = event.touches.item(0).clientY - event.offsetTop;
-        var cnv = this.renderer.handler.canvas;
-        ts.nx = ts.x / cnv.width;
-        ts.ny = ts.y / cnv.height;
+        ts.sys = event;
+
+        ts.clienX = event.touches.item(0).clientX - event.offsetLeft;
+        ts.clientY = event.touches.item(0).clientY - event.offsetTop;
+
+        let h = this.renderer.handler;
+
+        ts.x = ts.clientX * h.pixelRatio;
+        ts.y = ts.clientY * h.pixelRatio;
+
+        ts.nx = ts.x / h.canvas.width;
+        ts.ny = ts.y / h.canvas.height;
         ts.prev_x = ts.x;
         ts.prev_y = ts.y;
         ts.touchStart = true;
@@ -551,11 +565,17 @@ class RendererEvents extends Events {
      */
     onTouchMove(event) {
         var ts = this.touchState;
-        ts.x = event.touches.item(0).clientX - event.offsetLeft;
-        ts.y = event.touches.item(0).clientY - event.offsetTop;
-        var cnv = this.renderer.handler.canvas;
-        ts.nx = ts.x / cnv.width;
-        ts.ny = ts.y / cnv.height;
+        ts.clientX = event.touches.item(0).clientX - event.offsetLeft;
+        ts.clientY = event.touches.item(0).clientY - event.offsetTop;
+
+        var h = this.renderer.handler;
+
+        ts.x = ts.clientX * h.pixelRatio;
+        ts.y = ts.clientY * h.pixelRatio;
+
+        ts.nx = ts.x / h.canvas.width;
+        ts.ny = ts.y / h.canvas.height;
+
         ts.sys = event;
         ts.moving = true;
         this._dblTchBegins = 0;
@@ -808,8 +828,10 @@ class RendererEvents extends Events {
 
         if (ts.touchStart) {
             var r = this.renderer;
-
+
+            r.pickingFramebuffer.activate();
             r.pickingFramebuffer.readPixels(r._currPickingColor, ts.nx, 1.0 - ts.ny, 1);
+            r.pickingFramebuffer.deactivate();
 
             var o = r.colorObjects;
             var c = r._currPickingColor;