@combeenation/3d-viewer 6.1.0 → 6.2.0

package/dist/lib-cjs/api/util/sceneLoaderHelper.js

@@ -1,140 +1,140 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMaterialFromCbnAssets = exports.addMissingMaterialObserver = exports.addMissingMaterialMetadata = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.missingMaterialMetadataName = void 0;
-const babylonHelper_1 = require("./babylonHelper");
-const material_1 = require("@babylonjs/core/Materials/material");
-const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
-const has_1 = __importDefault(require("lodash-es/has"));
-exports.missingMaterialMetadataName = 'missingMaterial';
-/**
- * Create and return a custom loader plugin to be registered with SceneLoader, that allows
- * us to run our own code against the input data before using the standard procedure to
- * import.
- * @param previousLoaderPlugin the actual loader that's executed after manipulating the input data
- * @returns Custom loader plugin to be registered with SceneLoader.RegisterPlugin()
- */
-const getCustomCbnBabylonLoaderPlugin = function (previousLoaderPlugin) {
-    const customLoader = {
-        name: 'cbnCustomBabylonLoader',
-        extensions: '.babylon',
-        importMesh: previousLoaderPlugin.importMesh,
-        load: previousLoaderPlugin.load,
-        loadAssetContainer: function (scene, data, rootUrl, onError) {
-            //* 1) --- manipulate ORIGINAL data
-            const dataParsed = JSON.parse(data);
-            //* 2) --- call default (non-custom) loading method
-            const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
-            //* 3) --- manipulate IMPORTED data
-            (0, exports.addMissingMaterialMetadata)(dataParsed, importedContainer);
-            //* 4) --- return imported data
-            return importedContainer;
-        },
-    };
-    return customLoader;
-};
-exports.getCustomCbnBabylonLoaderPlugin = getCustomCbnBabylonLoaderPlugin;
-/**
- * Return an observer to be applied to meshes in order to post-load missing materials
- * upon set enabled/visible.
- * @param targetMeshOrInstance AbstractMesh the observer will be applied to
- * @param concerningMesh Mesh to look for missing materials on, and create/apply to (when found).
- * @returns observer
- */
-const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMesh) {
-    return (eventData, eventState) => {
-        const hasBeenEnabled = concerningMesh.isEnabled(true);
-        const materialMissing = (0, has_1.default)(concerningMesh.metadata, exports.missingMaterialMetadataName);
-        if (!hasBeenEnabled || !materialMissing)
-            return;
-        // get id of missing material
-        const missingMatId = concerningMesh.metadata[exports.missingMaterialMetadataName];
-        // try to find material on the scene
-        const existingMat = concerningMesh.getScene().getMaterialById(missingMatId);
-        // assign either existing material or freshly created one
-        concerningMesh.material = existingMat || (0, exports.createMaterialFromCbnAssets)(missingMatId, concerningMesh.getScene());
-        // since the material is there now, we do not need the related metadata tag anymore
-        delete concerningMesh.metadata[exports.missingMaterialMetadataName];
-    };
-};
-exports.getMaterialPostLoadObserver = getMaterialPostLoadObserver;
-/**
- * Internal function that compares the original meshes on a .babylon file with what was loaded,
- * and tags missing materials with respective metadata on respective meshes.
- * @param dataParsed original data
- * @param container  loaded data
- */
-const addMissingMaterialMetadata = function (dataParsed, container) {
-    container.meshes.forEach(currMeshImported => {
-        var _a, _b;
-        for (const currMeshOriginal of dataParsed.meshes) {
-            if (currMeshOriginal.name !== currMeshImported.name)
-                continue;
-            // we're dealing with the original version of the current imported mesh now
-            const materialOnImportedMesh = (_a = currMeshImported.material) === null || _a === void 0 ? void 0 : _a.id;
-            const materialOnOriginalMesh = currMeshOriginal.materialId;
-            if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh)
-                continue;
-            // if we're here, the imported mesh has different material than original one
-            (_b = window.Cbn) === null || _b === void 0 ? void 0 : _b.Assets.assertMaterialExists(materialOnOriginalMesh);
-            (0, babylonHelper_1.injectNodeMetadata)(currMeshImported, { [exports.missingMaterialMetadataName]: materialOnOriginalMesh }, false);
-            break;
-        }
-    });
-};
-exports.addMissingMaterialMetadata = addMissingMaterialMetadata;
-/**
- * Adds an "onEnabledStateChanged" observer to the given mesh and all its parents:
- * The added observer (`getMaterialPostLoadObserver`) handles creation of missing materials once the given node is
- * enabled.
- */
-const addMissingMaterialObserver = function (node) {
-    // set the concerning node, i.e. the node the observer should check for missing material.
-    // for instanced meshes, we want the sourcemesh here.
-    const concerningNode = node instanceof instancedMesh_1.InstancedMesh ? node.sourceMesh : node;
-    // observer is pointless if concerning node has no missing material
-    if (!(0, has_1.default)(concerningNode.metadata, exports.missingMaterialMetadataName))
-        return;
-    // for each of our AbstractMeshes, set an observer on the AbstractMesh itself and all of its parents.
-    let currNode = node;
-    while (currNode) {
-        // Note HAR: Using `addOnce` could be wrong in certain situations.
-        // E.g.:
-        //   * 2 meshes `parentMesh` & `parentMesh.concerningMesh`
-        //   * `concerningMesh` is having the missing material flag
-        //   * Both `parentMesh` & `concerningMesh` are disabled
-        //   * `parentMesh` is enabled -> material should **not** be created as `concerningMesh` is still disabled
-        //   * `parentMesh` is disabled
-        //   * `concerningMesh` is enabled -> material should **not** be created as `concerningMesh` is still invisible
-        //     because its `parentMesh` is ATM disabled
-        //   * `parentMesh` & `concerningMesh` are both enable
-        //     -> material should be created as `concerningMesh` is now actually visible but it isn't, as all observers were
-        //        only fired once 🔥
-        //
-        // However: Using `add` instead of `addOnce` requires rather complicated manual clean up work...
-        // add observer. needed only once per node, hence addOnce()
-        node.onEnabledStateChangedObservable.addOnce((0, exports.getMaterialPostLoadObserver)(currNode, concerningNode));
-        // console.log('## observer set on: ' + meshOrInstance.name);
-        currNode = currNode.parent;
-    }
-};
-exports.addMissingMaterialObserver = addMissingMaterialObserver;
-/**
- * Look up the provided materials (see library import) and create and return one if found.
- * @param materialId BabylonJs material-id. E.g. 'concrete".
- * @param scene BabylonJs scene
- * @returns PBRMaterial | null
- */
-const createMaterialFromCbnAssets = function (materialId, scene) {
-    var _a;
-    const materialDefinition = (_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets.getMaterial(materialId);
-    // The generic `Material.Parse` actually returns a more specific material like `BABYLON.StandardMaterial`,
-    // `BABYLON.PBRMaterial` or stuff like `BABYLON.PBRMetallicRoughnessMaterial` etc. based on the given `customType`
-    // within the material JSON definition
-    const material = materialDefinition && material_1.Material.Parse(materialDefinition, scene, '');
-    return material || null;
-};
-exports.createMaterialFromCbnAssets = createMaterialFromCbnAssets;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMaterialFromCbnAssets = exports.addMissingMaterialObserver = exports.addMissingMaterialMetadata = exports.getMaterialPostLoadObserver = exports.getCustomCbnBabylonLoaderPlugin = exports.missingMaterialMetadataName = void 0;
+const babylonHelper_1 = require("./babylonHelper");
+const material_1 = require("@babylonjs/core/Materials/material");
+const instancedMesh_1 = require("@babylonjs/core/Meshes/instancedMesh");
+const has_1 = __importDefault(require("lodash-es/has"));
+exports.missingMaterialMetadataName = 'missingMaterial';
+/**
+ * Create and return a custom loader plugin to be registered with SceneLoader, that allows
+ * us to run our own code against the input data before using the standard procedure to
+ * import.
+ * @param previousLoaderPlugin the actual loader that's executed after manipulating the input data
+ * @returns Custom loader plugin to be registered with SceneLoader.RegisterPlugin()
+ */
+const getCustomCbnBabylonLoaderPlugin = function (previousLoaderPlugin) {
+    const customLoader = {
+        name: 'cbnCustomBabylonLoader',
+        extensions: '.babylon',
+        importMesh: previousLoaderPlugin.importMesh,
+        load: previousLoaderPlugin.load,
+        loadAssetContainer: function (scene, data, rootUrl, onError) {
+            //* 1) --- manipulate ORIGINAL data
+            const dataParsed = JSON.parse(data);
+            //* 2) --- call default (non-custom) loading method
+            const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
+            //* 3) --- manipulate IMPORTED data
+            (0, exports.addMissingMaterialMetadata)(dataParsed, importedContainer);
+            //* 4) --- return imported data
+            return importedContainer;
+        },
+    };
+    return customLoader;
+};
+exports.getCustomCbnBabylonLoaderPlugin = getCustomCbnBabylonLoaderPlugin;
+/**
+ * Return an observer to be applied to meshes in order to post-load missing materials
+ * upon set enabled/visible.
+ * @param targetMeshOrInstance AbstractMesh the observer will be applied to
+ * @param concerningMesh Mesh to look for missing materials on, and create/apply to (when found).
+ * @returns observer
+ */
+const getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMesh) {
+    return (eventData, eventState) => {
+        const hasBeenEnabled = concerningMesh.isEnabled(true);
+        const materialMissing = (0, has_1.default)(concerningMesh.metadata, exports.missingMaterialMetadataName);
+        if (!hasBeenEnabled || !materialMissing)
+            return;
+        // get id of missing material
+        const missingMatId = concerningMesh.metadata[exports.missingMaterialMetadataName];
+        // try to find material on the scene
+        const existingMat = concerningMesh.getScene().getMaterialById(missingMatId);
+        // assign either existing material or freshly created one
+        concerningMesh.material = existingMat || (0, exports.createMaterialFromCbnAssets)(missingMatId, concerningMesh.getScene());
+        // since the material is there now, we do not need the related metadata tag anymore
+        delete concerningMesh.metadata[exports.missingMaterialMetadataName];
+    };
+};
+exports.getMaterialPostLoadObserver = getMaterialPostLoadObserver;
+/**
+ * Internal function that compares the original meshes on a .babylon file with what was loaded,
+ * and tags missing materials with respective metadata on respective meshes.
+ * @param dataParsed original data
+ * @param container  loaded data
+ */
+const addMissingMaterialMetadata = function (dataParsed, container) {
+    container.meshes.forEach(currMeshImported => {
+        var _a, _b;
+        for (const currMeshOriginal of dataParsed.meshes) {
+            if (currMeshOriginal.name !== currMeshImported.name)
+                continue;
+            // we're dealing with the original version of the current imported mesh now
+            const materialOnImportedMesh = (_a = currMeshImported.material) === null || _a === void 0 ? void 0 : _a.id;
+            const materialOnOriginalMesh = currMeshOriginal.materialId;
+            if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh)
+                continue;
+            // if we're here, the imported mesh has different material than original one
+            (_b = window.Cbn) === null || _b === void 0 ? void 0 : _b.Assets.assertMaterialExists(materialOnOriginalMesh);
+            (0, babylonHelper_1.injectNodeMetadata)(currMeshImported, { [exports.missingMaterialMetadataName]: materialOnOriginalMesh }, false);
+            break;
+        }
+    });
+};
+exports.addMissingMaterialMetadata = addMissingMaterialMetadata;
+/**
+ * Adds an "onEnabledStateChanged" observer to the given mesh and all its parents:
+ * The added observer (`getMaterialPostLoadObserver`) handles creation of missing materials once the given node is
+ * enabled.
+ */
+const addMissingMaterialObserver = function (node) {
+    // set the concerning node, i.e. the node the observer should check for missing material.
+    // for instanced meshes, we want the sourcemesh here.
+    const concerningNode = node instanceof instancedMesh_1.InstancedMesh ? node.sourceMesh : node;
+    // observer is pointless if concerning node has no missing material
+    if (!(0, has_1.default)(concerningNode.metadata, exports.missingMaterialMetadataName))
+        return;
+    // for each of our AbstractMeshes, set an observer on the AbstractMesh itself and all of its parents.
+    let currNode = node;
+    while (currNode) {
+        // Note HAR: Using `addOnce` could be wrong in certain situations.
+        // E.g.:
+        //   * 2 meshes `parentMesh` & `parentMesh.concerningMesh`
+        //   * `concerningMesh` is having the missing material flag
+        //   * Both `parentMesh` & `concerningMesh` are disabled
+        //   * `parentMesh` is enabled -> material should **not** be created as `concerningMesh` is still disabled
+        //   * `parentMesh` is disabled
+        //   * `concerningMesh` is enabled -> material should **not** be created as `concerningMesh` is still invisible
+        //     because its `parentMesh` is ATM disabled
+        //   * `parentMesh` & `concerningMesh` are both enable
+        //     -> material should be created as `concerningMesh` is now actually visible but it isn't, as all observers were
+        //        only fired once 🔥
+        //
+        // However: Using `add` instead of `addOnce` requires rather complicated manual clean up work...
+        // add observer. needed only once per node, hence addOnce()
+        node.onEnabledStateChangedObservable.addOnce((0, exports.getMaterialPostLoadObserver)(currNode, concerningNode));
+        // console.log('## observer set on: ' + meshOrInstance.name);
+        currNode = currNode.parent;
+    }
+};
+exports.addMissingMaterialObserver = addMissingMaterialObserver;
+/**
+ * Look up the provided materials (see library import) and create and return one if found.
+ * @param materialId BabylonJs material-id. E.g. 'concrete".
+ * @param scene BabylonJs scene
+ * @returns PBRMaterial | null
+ */
+const createMaterialFromCbnAssets = function (materialId, scene) {
+    var _a;
+    const materialDefinition = (_a = window.Cbn) === null || _a === void 0 ? void 0 : _a.Assets.getMaterial(materialId);
+    // The generic `Material.Parse` actually returns a more specific material like `BABYLON.StandardMaterial`,
+    // `BABYLON.PBRMaterial` or stuff like `BABYLON.PBRMetallicRoughnessMaterial` etc. based on the given `customType`
+    // within the material JSON definition
+    const material = materialDefinition && material_1.Material.Parse(materialDefinition, scene, '');
+    return material || null;
+};
+exports.createMaterialFromCbnAssets = createMaterialFromCbnAssets;
 //# sourceMappingURL=sceneLoaderHelper.js.map

