@xeokit/xeokit-sdk 2.6.113 → 2.6.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.113",
+  "version": "2.6.114",
   "description": "3D BIM IFC Viewer SDK for AEC engineering applications. Open Source JavaScript Toolkit based on pure WebGL for top performance, real-world coordinates and full double precision",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AngleMeasurementsPlugin/index.js

@@ -5,7 +5,7 @@ export * from "./AngleMeasurementsTouchControl.js";
 
 import {Component} from "../../viewer/scene/Component.js";
 import {math} from "../../viewer/scene/math/math.js";
-import {activateDraggableDots} from "../../../src/plugins/lib/ui/index.js";
+import {activateDraggableDots} from "../lib/ui/index.js";
 
 class AngleMeasurementEditControl extends Component {
 

package/src/plugins/DistanceMeasurementsPlugin/index.js

@@ -5,7 +5,7 @@ export * from "./DistanceMeasurementsTouchControl.js";
 
 import {Component} from "../../viewer/scene/Component.js";
 import {math} from "../../viewer/scene/math/math.js";
-import {activateDraggableDots} from "../../../src/plugins/lib/ui/index.js";
+import {activateDraggableDots} from "../lib/ui/index.js";
 
 export class DistanceMeasurementEditControl extends Component {
 

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -896,7 +896,7 @@ class XKTLoaderPlugin extends Plugin {
      * @param {ArrayBuffer} [params.xkt] The *````.xkt````* file data, as an alternative to the ````src```` parameter.
      * @param {String} [params.metaModelSrc] Path or URL to an optional metadata file, as an alternative to the ````metaModelData```` parameter.
      * @param {*} [params.metaModelData] JSON model metadata, as an alternative to the ````metaModelSrc```` parameter.
-     * @param {Boolean} [params.loadIntoMetaScene=true] Whether to load metadata into MetaScene, otherwise expose as SceneModel::metadata.
+     * @param {Boolean|Function} [params.loadIntoMetaScene=true] Whether to load metadata into ````MetaScene````, otherwise expose as ````SceneModel::metadata````. If provided as a function, it will be called with either ````metaModelSrc````'s contents, ````metaModelData```` value, or xkt's embedded metadata, and the function's return value will be used as ````metaModel.loadData````'s input.
      * @param {String} [params.manifestSrc] Path or URL to a JSON manifest file that provides paths to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into
      * multiple XKT files. See [tutorial](https://xeokit.io/blog/automatically-splitting-large-models-for-better-performance) for more info.
      * @param {Object} [params.manifest] A JSON manifest object (as an alternative to a path or URL) that provides paths to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into
@@ -995,10 +995,19 @@ class XKTLoaderPlugin extends Plugin {
 
         const loadIntoMetaScene = (! ("loadIntoMetaScene" in params)) || params.loadIntoMetaScene;
         const metaModel = (loadIntoMetaScene
-                           ? new MetaModel({
-                               id: modelId,
-                               metaScene: this.viewer.metaScene
-                           })
+                           ? (() => {
+                               const metaModel = new MetaModel({
+                                   id: modelId,
+                                   metaScene: this.viewer.metaScene
+                               });
+                               if (typeof loadIntoMetaScene === "function") {
+                                   const origLoadData = metaModel.loadData;
+                                   metaModel.loadData = function(metaModelData, options = {}) {
+                                       return origLoadData.call(this, loadIntoMetaScene(metaModelData), options);
+                                   };
+                               }
+                               return metaModel;
+                           })()
                            : (function() {
                                let firstMetadata = null;
                                let modelMetadata = null;

package/src/plugins/ZonesPlugin/ZonesPlugin.js

@@ -5,7 +5,7 @@ import {ReadableGeometry} from "../../viewer/scene/geometry/ReadableGeometry.js"
 import {PhongMaterial} from "../../viewer/scene/materials/PhongMaterial.js";
 import {math} from "../../viewer/scene/math/math.js";
 import {Mesh} from "../../viewer/scene/mesh/Mesh.js";
-import {activateDraggableDots, Dot3D, marker3D, wire3D, touchPointSelector, transformToNode, triangulateEarClipping} from "../../../src/plugins/lib/ui/index.js";
+import {activateDraggableDots, Dot3D, marker3D, wire3D, touchPointSelector, transformToNode, triangulateEarClipping} from "../lib/ui/index.js";
 
 const hex2rgb = function(color) {
     const rgb = idx => parseInt(color.substr(idx + 1, 2), 16) / 255;

package/types/plugins/XKTLoaderPlugin/XKTLoaderPlugin.d.ts

@@ -36,8 +36,8 @@ export declare type LoadXKTModel = {
     metaModelSrc?: string;
     /** JSON model metadata, as an alternative to the ````metaModelSrc```` parameter. */
     metaModelData?: any;
-    /** Whether to load metadata into MetaScene, otherwise expose as SceneModel::metadata. Defaults to `true`. */
-    loadIntoMetaScene?: boolean;
+    /** Whether to load metadata into ````MetaScene````, otherwise expose as ````SceneModel::metadata````. If provided a function, the function will be called with either ````metaModelSrc````'s contents, ````metaModelData```` value, or xkt's embedded metadata, and the function's return value will be used as ````metaModel.loadData````'s input. Defaults to `true`. */
+    loadIntoMetaScene?: boolean | ((metadata: any) => any);
     /** Path or URL to a JSON manifest file that provides paths or URLs to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into multiple XKT files. See [tutorial](https://xeokit.io/blog/automatically-splitting-large-models-for-better-performance) for more info.*/
     manifestSrc?: any;
     /** A JSON manifest object (as an alternative to a path or URL) that provides paths or URLs to ````.xkt```` files to load as parts of the model. Use this option to load models that have been split into multiple XKT files. See [tutorial](https://xeokit.io/blog/automatically-splitting-large-models-for-better-performance) for more info. */