@xeokit/xeokit-sdk 2.3.0-beta-25 → 2.3.0-beta-28

package/dist/xeokit-sdk.cjs.js

@@ -8873,7 +8873,7 @@ function worldToRTCPos(worldPos, rtcCenter, rtcPos) {
  * ````false````, we can safely ignore the data returned in ````rtcPositions```` and ````rtcCenter````,
  * since ````rtcCenter```` will equal ````[0,0,0]````, and ````rtcPositions```` will contain identical values to ````positions````.
  */
-function worldToRTCPositions(worldPositions, rtcPositions, rtcCenter, cellSize = 1000000) {
+function worldToRTCPositions(worldPositions, rtcPositions, rtcCenter, cellSize = 1000) {
 
     const center = math.getPositionsCenter(worldPositions, tempVec3a$14);
 
@@ -9600,21 +9600,34 @@ class AngleMeasurement extends Component {
 
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
         this._cornerDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
         this._targetDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
-        this._originWire = new Wire(this._container, {color: this._color || "blue", thickness: 1, zIndex: plugin.zIndex});
-        this._targetWire = new Wire(this._container, {color: this._color || "red", thickness: 1, zIndex: plugin.zIndex});
+        this._originWire = new Wire(this._container, {
+            color: this._color || "blue",
+            thickness: 1,
+            zIndex: plugin.zIndex
+        });
+        this._targetWire = new Wire(this._container, {
+            color: this._color || "red",
+            thickness: 1,
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+        });
 
-        this._angleLabel = new Label(this._container, {fillColor: this._color || "#00BBFF", prefix: "", text: "", zIndex: plugin.zIndex + 2});
+        this._angleLabel = new Label(this._container, {
+            fillColor: this._color || "#00BBFF",
+            prefix: "",
+            text: "",
+            zIndex: plugin.zIndex + 2
+        });
 
         this._wpDirty = false;
         this._vpDirty = false;
@@ -10137,12 +10150,6 @@ class AngleMeasurementsControl extends Component {
             return;
         }
 
-        this.startDot = new Dot(this.plugin._container,
-            {
-                fillColor: this.plugin.defaultColor,
-                zIndex: this.plugin.zIndex + 1
-            });
-
         const plugin = this.plugin;
         const scene = this.scene;
         const cameraControl = plugin.viewer.cameraControl;
@@ -10212,7 +10219,7 @@ class AngleMeasurementsControl extends Component {
                             const pickResult = scene.pick({
                                 canvasPos: mouseHoverCanvasPos,
                                 pickSurface: true,
-                                pickSurfacePrecision: true
+                                pickSurfacePrecision: pickSurfacePrecisionEnabled
                             });
                             if (pickResult && pickResult.worldPos) {
                                 worldPos.set(pickResult.worldPos);
@@ -10300,9 +10307,7 @@ class AngleMeasurementsControl extends Component {
         });
 
         this._onHoverNothing = cameraControl.on("hoverOff", event => {
-            if (this.startDot) {
-                this.startDot.setVisible(false);
-            }
+
             isMouseHoveringEntity = false;
             if (this._currentAngleMeasurement) {
                 switch (this._state) {
@@ -10422,11 +10427,6 @@ class AngleMeasurementsControl extends Component {
             return;
         }
 
-        if (this.startDot) {
-            this.startDot.destroy();
-            this.startDot = null;
-        }
-
         this.reset();
 
         const input = this.plugin.viewer.scene.input;
@@ -10644,7 +10644,7 @@ class AngleMeasurementsPlugin extends Plugin {
         this._measurements = {};
 
         this.defaultColor = cfg.defaultColor;
-        this.zIndex = cfg.zIndex;
+        this.zIndex = cfg.zIndex || 10000;
     }
 
     /**
@@ -46202,64 +46202,64 @@ class DistanceMeasurement extends Component {
 
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
         this._targetDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
         this._lengthWire = new Wire(this._container, {
             color: this._color,
             thickness: 2,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._xAxisWire = new Wire(this._container, {
             color: "red",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._yAxisWire = new Wire(this._container, {
             color: "green",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._zAxisWire = new Wire(this._container, {
             color: "blue",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._lengthLabel = new Label(this._container, {
             fillColor: this._color,
             prefix: "",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 4: undefined
         });
 
         this._xAxisLabel = new Label(this._container, {
             fillColor: "red",
             prefix: "X",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._yAxisLabel = new Label(this._container, {
             fillColor: "green",
             prefix: "Y",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._zAxisLabel = new Label(this._container, {
             fillColor: "blue",
             prefix: "Z",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._wpDirty = false;
@@ -86753,7 +86753,7 @@ class DistanceMeasurementsControl extends Component {
                 const pickResult = scene.pick({
                     canvasPos: touchEndCanvasPos,
                     pickSurface: true,
-                    pickSurfacePrecision: false
+                    pickSurfacePrecision: pickSurfacePrecisionEnabled
                 });
                 if (pickResult && pickResult.worldPos) {
                     switch (touchState) {
@@ -86776,7 +86776,7 @@ class DistanceMeasurementsControl extends Component {
                                     entity: mouseHoverEntity,
                                     worldPos: pickResult.worldPos
                                 },
-                                approximate: true
+                                approximate: (!pickSurfacePrecisionEnabled)
                             });
                             touchState = FIRST_TOUCH_EXPECTED;
                             break;
@@ -87039,7 +87039,7 @@ class DistanceMeasurementsPlugin extends Plugin {
         this.defaultWireVisible = cfg.defaultWireVisible !== false;
         this.defaultAxisVisible = cfg.defaultAxisVisible !== false;
         this.defaultColor = cfg.defaultColor !== undefined ? cfg.defaultColor : "#00BBFF";
-        this.zIndex = cfg.zIndex;
+        this.zIndex = cfg.zIndex || 10000;
     }
 
     /**

package/dist/xeokit-sdk.es.js

@@ -8869,7 +8869,7 @@ function worldToRTCPos(worldPos, rtcCenter, rtcPos) {
  * ````false````, we can safely ignore the data returned in ````rtcPositions```` and ````rtcCenter````,
  * since ````rtcCenter```` will equal ````[0,0,0]````, and ````rtcPositions```` will contain identical values to ````positions````.
  */
-function worldToRTCPositions(worldPositions, rtcPositions, rtcCenter, cellSize = 1000000) {
+function worldToRTCPositions(worldPositions, rtcPositions, rtcCenter, cellSize = 1000) {
 
     const center = math.getPositionsCenter(worldPositions, tempVec3a$14);
 
@@ -9596,21 +9596,34 @@ class AngleMeasurement extends Component {
 
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
         this._cornerDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
         this._targetDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex + 1
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
-        this._originWire = new Wire(this._container, {color: this._color || "blue", thickness: 1, zIndex: plugin.zIndex});
-        this._targetWire = new Wire(this._container, {color: this._color || "red", thickness: 1, zIndex: plugin.zIndex});
+        this._originWire = new Wire(this._container, {
+            color: this._color || "blue",
+            thickness: 1,
+            zIndex: plugin.zIndex
+        });
+        this._targetWire = new Wire(this._container, {
+            color: this._color || "red",
+            thickness: 1,
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+        });
 
-        this._angleLabel = new Label(this._container, {fillColor: this._color || "#00BBFF", prefix: "", text: "", zIndex: plugin.zIndex + 2});
+        this._angleLabel = new Label(this._container, {
+            fillColor: this._color || "#00BBFF",
+            prefix: "",
+            text: "",
+            zIndex: plugin.zIndex + 2
+        });
 
         this._wpDirty = false;
         this._vpDirty = false;
@@ -10133,12 +10146,6 @@ class AngleMeasurementsControl extends Component {
             return;
         }
 
-        this.startDot = new Dot(this.plugin._container,
-            {
-                fillColor: this.plugin.defaultColor,
-                zIndex: this.plugin.zIndex + 1
-            });
-
         const plugin = this.plugin;
         const scene = this.scene;
         const cameraControl = plugin.viewer.cameraControl;
@@ -10208,7 +10215,7 @@ class AngleMeasurementsControl extends Component {
                             const pickResult = scene.pick({
                                 canvasPos: mouseHoverCanvasPos,
                                 pickSurface: true,
-                                pickSurfacePrecision: true
+                                pickSurfacePrecision: pickSurfacePrecisionEnabled
                             });
                             if (pickResult && pickResult.worldPos) {
                                 worldPos.set(pickResult.worldPos);
@@ -10296,9 +10303,7 @@ class AngleMeasurementsControl extends Component {
         });
 
         this._onHoverNothing = cameraControl.on("hoverOff", event => {
-            if (this.startDot) {
-                this.startDot.setVisible(false);
-            }
+
             isMouseHoveringEntity = false;
             if (this._currentAngleMeasurement) {
                 switch (this._state) {
@@ -10418,11 +10423,6 @@ class AngleMeasurementsControl extends Component {
             return;
         }
 
-        if (this.startDot) {
-            this.startDot.destroy();
-            this.startDot = null;
-        }
-
         this.reset();
 
         const input = this.plugin.viewer.scene.input;
@@ -10640,7 +10640,7 @@ class AngleMeasurementsPlugin extends Plugin {
         this._measurements = {};
 
         this.defaultColor = cfg.defaultColor;
-        this.zIndex = cfg.zIndex;
+        this.zIndex = cfg.zIndex || 10000;
     }
 
     /**
@@ -46198,64 +46198,64 @@ class DistanceMeasurement extends Component {
 
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
         this._targetDot = new Dot(this._container, {
             fillColor: this._color,
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
         });
 
         this._lengthWire = new Wire(this._container, {
             color: this._color,
             thickness: 2,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._xAxisWire = new Wire(this._container, {
             color: "red",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._yAxisWire = new Wire(this._container, {
             color: "green",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._zAxisWire = new Wire(this._container, {
             color: "blue",
             thickness: 1,
-            zIndex: plugin.zIndex
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined
         });
 
         this._lengthLabel = new Label(this._container, {
             fillColor: this._color,
             prefix: "",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 4: undefined
         });
 
         this._xAxisLabel = new Label(this._container, {
             fillColor: "red",
             prefix: "X",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._yAxisLabel = new Label(this._container, {
             fillColor: "green",
             prefix: "Y",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._zAxisLabel = new Label(this._container, {
             fillColor: "blue",
             prefix: "Z",
             text: "",
-            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined
+            zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 3: undefined
         });
 
         this._wpDirty = false;
@@ -86749,7 +86749,7 @@ class DistanceMeasurementsControl extends Component {
                 const pickResult = scene.pick({
                     canvasPos: touchEndCanvasPos,
                     pickSurface: true,
-                    pickSurfacePrecision: false
+                    pickSurfacePrecision: pickSurfacePrecisionEnabled
                 });
                 if (pickResult && pickResult.worldPos) {
                     switch (touchState) {
@@ -86772,7 +86772,7 @@ class DistanceMeasurementsControl extends Component {
                                     entity: mouseHoverEntity,
                                     worldPos: pickResult.worldPos
                                 },
-                                approximate: true
+                                approximate: (!pickSurfacePrecisionEnabled)
                             });
                             touchState = FIRST_TOUCH_EXPECTED;
                             break;
@@ -87035,7 +87035,7 @@ class DistanceMeasurementsPlugin extends Plugin {
         this.defaultWireVisible = cfg.defaultWireVisible !== false;
         this.defaultAxisVisible = cfg.defaultAxisVisible !== false;
         this.defaultColor = cfg.defaultColor !== undefined ? cfg.defaultColor : "#00BBFF";
-        this.zIndex = cfg.zIndex;
+        this.zIndex = cfg.zIndex || 10000;
     }
 
     /**