package/dist/lib-cjs/api/util/stringHelper.d.ts

@@ -1,9 +1,9 @@
-/**
- * Creates a random uuidv4.
- */
-declare const uuidv4: () => string;
-/**
- * Converts a string from camel case to snake case.
- */
-declare const camelToSnakeCase: (str: string) => string;
-export { uuidv4, camelToSnakeCase };
+/**
+ * Creates a random uuidv4.
+ */
+declare const uuidv4: () => string;
+/**
+ * Converts a string from camel case to snake case.
+ */
+declare const camelToSnakeCase: (str: string) => string;
+export { uuidv4, camelToSnakeCase };

package/dist/lib-cjs/api/util/stringHelper.js

@@ -1,26 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelToSnakeCase = exports.uuidv4 = void 0;
-/**
- * Creates a random uuidv4.
- */
-const uuidv4 = function () {
-    return ([1e7].toString() + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => {
-        const cNum = parseInt(c);
-        return (cNum ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (cNum / 4)))).toString(16);
-    });
-};
-exports.uuidv4 = uuidv4;
-/**
- * Converts a string from camel case to snake case.
- */
-const camelToSnakeCase = function (str) {
-    return str
-        .replace(/([A-Z])/g, ' $1')
-        .trim()
-        .split(' ')
-        .join('_')
-        .toLowerCase();
-};
-exports.camelToSnakeCase = camelToSnakeCase;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.camelToSnakeCase = exports.uuidv4 = void 0;
+/**
+ * Creates a random uuidv4.
+ */
+const uuidv4 = function () {
+    return ([1e7].toString() + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => {
+        const cNum = parseInt(c);
+        return (cNum ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (cNum / 4)))).toString(16);
+    });
+};
+exports.uuidv4 = uuidv4;
+/**
+ * Converts a string from camel case to snake case.
+ */
+const camelToSnakeCase = function (str) {
+    return str
+        .replace(/([A-Z])/g, ' $1')
+        .trim()
+        .split(' ')
+        .join('_')
+        .toLowerCase();
+};
+exports.camelToSnakeCase = camelToSnakeCase;
 //# sourceMappingURL=stringHelper.js.map

