@combeenation/3d-viewer 5.1.0-rc3 → 5.1.0-rc4

package/dist/lib-es6/api/util/resourceHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resourceHelper.js","sourceRoot":"","sources":["../../../../src/api/util/resourceHelper.ts"],"names":[],"mappings":"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"}

package/dist/lib-es6/api/util/sceneLoaderHelper.d.ts

@@ -0,0 +1,35 @@
+import { Scene } from '@babylonjs/core/scene';
+import { ISceneLoaderPlugin } from '@babylonjs/core/Loading/sceneLoader';
+import { Material } from '@babylonjs/core/Materials/material';
+import { Node as BjsNode } from '@babylonjs/core/node';
+declare const 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()
+ */
+declare const getCustomCbnBabylonLoaderPlugin: (previousLoaderPlugin: ISceneLoaderPlugin) => ISceneLoaderPlugin;
+/**
+ * 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
+ */
+declare const getMaterialPostLoadObserver: (targetMeshOrInstance: AbstractMesh, concerningMesh: Mesh) => (_eventData: any, _eventState: any) => void;
+/**
+ * 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.
+ */
+declare const addMissingMaterialObserver: (node: BjsNode) => void;
+/**
+ * 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
+ */
+export declare const getMaterialFromCbnAssets: (materialId: string, scene: Scene) => Material | null;
+export { getCustomCbnBabylonLoaderPlugin, getMaterialPostLoadObserver, missingMaterialMetadataName, addMissingMaterialObserver, };

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

@@ -0,0 +1,134 @@
+import { injectNodeMetadata } from './babylonHelper';
+import has from 'lodash-es/has';
+import { Material } from '@babylonjs/core/Materials/material';
+import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
+var 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()
+ */
+var getCustomCbnBabylonLoaderPlugin = function (previousLoaderPlugin) {
+    var customLoader = {
+        name: 'cbnCustomBabylonLoader',
+        extensions: '.babylon',
+        importMesh: previousLoaderPlugin.importMesh,
+        load: previousLoaderPlugin.load,
+        loadAssetContainer: function (scene, data, rootUrl, onError) {
+            //* 1) --- manipulate ORIGINAL data
+            var dataParsed = JSON.parse(data);
+            //* 2) --- call default (non-custom) loading method
+            var importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
+            //* 3) --- manipulate IMPORTED data
+            addMissingMaterialMetadata(dataParsed, importedContainer);
+            //* 4) --- return imported data
+            return importedContainer;
+        },
+    };
+    return customLoader;
+};
+/**
+ * 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
+ */
+var getMaterialPostLoadObserver = function (targetMeshOrInstance, concerningMesh) {
+    return function (_eventData, _eventState) {
+        var hasBeenEnabled = concerningMesh.isEnabled(true);
+        var materialMissing = has(concerningMesh.metadata, missingMaterialMetadataName);
+        if (!hasBeenEnabled || !materialMissing)
+            return;
+        // get id of missing material
+        var missingMatId = concerningMesh.metadata[missingMaterialMetadataName];
+        // try to find material on the scene
+        var existingMat = concerningMesh.getScene().getMaterialById(missingMatId);
+        // assign either existing material or freshly created one
+        concerningMesh.material = existingMat || getMaterialFromCbnAssets(missingMatId, concerningMesh.getScene());
+        // since the material is there now, we do not need the related metadata tag anymore
+        delete concerningMesh.metadata[missingMaterialMetadataName];
+    };
+};
+/**
+ * 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
+ */
+var addMissingMaterialMetadata = function (dataParsed, container) {
+    container.meshes.forEach(function (currMeshImported) {
+        var _a;
+        var _b, _c;
+        for (var _i = 0, _d = dataParsed.meshes; _i < _d.length; _i++) {
+            var currMeshOriginal = _d[_i];
+            if (currMeshOriginal.name !== currMeshImported.name)
+                continue;
+            // we're dealing with the original version of the current imported mesh now
+            var materialOnImportedMesh = (_b = currMeshImported.material) === null || _b === void 0 ? void 0 : _b.id;
+            var materialOnOriginalMesh = currMeshOriginal.materialId;
+            if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh)
+                continue;
+            // TODO: Just for easier debugging. Remove before publishment...
+            console.info("Adding \"" + missingMaterialMetadataName + "\" info on mesh \"" + currMeshOriginal.name + "\" with material \"" + currMeshOriginal.materialId + "\"");
+            // if we're here, the imported mesh has different material than original one
+            (_c = window.Cbn) === null || _c === void 0 ? void 0 : _c.Assets.assertMaterialExists(materialOnOriginalMesh);
+            injectNodeMetadata(currMeshImported, (_a = {}, _a[missingMaterialMetadataName] = materialOnOriginalMesh, _a), false);
+            break;
+        }
+    });
+};
+/**
+ * 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.
+ */
+var 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.
+    var concerningNode = node instanceof InstancedMesh ? node.sourceMesh : node;
+    // observer is pointless if concerning node has no missing material
+    if (!has(concerningNode.metadata, missingMaterialMetadataName))
+        return;
+    // for each of our AbstractMeshes, set an observer on the AbstractMesh itself and all of its parents.
+    var 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(getMaterialPostLoadObserver(currNode, concerningNode));
+        // console.log('## observer set on: ' + meshOrInstance.name);
+        currNode = currNode.parent;
+    }
+};
+/**
+ * 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
+ */
+export var getMaterialFromCbnAssets = function (materialId, scene) {
+    var _a;
+    var 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
+    var material = materialDefinition && Material.Parse(materialDefinition, scene, '');
+    return material || null;
+};
+export { getCustomCbnBabylonLoaderPlugin, getMaterialPostLoadObserver, missingMaterialMetadataName, addMissingMaterialObserver, };
+//# sourceMappingURL=sceneLoaderHelper.js.map

