@xeokit/xeokit-sdk 2.5.2-beta-21 → 2.5.2-beta-23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.5.2-beta-21",
+  "version": "2.5.2-beta-23",
   "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

@@ -223,8 +223,8 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                         const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
                         const canvasLeftEdge = canvasBoundRect.left + scrollLeft;
                         const canvasTopEdge = canvasBoundRect.top + scrollTop;
-                        this._markerDiv.style.marginLeft = `${canvasLeftEdge + canvasPos[0] - 5}px`;
-                        this._markerDiv.style.marginTop = `${canvasTopEdge + canvasPos[1] - 5}px`;
+                        this.markerDiv.style.marginLeft = `${canvasLeftEdge + canvasPos[0] - 5}px`;
+                        this.markerDiv.style.marginTop = `${canvasTopEdge + canvasPos[1] - 5}px`;
                         break;
                     case MOUSE_FINDING_CORNER:
                         if (this._currentAngleMeasurement) {
@@ -387,7 +387,7 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         if (this.pointerLens) {
             this.pointerLens.visible = false;
         }
-        if (this._markerDiv) {
+        if (this.markerDiv) {
             this._destroyMarkerDiv()
         }
         this.reset();

package/src/viewer/scene/geometry/builders/buildPolylineGeometry.js

@@ -0,0 +1,87 @@
+import {utils} from '../../utils.js';
+
+/**
+ * @desc Creates a 3D polyline {@link Geometry}.
+ *
+ * ## Usage
+ *
+ * In the example below we'll create a {@link Mesh} with a polyline {@link ReadableGeometry} that has lines primitives.
+ *
+ * [[Run this example](/examples/#geometry_builders_buildPolylineGeometry)]
+ *
+ * ````javascript
+ * //------------------------------------------------------------------------------------------------------------------
+ * // Import the modules we need for this example
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * import {buildPolylineGeometry, Viewer, Mesh, ReadableGeometry, PhongMaterial} from "../../dist/xeokit-sdk.min.es.js";
+ *
+ * //------------------------------------------------------------------------------------------------------------------
+ * // Create a Viewer and arrange the camera
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * const viewer = new Viewer({
+ *     canvasId: "myCanvas"
+ * });
+ *
+ * viewer.camera.eye = [0, 0, 8];
+ * viewer.camera.look = [0, 0, 0];
+ * viewer.camera.up = [0, 1, 0];
+ *
+ * //------------------------------------------------------------------------------------------------------------------
+ * // Create a mesh with polyline shape
+ * //------------------------------------------------------------------------------------------------------------------
+ *
+ * new Mesh(viewer.scene, {
+ *     geometry: new ReadableGeometry(viewer.scene, buildPolylineGeometry({
+ *         points: [
+ *             0, 2.83654, 0,
+ *             -0.665144, 1.152063, 0,
+ *             -2.456516, 1.41827, 0,
+ *             -1.330288, 0, 0,
+ *             -2.456516, -1.41827, 0,
+ *             -0.665144, -1.152063, 0,
+ *             0, -2.83654, 0,
+ *             0.665144, -1.152063, 0,
+ *             2.456516, -1.41827, 0,
+ *             1.330288, 0, 0,
+ *             2.456516, 1.41827, 0,
+ *             0.665144, 1.152063, 0,
+ *             0, 2.83654, 0,
+ *         ]
+ *     })),
+ *     material: new PhongMaterial(viewer.scene, {
+ *         emissive: [0, 1,]
+ *     })
+ * });
+ * ````
+ *
+ * @function buildPolylineGeometry
+ * @param {*} [cfg] Configs
+ * @param {String} [cfg.id] Optional ID, unique among all components in the parent {@link Scene}, generated automatically when omitted.
+ * @param {Number[]} [cfg.points]  3D points indicating vertices position.
+ * @returns {Object} Configuration for a {@link Geometry} subtype.
+ */
+function buildPolylineGeometry(cfg = {}) {
+
+    if (cfg.points.length % 3 !== 0) {
+        throw "Size of points array for given polyline should be divisible by 3";
+    }
+    let numberOfPoints = cfg.points.length / 3;
+    if (numberOfPoints < 2) {
+        throw "There should be at least 2 points to create a polyline";
+    }
+    let indices = [];
+    for (let i = 0; i < numberOfPoints - 1; i++) {
+        indices.push(i);
+        indices.push(i + 1);
+    }
+
+    return utils.apply(cfg, {
+        primitive: "lines",
+        positions: cfg.points,
+        indices: indices,
+    });
+}
+
+export {buildPolylineGeometry};

package/src/viewer/scene/model/SceneModel.js

@@ -2779,7 +2779,8 @@ export class SceneModel extends Component {
 
             const useDTX = (!!this._dtxEnabled && (cfg.primitive === "triangles"
                 || cfg.primitive === "solid"
-                || cfg.primitive === "surface"));
+                || cfg.primitive === "surface"))
+            && (!cfg.textureSetId);
 
             cfg.origin = cfg.origin ? math.addVec3(this._origin, cfg.origin, math.vec3()) : this._origin;
 
@@ -2997,7 +2998,8 @@ export class SceneModel extends Component {
             const useDTX = (!!this._dtxEnabled
                 && (cfg.geometry.primitive === "triangles"
                     || cfg.geometry.primitive === "solid"
-                    || cfg.geometry.primitive === "surface"));
+                    || cfg.geometry.primitive === "surface"))
+                && (!cfg.textureSetId);
 
             if (useDTX) {
 

package/types/viewer/scene/geometry/builders/buildBoxLinesGeometry.d.ts

@@ -13,10 +13,25 @@ export declare type buildBoxLinesGeometryConfiguration = {
   zSize?: number;
 };
 
+export declare type buildBoxLinesGeometryFromAABBConfiguration = {
+  /* Optional ID for the {@link Geometry}, unique among all components in the parent {@link Scene}, generated automatically when omitted. */
+  id?: string;
+  /* AABB for which box will be created. */
+  aabb?: number[];
+};
+
 /**
  * @desc Creates a box-shaped lines {@link Geometry}.
  *
  * @param {buildBoxLinesGeometryConfiguration} [cfg] Configs
  * @returns {Object} Configuration for a {@link Geometry} subtype.
  */
-export function buildBoxLinesGeometry(cfg: buildBoxLinesGeometryConfiguration): Geometry;
+export function buildBoxLinesGeometry(cfg: buildBoxLinesGeometryConfiguration): Geometry;
+
+/**
+ * @desc Creates a box-shaped lines {@link Geometry} from AABB.
+ *
+ * @param {buildBoxLinesGeometryConfiguration} [cfg] Configs
+ * @returns {Object} Configuration for a {@link Geometry} subtype.
+ */
+export function buildBoxLinesGeometryFromAABB(cfg: buildBoxLinesGeometryFromAABBConfiguration): Geometry;

package/types/viewer/scene/geometry/builders/buildPolylineGeometry.d.ts

@@ -0,0 +1,16 @@
+import { Geometry } from "../Geometry";
+
+export declare type buildPolylineGeometryConfiguration = {
+    /* Optional ID for the {@link Geometry}, unique among all components in the parent {@link Scene}, generated automatically when omitted. */
+    id?: string;
+    /* 3D points indicating vertices position. */
+    points?: number[];
+};
+
+/**
+ * @desc Creates a 3D polyline {@link Geometry}.
+ *
+ * @param {buildBoxLinesGeometryConfiguration} [cfg] Configs
+ * @returns {Object} Configuration for a {@link Geometry} subtype.
+ */
+export function buildPolylineGeometry(cfg: buildPolylineGeometryConfiguration): Geometry;