package/dist/lib-cjs/api/util/structureHelper.d.ts

@@ -1,9 +1,9 @@
-import { Mesh } from '@babylonjs/core/Meshes/mesh';
-/**
- * Find out if a mesh is part of a list of excluded geometry
- * @param mesh BJS mesh
- * @param list list of excluded geometry
- * @returns boolean based on whether mesh (or one of its parents) was found in list
- */
-declare const isMeshIncludedInExclusionList: (mesh: Mesh, list: ExcludedGeometryList) => boolean;
-export { isMeshIncludedInExclusionList };
+import { Mesh } from '@babylonjs/core/Meshes/mesh';
+/**
+ * Find out if a mesh is part of a list of excluded geometry
+ * @param mesh BJS mesh
+ * @param list list of excluded geometry
+ * @returns boolean based on whether mesh (or one of its parents) was found in list
+ */
+declare const isMeshIncludedInExclusionList: (mesh: Mesh, list: ExcludedGeometryList) => boolean;
+export { isMeshIncludedInExclusionList };

package/dist/lib-cjs/api/util/structureHelper.js

@@ -1,49 +1,49 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMeshIncludedInExclusionList = void 0;
-const element_1 = require("../classes/element");
-const variant_1 = require("../classes/variant");
-const variantInstance_1 = require("../classes/variantInstance");
-const mesh_1 = require("@babylonjs/core/Meshes/mesh");
-/**
- * Find out if a mesh is part of a list of excluded geometry
- * @param mesh BJS mesh
- * @param list list of excluded geometry
- * @returns boolean based on whether mesh (or one of its parents) was found in list
- */
-const isMeshIncludedInExclusionList = function (mesh, list) {
-    const checkMesh = (inputMesh, meshToCheck) => {
-        return inputMesh.uniqueId === meshToCheck.uniqueId;
-    };
-    const checkElement = (inputEl, meshToCheck) => {
-        return inputEl.meshesFlat.some(m => checkMesh(m, meshToCheck));
-    };
-    const checkVariant = (inputVariant, meshToCheck) => {
-        return inputVariant.elements.some(el => checkElement(el, meshToCheck));
-    };
-    const checkVariantInstance = (inputVarInst, meshToCheck) => {
-        return inputVarInst.variant.elements.some(el => checkElement(el, meshToCheck));
-    };
-    const check = (geometryToExclude, mesh) => {
-        if (geometryToExclude instanceof variantInstance_1.VariantInstance) {
-            return checkVariantInstance(geometryToExclude, mesh);
-        }
-        if (geometryToExclude instanceof variant_1.Variant) {
-            return checkVariant(geometryToExclude, mesh);
-        }
-        if (geometryToExclude instanceof element_1.Element) {
-            return checkElement(geometryToExclude, mesh);
-        }
-        if (geometryToExclude instanceof mesh_1.Mesh) {
-            return checkMesh(geometryToExclude, mesh);
-        }
-        return false;
-    };
-    let isExcluded = list.some(geometryToExclude => check(geometryToExclude, mesh));
-    if (!isExcluded && mesh.parent instanceof mesh_1.Mesh) {
-        isExcluded = isMeshIncludedInExclusionList(mesh.parent, list);
-    }
-    return isExcluded;
-};
-exports.isMeshIncludedInExclusionList = isMeshIncludedInExclusionList;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMeshIncludedInExclusionList = void 0;
+const element_1 = require("../classes/element");
+const variant_1 = require("../classes/variant");
+const variantInstance_1 = require("../classes/variantInstance");
+const mesh_1 = require("@babylonjs/core/Meshes/mesh");
+/**
+ * Find out if a mesh is part of a list of excluded geometry
+ * @param mesh BJS mesh
+ * @param list list of excluded geometry
+ * @returns boolean based on whether mesh (or one of its parents) was found in list
+ */
+const isMeshIncludedInExclusionList = function (mesh, list) {
+    const checkMesh = (inputMesh, meshToCheck) => {
+        return inputMesh.uniqueId === meshToCheck.uniqueId;
+    };
+    const checkElement = (inputEl, meshToCheck) => {
+        return inputEl.meshesFlat.some(m => checkMesh(m, meshToCheck));
+    };
+    const checkVariant = (inputVariant, meshToCheck) => {
+        return inputVariant.elements.some(el => checkElement(el, meshToCheck));
+    };
+    const checkVariantInstance = (inputVarInst, meshToCheck) => {
+        return inputVarInst.variant.elements.some(el => checkElement(el, meshToCheck));
+    };
+    const check = (geometryToExclude, mesh) => {
+        if (geometryToExclude instanceof variantInstance_1.VariantInstance) {
+            return checkVariantInstance(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof variant_1.Variant) {
+            return checkVariant(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof element_1.Element) {
+            return checkElement(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof mesh_1.Mesh) {
+            return checkMesh(geometryToExclude, mesh);
+        }
+        return false;
+    };
+    let isExcluded = list.some(geometryToExclude => check(geometryToExclude, mesh));
+    if (!isExcluded && mesh.parent instanceof mesh_1.Mesh) {
+        isExcluded = isMeshIncludedInExclusionList(mesh.parent, list);
+    }
+    return isExcluded;
+};
+exports.isMeshIncludedInExclusionList = isMeshIncludedInExclusionList;
 //# sourceMappingURL=structureHelper.js.map

package/dist/lib-cjs/buildinfo.json

@@ -1,3 +1,3 @@
-{
-    "version": "6.1.0"
-}
+{
+    "version": "6.2.0"
+}