package/dist/lib-es6/api/util/sceneLoaderHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sceneLoaderHelper.js","sourceRoot":"","sources":["../../../../src/api/util/sceneLoaderHelper.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -0,0 +1,22 @@
+/**
+ * Creates a random uuidv4.
+ */
+var uuidv4 = function () {
+    // @ts-ignore
+    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, function (c) {
+        return (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16);
+    });
+};
+/**
+ * Converts a string from camel case to snake case.
+ */
+var camelToSnakeCase = function (str) {
+    return str
+        .replace(/([A-Z])/g, ' $1')
+        .trim()
+        .split(' ')
+        .join('_')
+        .toLowerCase();
+};
+export { uuidv4, camelToSnakeCase };
+//# sourceMappingURL=stringHelper.js.map

package/dist/lib-es6/api/util/stringHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stringHelper.js","sourceRoot":"","sources":["../../../../src/api/util/stringHelper.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,IAAM,MAAM,GAAG;IACb,aAAa;IACb,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAA,CAAC;QAC7D,OAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;IAAnF,CAAmF,CACpF,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,IAAM,gBAAgB,GAAG,UAAU,GAAW;IAC5C,OAAO,GAAG;SACP,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1B,IAAI,EAAE;SACN,KAAK,CAAC,GAAG,CAAC;SACV,IAAI,CAAC,GAAG,CAAC;SACT,WAAW,EAAE,CAAC;AACnB,CAAC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC"}

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

@@ -0,0 +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 };

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

