@xeokit/xeokit-sdk 2.6.112 → 2.6.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.112",
+  "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/src/viewer/scene/model/layer/Layer.js

@@ -338,7 +338,7 @@ export const getRenderers = (function() {
             if (primitive === "points") {
                 cache[sceneId] = {
                     colorRenderers:     { "sao-": { "vertex": lazy((vars, geo, c) => c(makeColorProgram(vars, geo, null, null))) } },
-                    occlusionRenderer:  lazy((vars, geo, c) => c(OcclusionProgram(vars, scene.logarithmicDepthBufferEnabled))),
+                    occlusionRenderer:  lazy((vars, geo, c) => c(OcclusionProgram(vars))),
                     pickDepthRenderer:  lazy(makePickDepthProgram),
                     pickMeshRenderer:   lazy(makePickMeshProgram),
                     // VBOBatchingPointsShadowRenderer has been implemented by 14e973df6268369b00baef60e468939e062ac320,
@@ -400,7 +400,7 @@ export const getRenderers = (function() {
                         uniform: lazy((vars, geo, c) => c(EdgesProgram(vars, geo, scene.logarithmicDepthBufferEnabled, true)),  { vertices: false }),
                         vertex:  lazy((vars, geo, c) => c(EdgesProgram(vars, geo, scene.logarithmicDepthBufferEnabled, false)), { vertices: false })
                     },
-                    occlusionRenderer:       lazy((vars, geo, c) => c(OcclusionProgram(vars, scene.logarithmicDepthBufferEnabled))),
+                    occlusionRenderer:       lazy((vars, geo, c) => c(OcclusionProgram(vars))),
                     pickDepthRenderer:       eager(makePickDepthProgram),
                     pickMeshRenderer:        eager(makePickMeshProgram),
                     pickNormalsFlatRenderer: eager((vars, geo, c) => makePickNormalsProgram(vars, geo, c, true)),

package/src/viewer/scene/model/layer/programs/OcclusionProgram.js

@@ -1,11 +1,7 @@
-export const OcclusionProgram = function(programVariables, logarithmicDepthBufferEnabled) {
+export const OcclusionProgram = function(programVariables) {
     const outColor = programVariables.createOutput("vec4", "outColor");
     return {
         programName: "Occlusion",
-        // Logarithmic depth buffer involves an accuracy tradeoff, sacrificing
-        // accuracy at close range to improve accuracy at long range. This can
-        // mess up accuracy for occlusion tests, so we'll disable for now.
-        getLogDepth: false && logarithmicDepthBufferEnabled && (vFragDepth => vFragDepth),
         renderPassFlag: 0,  // COLOR_OPAQUE // Only opaque objects can be occluders
         appendFragmentOutputs: (src) => src.push(`${outColor} = vec4(0.0, 0.0, 1.0, 1.0);`) // Occluders are blue
     };

package/src/viewer/scene/scene/Scene.js

@@ -636,6 +636,8 @@ class Scene extends Component {
             alphaDepthMask: alphaDepthMask
         });
 
+        this.canvas._renderer = this._renderer;
+
         this._sectionPlanesState = new (function () {
 
             this.sectionPlanes = [];

package/src/viewer/scene/sectionPlane/SectionPlaneCache.js

@@ -1,6 +1,6 @@
 import {Component} from '../Component.js';
 import {math} from "../math/math.js";
-import {SectionPlane} from "./SectionPlane";
+import {SectionPlane} from "./SectionPlane.js";
 
 const tempVec3a = math.vec3();
 

package/src/viewer/scene/webgl/occlusion/OcclusionTester.js

@@ -132,13 +132,12 @@ export class OcclusionTester {
                 "OcclusionTester",
                 {
                     sectionPlanesState: sectionPlanesState,
-                    getLogDepth: scene.logarithmicDepthBufferEnabled && (vFragDepth => vFragDepth),
                     clippableTest: () => "true",
                     getVertexData: () => {
                         const src = [ ];
                         src.push(`vec4 worldPosition = vec4(${position}, 1.0);`);
                         src.push(`vec4 ${clipPos} = ${projMatrix} * ${viewMatrix} * worldPosition;`);
-                        if ((! scene.logarithmicDepthBufferEnabled) && (scene.markerZOffset < 0.000)) {
+                        if (scene.markerZOffset < 0.000) {
                             src.push(`${clipPos}.z += ${scene.markerZOffset};`);
                         }
                         return src;

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. */