@xeokit/xeokit-sdk 2.6.0-beta-5 → 2.6.0-beta-7

package/package.json

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

@@ -189,6 +189,10 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const mouseWorldPos = math.vec3();
         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));
+
         this._onMouseHoverSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -220,13 +224,9 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                 mouseHoverCanvasPos.set(canvasPos);
                 switch (this._mouseState) {
                     case MOUSE_FINDING_ORIGIN:
-                        const canvasBoundRect = canvas.getBoundingClientRect();
-                        const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft;
-                        const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                        const canvasLeftEdge = canvasBoundRect.left + scrollLeft;
-                        const canvasTopEdge = canvasBoundRect.top + scrollTop;
-                        this.markerDiv.style.left = `${canvasLeftEdge + canvasPos[0] - 5}px`;
-                        this.markerDiv.style.top = `${canvasTopEdge + canvasPos[1] - 5}px`;
+                        this.markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
+                        this.markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
+
                         break;
                     case MOUSE_FINDING_CORNER:
                         if (this._currentAngleMeasurement) {

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -197,6 +197,9 @@ 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));
+
         this._onCameraControlHoverSnapOrSurface = cameraControl.on(
             this._snapping
                 ? "hoverSnapOrSurface"
@@ -207,16 +210,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
                 pointerCanvasPos.set(event.canvasPos);
                 if (this._mouseState === MOUSE_FIRST_CLICK_EXPECTED) {
 
-                   // const canvasBoundary = getCanvasBoundary();
-
-                    const canvasBoundRect = canvas.getBoundingClientRect();
-                    const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft;
-                    const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                    const canvasLeftEdge = canvasBoundRect.left + scrollLeft;
-                    const canvasTopEdge = canvasBoundRect.top + scrollTop;
-
-                    this._markerDiv.style.left = `${canvasLeftEdge + canvasPos[0] - 5}px`;
-                    this._markerDiv.style.top = `${canvasTopEdge + canvasPos[1] - 5}px`;
+                    this._markerDiv.style.left = `${getLeft(canvas) + canvasPos[0] - 5}px`;
+                    this._markerDiv.style.top = `${getTop(canvas) + canvasPos[1] - 5}px`;
 
                     this._markerDiv.style.background = "pink";
                     if (event.snappedToVertex || event.snappedToEdge) {

package/src/plugins/GLTFLoaderPlugin/GLTFDefaultDataSource.js

@@ -1,5 +1,5 @@
 import {utils} from "../../viewer/scene/utils.js";
-import {core} from "../../viewer/scene/core";
+import {core} from "../../viewer/scene/core.js";
 
 /**
  * Default data access strategy for {@link GLTFLoaderPlugin}.

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -355,9 +355,9 @@ parsers[ParserV10.version] = ParserV10;
  *      }
  *
  *      // Gets the contents of the given .XKT file in an arraybuffer
- *      getXKT(xKTSrc, ok, error) {
+ *      getXKT(src, ok, error) {
  *          console.log("MyDataSource#getXKT(" + xKTSrc + ", ... )");
- *          utils.loadArraybuffer(xKTSrc,
+ *          utils.loadArraybuffer(src,
  *              (arraybuffer) => {
  *                  ok(arraybuffer);
  *              },
@@ -1041,13 +1041,28 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                this.scheduleTask( loadNext, 100);
+                                this.scheduleTask(loadNext, 100);
                             }, error);
                         }
                     }
                     loadNext();
                 }
-                const loadXKTs = (xktFiles, done, error) => {
+                const loadXKTs_excludeTheirMetaModels = (xktFiles, done, error) => { // Load XKTs, ignore metamodels in the XKT
+                    let i = 0;
+                    const loadNext = () => {
+                        if (i >= xktFiles.length) {
+                            done();
+                        } else {
+                            this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
+                                this._parseModel(arrayBuffer, params, options, sceneModel, null /* Ignore metamodel in XKT */, manifestCtx);
+                                i++;
+                                this.scheduleTask(loadNext, 100);
+                            }, error);
+                        }
+                    }
+                    loadNext();
+                };
+                const loadXKTs_includeTheirMetaModels = (xktFiles, done, error) => { // Load XKTs, parse metamodels from the XKT
                     let i = 0;
                     const loadNext = () => {
                         if (i >= xktFiles.length) {
@@ -1072,10 +1087,10 @@ class XKTLoaderPlugin extends Plugin {
                     const metaModelFiles = manifestData.metaModelFiles;
                     if (metaModelFiles) {
                         loadJSONs(metaModelFiles, () => {
-                            loadXKTs(xktFiles, finish, error);
+                            loadXKTs_excludeTheirMetaModels(xktFiles, finish, error);
                         }, error);
                     } else {
-                        loadXKTs(xktFiles, finish, error);
+                        loadXKTs_includeTheirMetaModels(xktFiles, finish, error);
                     }
                 } else {
                     this._dataSource.getManifest(params.manifestSrc, (manifestData) => {
@@ -1090,10 +1105,10 @@ class XKTLoaderPlugin extends Plugin {
                         const metaModelFiles = manifestData.metaModelFiles;
                         if (metaModelFiles) {
                             loadJSONs(metaModelFiles, () => {
-                                loadXKTs(xktFiles, finish, error);
+                                loadXKTs_excludeTheirMetaModels(xktFiles, finish, error);
                             }, error);
                         } else {
-                            loadXKTs(xktFiles, finish, error);
+                            loadXKTs_includeTheirMetaModels(xktFiles, finish, error);
                         }
                     }, error);
                 }
@@ -1133,56 +1148,6 @@ class XKTLoaderPlugin extends Plugin {
         }
         parser.parse(this.viewer, options, elements, sceneModel, metaModel, manifestCtx);
     }
-
-// _createDefaultMetaModelIfNeeded(sceneModel, params, options) {
-//
-//     const metaModelId = sceneModel.id;
-//
-//     if (!this.viewer.metaScene.metaModels[metaModelId]) {
-//
-//         const metaModelData = {
-//             metaObjects: []
-//         };
-//
-//         metaModelData.metaObjects.push({
-//             id: metaModelId,
-//             type: "default",
-//             name: metaModelId,
-//             parent: null
-//         });
-//
-//         const entityList = sceneModel.entityList;
-//
-//         for (let i = 0, len = entityList.length; i < len; i++) {
-//             const entity = entityList[i];
-//             if (entity.isObject) {
-//                 metaModelData.metaObjects.push({
-//                     id: entity.id,
-//                     type: "default",
-//                     name: entity.id,
-//                     parent: metaModelId
-//                 });
-//             }
-//         }
-//
-//         const src = params.src;
-//
-//         this.viewer.metaScene.createMetaModel(metaModelId, metaModelData, {
-//
-//             includeTypes: options.includeTypes,
-//             excludeTypes: options.excludeTypes,
-//             globalizeObjectIds: options.globalizeObjectIds,
-//
-//             getProperties: async (propertiesId) => {
-//                 return await this._dataSource.getProperties(src, propertiesId);
-//             }
-//         });
-//
-//         sceneModel.once("destroyed", () => {
-//             this.viewer.metaScene.destroyMetaModel(metaModelId);
-//         });
-//     }
-// }
 }
 
 function getBaseDirectory(filePath) {

package/src/viewer/Plugin.js

@@ -1,5 +1,5 @@
 import {Map} from "./scene/utils/Map.js";
-import {core} from "./scene/core";
+import {core} from "./scene/core.js";
 
 /**
  @desc Base class for {@link Viewer} plugin classes.

package/src/viewer/Viewer.js

@@ -3,7 +3,7 @@ import {CameraFlightAnimation} from "./scene/camera/CameraFlightAnimation.js";
 import {CameraControl} from "./scene/CameraControl/CameraControl.js";
 import {MetaScene} from "./metadata/MetaScene.js";
 import {LocaleService} from "./localization/LocaleService.js";
-import html2canvas from 'html2canvas/dist/html2canvas.esm.js';
+import html2canvas from '../../node_modules/html2canvas/dist/html2canvas.esm.js';
 
 /**
  * The 3D Viewer at the heart of the xeokit SDK.

package/src/viewer/scene/model/vbo/batching/triangles/renderers/EdgesEmphasisRenderer.js

@@ -1,5 +1,5 @@
 import {TrianglesBatchingRenderer} from "./TrianglesBatchingRenderer.js";
-import {EdgesRenderer} from "./EdgesRenderer";
+import {EdgesRenderer} from "./EdgesRenderer.js";
 
 
 /**

package/src/viewer/scene/utils/FileLoader.js

@@ -1,6 +1,6 @@
 import {Cache} from './Cache.js';
 import {Loader} from './Loader.js';
-import {core} from "../core";
+import {core} from "../core.js";
 
 const loading = {};
 

package/src/viewer/scene/utils.js

@@ -1,7 +1,7 @@
 /**
  * @private
  */
-import {core} from "./core";
+import {core} from "./core.js";
 
 function xmlToJson(node, attributeRenamer) {
     if (node.nodeType === node.TEXT_NODE) {