@combeenation/3d-viewer 8.0.0 → 8.1.0-alpha1

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

@@ -250,7 +250,7 @@ declare type ScreenshotSettings = {
 /**
  * Use this to define geometry to be excluded from autofocus, GLB export, etc.
  */
-declare type ExcludedGeometry = Mesh | AbstractMesh | VariantInstance | Variant | VariantElement | Node | TagManagerSubject;
+declare type ExcludedGeometry = TransformNode | VariantInstance | Variant | VariantElement | TagManagerSubject;
 declare type ExcludedGeometryList = ExcludedGeometry[];
 declare type AutofocusSettings = {
     /**
@@ -327,7 +327,6 @@ declare type VariantInstanceDefinition = {
     name?: string;
     variant: DottedPathArgument;
     parameters?: ParameterBag;
-    tagManagerParameterValues?: TagManagerParameterValue[];
     lazy?: boolean;
 };
 declare type SetupJson = {
@@ -350,7 +349,7 @@ declare type ParsedParameterBag = {
 };
 declare type DottedPathArgument = string | string[] | DottedPath;
 declare type ParameterObserverResult = boolean | void;
-declare type ParameterObserver = (payload: any, oldValue: Undefinable<ParameterValue>, newValue: ParameterValue) => Promise<ParameterObserverResult>;
+declare type ParameterObserver = (object: any, oldValue: Undefinable<ParameterValue>, newValue: ParameterValue) => Promise<ParameterObserverResult>;
 declare type PlacementDefinitions = {
     [name: string]: PlacementDefinition;
 };
@@ -425,26 +424,39 @@ declare type TagMapping = {
 declare type TagManagerSubject = {
     tagName?: string;
     nodeName?: string;
+    materialName?: string;
 };
+declare type TagManagerParameterObserverResult = ParameterObserverResult;
 /**
  * The observer should return `false` in cases where the given value was not actually applied. E.g. when wanting to
  * apply a property on the given `node`s material which doesn't exist at the time the observer is called etc.
  */
-declare type TagManagerParameterObserver = (payload: TagManagerParameterObserverPayload) => Promise<ParameterObserverResult>;
+declare type TagManagerParameterObserver = (payload: TagManagerParameterObserverPayload) => Promise<TagManagerParameterObserverResult>;
 declare type TagManagerParameterBag = FuzzyMap<TagManagerSubject, ParameterBag>;
 declare type TagManagerParameterObserverBag = Map<string, TagManagerParameterObserver>;
 declare type TagManagerParameterObserverPayload = {
     subject: TagManagerSubject;
     nodes: TransformNode[];
+    materials: Material[];
     newValue: ParameterValue;
     oldValue: Undefinable<ParameterValue>;
 };
 declare type TagManagerParameterValue = {
     tagName?: string;
     nodeName?: string;
+    materialName?: string;
     parameterName: string;
     value: ParameterValue;
 };
+declare type TagManagerParameterObserverResultBag = {
+    subject: TagManagerSubject;
+    parameter: string;
+    nodes: TransformNode[];
+    materials: Material[];
+    oldValue: ParameterValue;
+    newValue: ParameterValue;
+    parameterObserverResult: TagManagerParameterObserverResult;
+};
 declare type NodeNamingStrategyPayload = {
     variantInstance: VariantInstance;
     variant: Variant;

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

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

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

@@ -1,58 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMeshIncludedInExclusionList = void 0;
+exports.isNodeIncludedInExclusionList = 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");
+const gltfExportManager_1 = require("../manager/gltfExportManager");
+const transformNode_1 = require("@babylonjs/core/Meshes/transformNode");
 const tags_1 = require("@babylonjs/core/Misc/tags");
 /**
- * Find out if a mesh is part of a list of excluded geometry
- * @param mesh BJS mesh
+ * Find out if a node is part of a list of excluded geometry
+ * @param node BJS node
  * @param list list of excluded geometry
- * @returns boolean based on whether mesh (or one of its parents) was found in list
+ * @returns boolean based on whether node (or one of its parents) was found in list
  */
-const isMeshIncludedInExclusionList = function (mesh, list) {
-    const checkMesh = (inputMesh, meshToCheck) => {
-        return inputMesh.uniqueId === meshToCheck.uniqueId;
+const isNodeIncludedInExclusionList = function (node, list) {
+    const checkNode = (inputNode, nodeToCheck) => {
+        return inputNode.uniqueId === nodeToCheck.uniqueId;
     };
-    const checkElement = (inputEl, meshToCheck) => {
-        return inputEl.meshesFlat.some(m => checkMesh(m, meshToCheck));
+    const checkElement = (inputEl, nodeToCheck) => {
+        return inputEl.nodesFlat.some(m => checkNode(m, nodeToCheck));
     };
-    const checkVariant = (inputVariant, meshToCheck) => {
-        return inputVariant.elements.some(el => checkElement(el, meshToCheck));
+    const checkVariant = (inputVariant, nodeToCheck) => {
+        return inputVariant.elements.some(el => checkElement(el, nodeToCheck));
     };
-    const checkVariantInstance = (inputVarInst, meshToCheck) => {
-        return inputVarInst.variant.elements.some(el => checkElement(el, meshToCheck));
+    const checkVariantInstance = (inputVarInst, nodeToCheck) => {
+        return inputVarInst.variant.elements.some(el => checkElement(el, nodeToCheck));
     };
-    const checkTagManagerSubject = (inputSubject, meshToCheck) => {
-        const nameMatches = inputSubject.nodeName && inputSubject.nodeName === meshToCheck.name;
-        const tagMatches = inputSubject.tagName && tags_1.Tags.MatchesQuery(mesh, inputSubject.tagName);
+    const checkTagManagerSubject = (inputSubject, nodeToCheck) => {
+        var _a, _b;
+        const nodeName = (_b = (_a = nodeToCheck.metadata) === null || _a === void 0 ? void 0 : _a[gltfExportManager_1.GltfExportManager.NAME_BEFORE_EXPORT_METADATA_PROPERTY]) !== null && _b !== void 0 ? _b : nodeToCheck.name;
+        const nameMatches = inputSubject.nodeName && inputSubject.nodeName === nodeName;
+        const tagMatches = inputSubject.tagName && tags_1.Tags.MatchesQuery(nodeToCheck, inputSubject.tagName);
         return nameMatches || tagMatches;
     };
-    const check = (geometryToExclude, mesh) => {
+    const check = (geometryToExclude, node) => {
         if (geometryToExclude instanceof variantInstance_1.VariantInstance) {
-            return checkVariantInstance(geometryToExclude, mesh);
+            return checkVariantInstance(geometryToExclude, node);
         }
         if (geometryToExclude instanceof variant_1.Variant) {
-            return checkVariant(geometryToExclude, mesh);
+            return checkVariant(geometryToExclude, node);
         }
         if (geometryToExclude instanceof element_1.Element) {
-            return checkElement(geometryToExclude, mesh);
+            return checkElement(geometryToExclude, node);
         }
-        if (geometryToExclude instanceof mesh_1.Mesh) {
-            return checkMesh(geometryToExclude, mesh);
+        if (geometryToExclude instanceof transformNode_1.TransformNode) {
+            return checkNode(geometryToExclude, node);
         }
         if (geometryToExclude.tagName || geometryToExclude.nodeName) {
-            return checkTagManagerSubject(geometryToExclude, mesh);
+            return checkTagManagerSubject(geometryToExclude, node);
         }
         return false;
     };
-    let isExcluded = list.some(geometryToExclude => check(geometryToExclude, mesh));
-    if (!isExcluded && mesh.parent instanceof mesh_1.Mesh) {
-        isExcluded = isMeshIncludedInExclusionList(mesh.parent, list);
+    let isExcluded = list.some(geometryToExclude => check(geometryToExclude, node));
+    if (!isExcluded && node.parent instanceof transformNode_1.TransformNode) {
+        isExcluded = isNodeIncludedInExclusionList(node.parent, list);
     }
     return isExcluded;
 };
-exports.isMeshIncludedInExclusionList = isMeshIncludedInExclusionList;
+exports.isNodeIncludedInExclusionList = isNodeIncludedInExclusionList;
 //# sourceMappingURL=structureHelper.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,gDAA6C;AAC7C,gEAA6D;AAC7D,sDAAmD;AACnD,oDAAiD;AAEjD;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,UAAU,IAAU,EAAE,IAA0B;IACpF,MAAM,SAAS,GAAG,CAAC,SAAe,EAAE,WAAiB,EAAE,EAAE;QACvD,OAAO,SAAS,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC;IACrD,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,WAAiB,EAAE,EAAE;QAC3D,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,YAAqB,EAAE,WAAiB,EAAE,EAAE;QAChE,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;IACF,MAAM,oBAAoB,GAAG,CAAC,YAA6B,EAAE,WAAiB,EAAE,EAAE;QAChF,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IACF,MAAM,sBAAsB,GAAG,CAAC,YAA+B,EAAE,WAAiB,EAAE,EAAE;QACpF,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,KAAK,WAAW,CAAC,IAAI,CAAC;QACxF,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,IAAI,WAAI,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QACzF,OAAO,WAAW,IAAI,UAAU,CAAC;IACnC,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,iBAAmC,EAAE,IAAU,EAAE,EAAE;QAChE,IAAI,iBAAiB,YAAY,iCAAe,EAAE;YAChD,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SACtD;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,WAAI,EAAE;YACrC,OAAO,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,IAAK,iBAAuC,CAAC,OAAO,IAAK,iBAAuC,CAAC,QAAQ,EAAE;YACzG,OAAO,sBAAsB,CAAC,iBAAsC,EAAE,IAAI,CAAC,CAAC;SAC7E;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IAChF,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,YAAY,WAAI,EAAE;QAC9C,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEO,sEAA6B"}
+{"version":3,"file":"structureHelper.js","sourceRoot":"","sources":["../../../../src/api/util/structureHelper.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,gDAA6C;AAC7C,gEAA6D;AAC7D,oEAAiE;AACjE,wEAAqE;AACrE,oDAAiD;AAEjD;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,UAAU,IAAmB,EAAE,IAA0B;IAC7F,MAAM,SAAS,GAAG,CAAC,SAAwB,EAAE,WAA0B,EAAE,EAAE;QACzE,OAAO,SAAS,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC;IACrD,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,WAA0B,EAAE,EAAE;QACpE,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IAChE,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,YAAqB,EAAE,WAA0B,EAAE,EAAE;QACzE,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;IACF,MAAM,oBAAoB,GAAG,CAAC,YAA6B,EAAE,WAA0B,EAAE,EAAE;QACzF,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IACF,MAAM,sBAAsB,GAAG,CAAC,YAA+B,EAAE,WAA0B,EAAE,EAAE;;QAC7F,MAAM,QAAQ,GAAG,MAAA,MAAA,WAAW,CAAC,QAAQ,0CAAG,qCAAiB,CAAC,oCAAoC,CAAC,mCAAI,WAAW,CAAC,IAAI,CAAC;QACpH,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAC;QAChF,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,IAAI,WAAI,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QAChG,OAAO,WAAW,IAAI,UAAU,CAAC;IACnC,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,iBAAmC,EAAE,IAAmB,EAAE,EAAE;QACzE,IAAI,iBAAiB,YAAY,iCAAe,EAAE;YAChD,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SACtD;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,iBAAO,EAAE;YACxC,OAAO,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC9C;QACD,IAAI,iBAAiB,YAAY,6BAAa,EAAE;YAC9C,OAAO,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,IAAK,iBAAuC,CAAC,OAAO,IAAK,iBAAuC,CAAC,QAAQ,EAAE;YACzG,OAAO,sBAAsB,CAAC,iBAAsC,EAAE,IAAI,CAAC,CAAC;SAC7E;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IAChF,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,YAAY,6BAAa,EAAE;QACvD,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC/D;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEO,sEAA6B"}

package/dist/lib-cjs/buildinfo.json

@@ -1,3 +1,3 @@
 {
-    "version": "8.0.0"
+    "version": "8.1.0-alpha1"
 }