@xeokit/xeokit-sdk 2.6.8 → 2.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -193,8 +193,8 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const mouseHoverCanvasPos = math.vec2();
         this._currentAngleMeasurement = null;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
 
         const pagePos = math.vec2();
 

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -199,8 +199,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
 
         this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
 
         const pagePos = math.vec2();
         

package/src/viewer/scene/CameraControl/lib/handlers/MouseMiscHandler.js

@@ -59,8 +59,8 @@ function getCanvasPosFromEvent(event, canvas, canvasPos) {
         canvasPos[1] = event.y;
     } else {
         const { left, top } = canvas.getBoundingClientRect();
-        canvasPos[0] = event.clientX - left - window.scrollX;
-        canvasPos[1] = event.clientY - top - window.scrollY;
+        canvasPos[0] = event.clientX - left;
+        canvasPos[1] = event.clientY - top;
     }
     return canvasPos;
 }

package/src/viewer/scene/marker/Marker.js

@@ -65,7 +65,7 @@ const tempVec4b = math.vec4();
  * });
  *
  * // Create the Marker, associated with our Mesh Entity
- * const myMarker = new Marker({
+ * const myMarker = new Marker(viewer, {
  *      entity: entity,
  *      worldPos: [10,0,0],
  *      occludable: true