@@ -0,0 +1,46 @@
+import { Mesh } from '@babylonjs/core/Meshes/mesh';
+import { Variant } from '../classes/variant';
+import { VariantInstance } from '../classes/variantInstance';
+import { Element } from '../classes/element';
+/**
+ * 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
+ */
+var isMeshIncludedInExclusionList = function (mesh, list) {
+    var checkMesh = function (inputMesh, meshToCheck) {
+        return inputMesh.uniqueId === meshToCheck.uniqueId;
+    };
+    var checkElement = function (inputEl, meshToCheck) {
+        return inputEl.meshesFlat.some(function (m) { return checkMesh(m, meshToCheck); });
+    };
+    var checkVariant = function (inputVariant, meshToCheck) {
+        return inputVariant.elements.some(function (el) { return checkElement(el, meshToCheck); });
+    };
+    var checkVariantInstance = function (inputVarInst, meshToCheck) {
+        return inputVarInst.variant.elements.some(function (el) { return checkElement(el, meshToCheck); });
+    };
+    var check = function (geometryToExclude, mesh) {
+        if (geometryToExclude instanceof VariantInstance) {
+            return checkVariantInstance(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof Variant) {
+            return checkVariant(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof Element) {
+            return checkElement(geometryToExclude, mesh);
+        }
+        if (geometryToExclude instanceof Mesh) {
+            return checkMesh(geometryToExclude, mesh);
+        }
+        return false;
+    };
+    var isExcluded = list.some(function (geometryToExclude) { return check(geometryToExclude, mesh); });
+    if (!isExcluded && mesh.parent instanceof Mesh) {
+        isExcluded = isMeshIncludedInExclusionList(mesh.parent, list);
+    }
+    return isExcluded;
+};
+export { isMeshIncludedInExclusionList };
+//# sourceMappingURL=structureHelper.js.map

package/dist/lib-es6/api/util/structureHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;;;;GAKG;AACH,IAAM,6BAA6B,GAAG,UAAU,IAAU,EAAE,IAA0B;IACpF,IAAM,SAAS,GAAG,UAAC,SAAe,EAAE,WAAiB;QACnD,OAAO,SAAS,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC;IACrD,CAAC,CAAC;IACF,IAAM,YAAY,GAAG,UAAC,OAAgB,EAAE,WAAiB;QACvD,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,EAAzB,CAAyB,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,IAAM,YAAY,GAAG,UAAC,YAAqB,EAAE,WAAiB;QAC5D,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAA,EAAE,IAAI,OAAA,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,EAA7B,CAA6B,CAAC,CAAC;IACzE,CAAC,CAAC;IACF,IAAM,oBAAoB,GAAG,UAAC,YAA6B,EAAE,WAAiB;QAC5E,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAA,EAAE,IAAI,OAAA,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,EAA7B,CAA6B,CAAC,CAAC;IACjF,CAAC,CAAC;IACF,IAAM,KAAK,GAAG,UAAC,iBAAmC,EAAE,IAAU;QAC5D,IAAI,iBAAiB,YAAY,eAAe,EAAE;YAChD,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SACtD;QACD,IAAI,iBAAiB,YAAY,OAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,OAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,IAAI,EAAE;YACrC,OAAO,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAA,iBAAiB,IAAI,OAAA,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAA9B,CAA8B,CAAC,CAAC;IAChF,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,YAAY,IAAI,EAAE;QAC9C,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,OAAO,EAAE,6BAA6B,EAAE,CAAC"}

package/dist/lib-es6/buildinfo.json

@@ -0,0 +1,3 @@
+{
+    "version": "5.1.0-rc3"
+}

package/dist/lib-es6/index.d.ts

@@ -0,0 +1,49 @@
+/// <reference path="api/util/globalTypes.d.ts" />
+import { Animation as BabylonAnimation } from '@babylonjs/core/Animations/animation';
+import { ArcRotateCamera } from '@babylonjs/core/Cameras/arcRotateCamera';
+import { Engine } from '@babylonjs/core/Engines/engine';
+import { DirectionalLight } from '@babylonjs/core/Lights/directionalLight';
+import { HemisphericLight } from '@babylonjs/core/Lights/hemisphericLight';
+import { Material } from '@babylonjs/core/Materials/material';
+import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
+import { StandardMaterial } from '@babylonjs/core/Materials/standardMaterial';
+import { CubeTexture } from '@babylonjs/core/Materials/Textures/cubeTexture';
+import { DynamicTexture } from '@babylonjs/core/Materials/Textures/dynamicTexture';
+import { Texture } from '@babylonjs/core/Materials/Textures/texture';
+import { Color3, Color4 } from '@babylonjs/core/Maths/math.color';
+import { Vector3 } from '@babylonjs/core/Maths/math.vector';
+import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
+import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
+import { Mesh } from '@babylonjs/core/Meshes/mesh';
+import { MeshBuilder } from '@babylonjs/core/Meshes/meshBuilder';
+import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
+import { Node } from '@babylonjs/core/node';
+/**
+ * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
+ * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
+ * version of the viewer (e.g. when pulling it from NPM etc.)...
+ */
+import '@babylonjs/core/Rendering/boundingBoxRenderer';
+import { Scene } from '@babylonjs/core/scene';
+import { Parameterizable } from './api/classes/parameterizable';
+import { VariantParameterizable } from './api/classes/variantParameterizable';
+import { EventEmitter } from 'eventemitter3';
+import { Element } from './api/classes/element';
+import { emitter, Event } from './api/classes/event';
+import { EventBroadcaster } from './api/classes/eventBroadcaster';
+import { Parameter } from './api/classes/parameter';
+import { ParameterObservable } from './api/classes/parameterObservable';
+import { PlacementAnimation } from './api/classes/placementAnimation';
+import { Variant } from './api/classes/variant';
+import { VariantInstance } from './api/classes/variantInstance';
+import { Viewer } from './api/classes/viewer';
+import { ViewerLight } from './api/classes/viewerLight';
+import { AnimationManager } from './api/manager/animationManager';
+import { SceneManager } from './api/manager/sceneManager';
+import { VariantInstanceManager } from './api/manager/variantInstanceManager';
+import { GltfExportManager } from './api/manager/gltfExportManager';
+import * as BabylonHelper from './api/util/babylonHelper';
+/**
+ * Expose some frequently used babylon modules by our consumers.
+ */
+export { AnimationManager, Variant, VariantInstanceManager, Viewer, ParameterObservable, Parameterizable, VariantParameterizable, ViewerLight, emitter as Emitter, EventEmitter, Event, Parameter, VariantInstance, Color3, Color4, Vector3, AbstractMesh, InstancedMesh, Mesh, TransformNode, Node, Material, PBRMaterial, StandardMaterial, Scene, Engine, ArcRotateCamera, DynamicTexture, CubeTexture, MeshBuilder, Texture, BabylonAnimation, HemisphericLight, DirectionalLight, Element, EventBroadcaster, SceneManager, PlacementAnimation, BabylonHelper, GltfExportManager, };

package/dist/lib-es6/index.js

@@ -0,0 +1,51 @@
+/// <reference path="api/util/globalTypes.ts" />
+/// <reference types="gsap" />
+import { Animation as BabylonAnimation } from '@babylonjs/core/Animations/animation';
+import { ArcRotateCamera } from '@babylonjs/core/Cameras/arcRotateCamera';
+import { Engine } from '@babylonjs/core/Engines/engine';
+import { DirectionalLight } from '@babylonjs/core/Lights/directionalLight';
+import { HemisphericLight } from '@babylonjs/core/Lights/hemisphericLight';
+import { Material } from '@babylonjs/core/Materials/material';
+import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
+import { StandardMaterial } from '@babylonjs/core/Materials/standardMaterial';
+import { CubeTexture } from '@babylonjs/core/Materials/Textures/cubeTexture';
+import { DynamicTexture } from '@babylonjs/core/Materials/Textures/dynamicTexture';
+import { Texture } from '@babylonjs/core/Materials/Textures/texture';
+import { Color3, Color4 } from '@babylonjs/core/Maths/math.color';
+import { Vector3 } from '@babylonjs/core/Maths/math.vector';
+import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
+import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
+import { Mesh } from '@babylonjs/core/Meshes/mesh';
+import { MeshBuilder } from '@babylonjs/core/Meshes/meshBuilder';
+import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
+import { Node } from '@babylonjs/core/node';
+/**
+ * Without explicitly importing the "BoundingBoxRenderer", we're getting "scene.getBoundingBoxRenderer is undefined"
+ * errors when creating HighlightLayer instances. Not sure why but those errors only happen when using the built
+ * version of the viewer (e.g. when pulling it from NPM etc.)...
+ */
+import '@babylonjs/core/Rendering/boundingBoxRenderer';
+import { Scene } from '@babylonjs/core/scene';
+import { Parameterizable } from './api/classes/parameterizable';
+import { VariantParameterizable } from './api/classes/variantParameterizable';
+import { EventEmitter } from 'eventemitter3';
+import { Element } from './api/classes/element';
+import { emitter, Event } from './api/classes/event';
+import { EventBroadcaster } from './api/classes/eventBroadcaster';
+import { Parameter } from './api/classes/parameter';
+import { ParameterObservable } from './api/classes/parameterObservable';
+import { PlacementAnimation } from './api/classes/placementAnimation';
+import { Variant } from './api/classes/variant';
+import { VariantInstance } from './api/classes/variantInstance';
+import { Viewer } from './api/classes/viewer';
+import { ViewerLight } from './api/classes/viewerLight';
+import { AnimationManager } from './api/manager/animationManager';
+import { SceneManager } from './api/manager/sceneManager';
+import { VariantInstanceManager } from './api/manager/variantInstanceManager';
+import { GltfExportManager } from './api/manager/gltfExportManager';
+import * as BabylonHelper from './api/util/babylonHelper';
+/**
+ * Expose some frequently used babylon modules by our consumers.
+ */
+export { AnimationManager, Variant, VariantInstanceManager, Viewer, ParameterObservable, Parameterizable, VariantParameterizable, ViewerLight, emitter as Emitter, EventEmitter, Event, Parameter, VariantInstance, Color3, Color4, Vector3, AbstractMesh, InstancedMesh, Mesh, TransformNode, Node, Material, PBRMaterial, StandardMaterial, Scene, Engine, ArcRotateCamera, DynamicTexture, CubeTexture, MeshBuilder, Texture, BabylonAnimation, HemisphericLight, DirectionalLight, Element, EventBroadcaster, SceneManager, PlacementAnimation, BabylonHelper, GltfExportManager, };
+//# sourceMappingURL=index.js.map

package/dist/lib-es6/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@combeenation/3d-viewer",
   "description": "Combeenation 3D Viewer",
-  "version": "5.1.0-rc3",
+  "version": "5.1.0-rc4",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "keywords": [],
   "author": "",
@@ -39,14 +39,14 @@
     "pub-alpha": "npm run dist-cjs && npm publish --tag alpha",
     "pub-beta": "npm run dist-cjs && npm publish --tag beta",
     "pub-rc": "npm run dist-cjs && npm publish --tag rc",
-    "pack": "npm run dist-cjs && npm pack",
+    "pack": "npm run dist-cjs && npm pack --pack-destination=\"/mnt/c/Data/dev/custom-js/MichaelTest/PbrAssetTest\"",
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@babylonjs/core": "5.6.0",
-    "@babylonjs/loaders": "5.6.0",
-    "@babylonjs/materials": "5.6.0",
-    "@babylonjs/serializers": "5.6.0",
+    "@babylonjs/core": "5.21.0",
+    "@babylonjs/loaders": "5.21.0",
+    "@babylonjs/materials": "5.21.0",
+    "@babylonjs/serializers": "5.21.0",
     "eventemitter3": "^4.0.0",
     "gsap": "^3.5.1",
     "lodash-es": "^4.17.15"

package/src/api/classes/element.ts

@@ -36,9 +36,7 @@ import { VariantParameterizable } from './../classes/variantParameterizable';
 import { DottedPath } from './dottedPath';
 import { Parameter } from './parameter';
 import { Variant } from './variant';
-import { getMaterialPostLoadObserver, missingMaterialMetadataName } from '../util/sceneLoaderHelper';
-import { Nullable } from '@babylonjs/core/types';
-import { Node as BjsNode } from '@babylonjs/core/node'; //! overload DOM API Node due to name-clash with BJS
+import { addMissingMaterialObserver } from '../util/sceneLoaderHelper';
 
 /**
  * An {@link Element} of a {@link Variant}. Acts as a container for diverse definitions. Lives only in the context of a
@@ -374,24 +372,7 @@ export class Element extends VariantParameterizable {
    */
   protected addMissingMaterialObservers() {
     for (const abstractMesh of this.abstractMeshesFlat) {
-      // set the concerning mesh, i.e. the mesh the observer should check for missing material.
-      // for instances, we want the sourcemesh here.
-      const concerningMesh = abstractMesh instanceof InstancedMesh ? abstractMesh.sourceMesh : (abstractMesh as Mesh);
-
-      // observer is pointless if concerning mesh has no missing material
-      if (!has(concerningMesh.metadata, missingMaterialMetadataName)) continue;
-
-      // for each of our AbstractMeshes, set an observer on the AbstractMesh itself,
-      // but also on all of its parents.
-      let currNode: Nullable<BjsNode> = abstractMesh as BjsNode;
-      while (currNode) {
-        // add observer. needed only once per node, hence addOnce()
-        abstractMesh.onEnabledStateChangedObservable.addOnce(
-          getMaterialPostLoadObserver(currNode as AbstractMesh, concerningMesh)
-        );
-        // console.log('## observer set on: ' + meshOrInstance.name);
-        currNode = currNode.parent;
-      }
+      addMissingMaterialObserver(abstractMesh);
     }
   }
 
@@ -458,7 +439,7 @@ export class Element extends VariantParameterizable {
     ]);
     this._parameterObservers.set(Parameter.MATERIAL, [
       async (element: Element, oldValue: ParameterValue, newValue: ParameterValue) => {
-        const material = element.variant.getMaterial(newValue.toString());
+        const materialName = newValue.toString();
         element.nodes.forEach(node => {
           assertTransformNode(node, (node: AbstractMesh) => {
             if (node instanceof InstancedMesh) {
@@ -469,7 +450,7 @@ export class Element extends VariantParameterizable {
               );
             }
           });
-          setMaterial(node, material);
+          setMaterial(element.variant, node, materialName);
         });
       },
     ]);

package/src/api/classes/variant.ts

@@ -728,9 +728,9 @@ export class Variant extends Parameterizable {
   protected async commitParameterToElements(parameter: string, value: ParameterValue): Promise<Variant> {
     const promises = [];
     for (const element of this.elements) {
-      const elementVisibleParamPath = DottedPath.create([element.name, Parameter.VISIBLE]).toString();
-      const elementIsHiddenViaParams = this.inheritedParameters[elementVisibleParamPath] === false;
+      const paramShowsElement = Parameter.VISIBLE === parameter && value;
 
+      // Fixes https://combeenation.youtrack.cloud/issue/CB-7773
       // Don't enable/show the variants element if it is explicitly hidden via its element parameters.
       // E.g. via spec:
       // ```
@@ -747,7 +747,26 @@ export class Variant extends Parameterizable {
       //   }
       // }
       // ```
-      if (Parameter.VISIBLE === parameter && value && elementIsHiddenViaParams) continue;
+      const elementVisibleParamPath = DottedPath.create([element.name, Parameter.VISIBLE]).toString();
+      const elementIsHiddenViaParams = this.inheritedParameters[elementVisibleParamPath] === false;
+      if (paramShowsElement && elementIsHiddenViaParams) continue;
+
+      // To discuss: Is this a viable solution or is it too hacky to apply the elements material param, when the param
+      //             at hand is actually the visible param?
+      // Fixes https://combeenation.youtrack.cloud/issue/CB-7809
+      // Apply element material before showing the element to prevent loading of the elements "original" material which
+      // is never shown when "overwritten" by elements material param.
+      const elementMaterialParamPath = DottedPath.create([element.name, Parameter.MATERIAL]).toString();
+      const elementMaterialParamValue = this.inheritedParameters[elementMaterialParamPath];
+      if (paramShowsElement && elementMaterialParamValue) {
+        // To discuss: Should we rather use `this.commitParametersToElements` here?
+        //             I'm not really sure about the actual differences, both seem to do the job 🤷‍♂️
+        // To discuss: Should we actively `await` this (as is) or should we also push the resulting promise into the
+        //             `promises` array as dome some lines below?
+        //             I wasn't sure whether not awaiting this could result in "not guaranteed application order" of
+        //             new visibility & material param value...
+        await element.commitParameter(Parameter.MATERIAL, elementMaterialParamValue);
+      }
 
       promises.push(element.commitParameter(parameter, value));
     }

package/src/api/util/babylonHelper.ts

@@ -21,7 +21,7 @@ import { Nullable } from '@babylonjs/core/types';
 import { defaultEnvHelperColor, defaultSceneClearColor } from '../internal/sceneSetup';
 import { cloneDeep, get, has, merge } from 'lodash-es';
 import { DottedPath } from '../classes/dottedPath';
-import { missingMaterialMetadataName } from './sceneLoaderHelper';
+import { addMissingMaterialObserver, missingMaterialMetadataName } from './sceneLoaderHelper';
 
 const backgroundDomeName = 'BackgroundDome_ViewerGenerated';
 const envHelperMetadataName = 'viewerEnvHelper';
@@ -362,18 +362,28 @@ const changeEnvironment = function (scene: Scene, envDef: EnvironmentDefinition)
 
 /**
  * @param node
- * @param material
+ * @param materialName
  * @param deep
  */
-const setMaterial = function (node: TransformNode, material: Material, deep: boolean = true) {
+const setMaterial = function (variant: Variant, node: TransformNode, materialName: string, deep: boolean = true) {
   if (node instanceof AbstractMesh) {
-    node.material = material;
-    if (has(node.metadata, missingMaterialMetadataName)) {
-      delete node.metadata[missingMaterialMetadataName];
+    const hasMissingMaterial = has(node.metadata, missingMaterialMetadataName);
+    if (node.isEnabled()) {
+      node.material = variant.getMaterial(materialName);
+      if (hasMissingMaterial) {
+        delete node.metadata[missingMaterialMetadataName];
+      }
+    } else {
+      injectNodeMetadata(node, { [missingMaterialMetadataName]: materialName }, false);
+
+      // If it already had the missing material flag before, there already exists an observer...
+      if (!hasMissingMaterial) {
+        addMissingMaterialObserver(node);
+      }
     }
   }
   if (deep) {
-    node.getChildTransformNodes(true).forEach(child => setMaterial(child, material, deep));
+    node.getChildTransformNodes(true).forEach(child => setMaterial(variant, child, materialName, deep));
   }
 };