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

package/src/api/manager/tagManager.ts

@@ -2,20 +2,10 @@ import { Event, emitter } from '../classes/event';
 import { FuzzyMap } from '../classes/fuzzyMap';
 import { Parameter } from '../classes/parameter';
 import { Viewer } from '../classes/viewer';
-import {
-  assertMeshCapability,
-  cloneTransformNodeMaterial,
-  injectNodeMetadata,
-  mapTags,
-  setMaterial,
-  setMaterialColor,
-  setMaterialMetallness,
-  setMaterialRoughness,
-} from '../util/babylonHelper';
-import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
+import { assertMeshCapability, mapTags, setMaterial } from '../util/babylonHelper';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
 import { Tags } from '@babylonjs/core/Misc/tags';
-import { clone, get, has, merge, uniq } from 'lodash-es';
+import { clone, get, merge, uniq } from 'lodash-es';
 
 export class TagManager {
   public readonly parameters: TagManagerParameterBag = new FuzzyMap();
@@ -37,7 +27,7 @@ export class TagManager {
     tagName: string,
     parameterName: string,
     value: ParameterValue
-  ): Promise<ParameterObserverResult> {
+  ): Promise<TagManagerParameterObserverResultBag> {
     return await this.handleParameter({ tagName: tagName }, parameterName, value);
   }
 
@@ -49,22 +39,35 @@ export class TagManager {
     nodeName: string,
     parameterName: string,
     value: ParameterValue
-  ): Promise<ParameterObserverResult> {
+  ): Promise<TagManagerParameterObserverResultBag> {
     return await this.handleParameter({ nodeName: nodeName }, parameterName, value);
   }
 
+  /**
+   * Calls the {@link ParameterObserver} for given {@link Parameter} and applies the {@link ParameterValue} on all
+   * materials with given materialName.
+   */
+  public async setMaterialParameterValue(
+    materialName: string,
+    parameterName: string,
+    value: ParameterValue
+  ): Promise<TagManagerParameterObserverResultBag> {
+    return await this.handleParameter({ materialName: materialName }, parameterName, value);
+  }
+
   /**
    * Splits the passed {@link TagManagerParameterValue}s into individual values and calls all {@link ParameterObserver}s
    * of all {@link Parameter}s with the respective {@link TagManagerSubject} and {@link ParameterValue}. The result is a
-   * map of passed {@link TagManagerParameterValue}s and the associated {@link ParameterObserverResult} of the
+   * map of passed {@link TagManagerParameterValue}s and the associated {@link TagManagerParameterObserverResult} of the
    * {@link ParameterObserver}.
    */
   public async setParameterValues(
     values: TagManagerParameterValue[]
-  ): Promise<Map<TagManagerParameterValue, ParameterObserverResult>> {
-    const observerResultMap: Map<TagManagerParameterValue, ParameterObserverResult> = new Map();
-    const tagPromises: Promise<ParameterObserverResult>[] = [];
-    const nodePromises: Promise<ParameterObserverResult>[] = [];
+  ): Promise<Map<TagManagerParameterValue, TagManagerParameterObserverResultBag>> {
+    const observerResultMap: Map<TagManagerParameterValue, TagManagerParameterObserverResultBag> = new Map();
+    const tagPromises: Promise<TagManagerParameterObserverResultBag>[] = [];
+    const nodePromises: Promise<TagManagerParameterObserverResultBag>[] = [];
+    const materialPromises: Promise<TagManagerParameterObserverResultBag>[] = [];
     for (const value of values) {
       const subject: TagManagerSubject = {};
       if (value.tagName) {
@@ -73,6 +76,9 @@ export class TagManager {
       if (value.nodeName) {
         subject.nodeName = value.nodeName;
       }
+      if (value.materialName) {
+        subject.materialName = value.materialName;
+      }
       const observerResultPromise = this.handleParameter(subject, value.parameterName, value.value);
       observerResultPromise.then(result => observerResultMap.set(value, result));
       if (value.tagName) {
@@ -81,32 +87,37 @@ export class TagManager {
       if (value.nodeName) {
         nodePromises.push(observerResultPromise);
       }
+      if (value.materialName) {
+        materialPromises.push(observerResultPromise);
+      }
     }
     await Promise.all(tagPromises);
     await Promise.all(nodePromises);
+    await Promise.all(materialPromises);
     return observerResultMap;
   }
 
   /**
    * Gets a list of {@link TagManagerSubject}s that are present in both the state of the {@link TagManager}'s
-   * {@link parameters} and the given node.
+   * {@link parameters} and the given object.
    */
-  public getSubjectsFor(node: TransformNode): TagManagerSubject[] {
+  public getSubjectsFor(object: TransformNode | Material): TagManagerSubject[] {
     return [...this.parameters.keys()].filter(
       subject =>
-        (subject.tagName && Tags.MatchesQuery(node, subject.tagName)) ||
-        (subject.nodeName && node.name === subject.nodeName)
+        (subject.tagName && Tags.MatchesQuery(object, subject.tagName)) ||
+        (subject.nodeName && object.name === subject.nodeName) ||
+        (subject.materialName && object.name === subject.materialName)
     );
   }
 
   /**
    * Gets a list of {@link TagManagerSubject}s that are present in both the state of the {@link TagManager}'s
-   * {@link parameters} and the given nodes.
+   * {@link parameters} and the given objects.
    */
-  public getApplicableSubjectsFor(nodes: TransformNode[]): TagManagerSubject[] {
+  public getApplicableSubjectsFor(objects: (TransformNode | Material)[]): TagManagerSubject[] {
     let applicableSubjects: TagManagerSubject[] = [];
-    for (const node of nodes) {
-      const subjects = this.getSubjectsFor(node);
+    for (const object of objects) {
+      const subjects = this.getSubjectsFor(object);
       applicableSubjects = [...applicableSubjects, ...subjects];
     }
     return uniq(applicableSubjects);
@@ -117,12 +128,12 @@ export class TagManager {
    */
   public async applyExistingParameterValuesFor(
     subjects: TagManagerSubject[]
-  ): Promise<Map<TagManagerSubject, ParameterObserverResult>> {
-    const observerResultMap: Map<TagManagerSubject, ParameterObserverResult> = new Map();
-    let tagPromises: Promise<ParameterObserverResult>[] = [];
-    let nodePromises: Promise<ParameterObserverResult>[] = [];
+  ): Promise<Map<TagManagerSubject, TagManagerParameterObserverResultBag>> {
+    const observerResultMap: Map<TagManagerSubject, TagManagerParameterObserverResultBag> = new Map();
+    let tagPromises: Promise<TagManagerParameterObserverResultBag>[] = [];
+    let nodePromises: Promise<TagManagerParameterObserverResultBag>[] = [];
+    let materialPromises: Promise<TagManagerParameterObserverResultBag>[] = [];
     for (const subject of subjects) {
-      this.clearAppliedNodeMetadataParameters(this.getNodesBySubject(subject));
       const observerResultPromises = this.handleParameterBag(subject, this.parameters.get(subject)!);
       for (const observerResultPromise of observerResultPromises) {
         observerResultPromise.then(result => observerResultMap.set(subject, result));
@@ -133,9 +144,13 @@ export class TagManager {
       if (subject.nodeName) {
         nodePromises = [...nodePromises, ...observerResultPromises];
       }
+      if (subject.materialName) {
+        materialPromises = [...materialPromises, ...observerResultPromises];
+      }
     }
     await Promise.all(tagPromises);
     await Promise.all(nodePromises);
+    await Promise.all(materialPromises);
     return observerResultMap;
   }
 
@@ -144,15 +159,15 @@ export class TagManager {
    * {@link TagManager}'s {@link parameters} are applied to all given nodes.
    */
   public async applyExistingParameterValuesTo(
-    nodes: TransformNode[]
-  ): Promise<Map<TagManagerSubject, ParameterObserverResult>> {
-    return this.applyExistingParameterValuesFor(this.getApplicableSubjectsFor(nodes));
+    objects: (TransformNode | Material)[]
+  ): Promise<Map<TagManagerSubject, TagManagerParameterObserverResultBag>> {
+    return this.applyExistingParameterValuesFor(this.getApplicableSubjectsFor(objects));
   }
 
   /**
    * Applies all existing states of the {@link TagManager}'s {@link parameters} for all {@link TagManagerSubject}s.
    */
-  public async applyExistingParameterValues(): Promise<Map<TagManagerSubject, ParameterObserverResult>> {
+  public async applyExistingParameterValues(): Promise<Map<TagManagerSubject, TagManagerParameterObserverResultBag>> {
     return this.applyExistingParameterValuesFor([...this.parameters.keys()]);
   }
 
@@ -248,18 +263,46 @@ export class TagManager {
   }
 
   /**
-   * Registers observers that are called on every new node added to the Babylon.js scene. The observers ensure that each
-   * new node gets the state of the {@link TagManager}'s {@link parameters} applied.
+   * Gets all materials for given {@link TagManagerSubject} on the Babylon.js scene.
+   */
+  public getMaterialsBySubject(subject: TagManagerSubject, predicate?: (material: Material) => boolean): Material[] {
+    let materials: Material[] = [];
+    if (subject.tagName) {
+      materials = [...materials, ...this.viewer.scene.getMaterialByTags(subject.tagName, predicate)];
+    }
+    if (subject.materialName) {
+      materials = [...materials, this.viewer.scene.getMaterialByName(subject.materialName)].filter(
+        t => !!t && (!predicate || predicate(t))
+      ) as Material[];
+    }
+    return materials;
+  }
+
+  /**
+   * Registers observers that are called on every new object added to the Babylon.js scene.
+   * The observers ensure that each new object gets the state of the {@link TagManager}'s {@link parameters} applied.
    */
-  public registerNewTransformNodeObservers(scene: Scene) {
+  public registerNewObjectObservers(scene: Scene) {
+    // nodes and meshes
     const onNewTransformNodeAdded = (node: TransformNode) => {
-      if (node.name === Viewer.BOUNDING_BOX_NAME || !this.viewer.variantInstances.areAllDefinitionsCreated) {
-        // Avoid duplicate calls here. The parameter values are already applied when a variant instance has finished
-        // creating (see event listener in viewer for VARIANT_INSTANCE_CREATED). This callback should only trigger when
-        // a consumer "manually" clones a node.
+      /* NOTE:
+         Removed the check for created instances here since it is not guaranteed that all instances
+         created means that there is no scenario where new nodes should get TagManager parameters applied.
+         Instead, we check for the state to be enabled via the `onEnabledStateChangedObservable` below.
+       */
+      //if (node.name === Viewer.BOUNDING_BOX_NAME || !this.viewer.variantInstances.areAllDefinitionsCreated) {
+      if (node.name === Viewer.BOUNDING_BOX_NAME) {
         return;
       }
-      this.applyExistingParameterValuesTo([node]).then();
+      const onEnabledStateChangedObserver = node.onEnabledStateChangedObservable.add(async state => {
+        if (!state) {
+          // if the node is disabled, means ignoring also "ghost nodes"
+          return;
+        }
+        await this.applyExistingParameterValuesTo([node]);
+        node.onEnabledStateChangedObservable.remove(onEnabledStateChangedObserver);
+      });
+      node.onEnabledStateChangedObservable.makeObserverBottomPriority(onEnabledStateChangedObserver!);
     };
     scene.onNewTransformNodeAddedObservable.makeObserverBottomPriority(
       scene.onNewTransformNodeAddedObservable.add(onNewTransformNodeAdded)!
@@ -267,6 +310,21 @@ export class TagManager {
     scene.onNewMeshAddedObservable.makeObserverBottomPriority(
       scene.onNewMeshAddedObservable.add(onNewTransformNodeAdded)!
     );
+    // materials
+    const onNewMaterialAdded = (material: Material) => {
+      /* NOTE:
+				 We have to wait until a material is bound to a Mesh. In all other scenarios, the material
+				 is not "fully ready" or even empty (without working attributes/properties).
+			 */
+      const onMaterialBindObserver = material.onBindObservable.add(async abstractMesh => {
+        await this.applyExistingParameterValuesTo([material]);
+        material.onBindObservable.remove(onMaterialBindObserver);
+      });
+      material.onBindObservable.makeObserverBottomPriority(onMaterialBindObserver!);
+    };
+    scene.onNewMaterialAddedObservable.makeObserverBottomPriority(
+      scene.onNewMaterialAddedObservable.add(onNewMaterialAdded)!
+    );
   }
 
   /**
@@ -317,54 +375,51 @@ export class TagManager {
       }
       return true;
     });
-    this.parameterObservers.set(Parameter.MATERIAL_COLOR, async payload => {
-      const parsedValue = Parameter.parseColor(payload.newValue);
-      for (const node of payload.nodes) {
-        assertMeshCapability(node, Parameter.MATERIAL_COLOR);
-        if (this.viewer.cloneMaterialsOnMutation) {
-          if (!has(node.metadata, 'dirty.material')) {
-            cloneTransformNodeMaterial(node);
-          }
-          if (!has(node.metadata, 'dirty.material.color')) {
-            // inject initial value and mark as dirty
-            injectNodeMetadata(node, { dirty: { material: { color: payload.oldValue } } }, false);
-          }
+    this.parameterObservers.set(Parameter.COLOR, async payload => {
+      const color = Parameter.parseColor(payload.newValue);
+      for (const material of payload.materials) {
+        const materialCls = material.getClassName();
+        switch (materialCls) {
+          case 'PBRMaterial':
+            (material as PBRMaterial).albedoColor = color.toLinearSpace();
+            break;
+          case 'StandardMaterial':
+            (material as StandardMaterial).diffuseColor = color;
+            break;
+          default:
+            throw new Error(`Setting color for material of instance "${materialCls}" not implemented (yet).`);
         }
-        setMaterialColor(node, parsedValue, false);
       }
       return true;
     });
-    this.parameterObservers.set(Parameter.MATERIAL_ROUGHNESS, async payload => {
-      const parsedValue = Parameter.parseNumber(payload.newValue);
-      for (const node of payload.nodes as AbstractMesh[]) {
-        assertMeshCapability(node, Parameter.MATERIAL_ROUGHNESS);
-        if (this.viewer.cloneMaterialsOnMutation) {
-          if (!has(node.metadata, 'dirty.material')) {
-            cloneTransformNodeMaterial(node);
-          }
-          if (!has(node.metadata, 'dirty.material.roughness')) {
-            // inject initial value and mark as dirty
-            injectNodeMetadata(node, { dirty: { material: { color: payload.oldValue } } }, false);
-          }
+    this.parameterObservers.set(Parameter.ROUGHNESS, async payload => {
+      const roughness = Parameter.parseNumber(payload.newValue);
+      for (const material of payload.materials) {
+        const materialCls = material.getClassName();
+        switch (materialCls) {
+          case 'PBRMaterial':
+            (material as PBRMaterial).roughness = roughness;
+            break;
+          case 'StandardMaterial':
+            (material as StandardMaterial).roughness = roughness;
+            break;
+          default:
+            throw new Error(`Setting roughness for material of instance "${materialCls}" not implemented (yet).`);
         }
-        setMaterialRoughness(node, parsedValue, false);
       }
       return true;
     });
-    this.parameterObservers.set(Parameter.MATERIAL_METALLNESS, async payload => {
-      const parsedValue = Parameter.parseNumber(payload.newValue);
-      for (const node of payload.nodes as AbstractMesh[]) {
-        assertMeshCapability(node, Parameter.MATERIAL_METALLNESS);
-        if (this.viewer.cloneMaterialsOnMutation) {
-          if (!has(node.metadata, 'dirty.material')) {
-            cloneTransformNodeMaterial(node);
-          }
-          if (!has(node.metadata, 'dirty.material.metallness')) {
-            // inject initial value and mark as dirty
-            injectNodeMetadata(node, { dirty: { material: { color: payload.oldValue } } }, false);
-          }
+    this.parameterObservers.set(Parameter.METALLNESS, async payload => {
+      const metallness = Parameter.parseNumber(payload.newValue);
+      for (const material of payload.materials) {
+        const materialCls = material.getClassName();
+        switch (materialCls) {
+          case 'PBRMaterial':
+            (material as PBRMaterial).metallic = metallness;
+            break;
+          default:
+            throw new Error(`Setting metallness for material of instance "${materialCls}" not implemented (yet).`);
         }
-        setMaterialMetallness(node, parsedValue, false);
       }
       return true;
     });
@@ -379,8 +434,8 @@ export class TagManager {
   protected handleParameterBag(
     subject: TagManagerSubject,
     parameters: ParameterBag
-  ): Promise<ParameterObserverResult>[] {
-    const observerPromises: Promise<ParameterObserverResult>[] = [];
+  ): Promise<TagManagerParameterObserverResultBag>[] {
+    const observerPromises: Promise<TagManagerParameterObserverResultBag>[] = [];
     for (const parameter in parameters) {
       observerPromises.push(this.handleParameter(subject, parameter, parameters[parameter]));
     }
@@ -397,36 +452,58 @@ export class TagManager {
     subject: TagManagerSubject,
     parameter: string,
     parameterValue: ParameterValue
-  ): Promise<ParameterObserverResult> {
+  ): Promise<TagManagerParameterObserverResultBag> {
     Parameter.assertParameter(Parameter.declarations, parameter, parameterValue);
-    if (!this.parameterObservers.has(parameter)) {
-      return Promise.resolve(false);
-    }
     const parameterBag = this.parameters.get(subject) || {};
     const oldValue = parameterBag[parameter];
+    const parameterObserverResultBag: TagManagerParameterObserverResultBag = {
+      subject: subject,
+      parameter: parameter,
+      nodes: [],
+      materials: [],
+      oldValue: oldValue,
+      newValue: parameterValue,
+      parameterObserverResult: false,
+    };
+    if (!this.parameterObservers.has(parameter)) {
+      return Promise.resolve(parameterObserverResultBag);
+    }
     if (oldValue === parameterValue) {
-      return Promise.resolve(false);
+      /* NOTE:
+         The following is wrong in different scenarios. If a node enters life and the subject/parameter
+         applied in the past, the new node will not be altered by the subsequent observers, because of
+         the return on the next line. If we want to tackle that problem and do an early return to not
+         trigger observers twice, we have to hold a state for every node/material and the applied
+         parameter value. This could be highly cost sensitive, so I would just avoid that check
+         at all. Babylon will not trigger changes if the value on a node/material does not change
+         anyway.
+       */
+      //return Promise.resolve(parameterObserverResultBag);
     }
     this.parameters.set(subject, parameterBag);
     this.parameters.get(subject)![parameter] = parameterValue;
     const nodes = this.getNodesBySubject(subject);
-    if (nodes.length === 0) {
-      return Promise.resolve(false);
+    const materials = this.getMaterialsBySubject(subject);
+    if (nodes.length === 0 && materials.length === 0) {
+      return Promise.resolve(parameterObserverResultBag);
     }
     const observer = this.parameterObservers.get(parameter)!;
-    const result = await observer({ subject: subject, nodes: nodes, newValue: parameterValue, oldValue: oldValue });
-    if (result === false) {
-      // reset to old value if observer was not successful
-      this.parameters.get(subject)![parameter] = oldValue;
-    }
-    emitter.emit(Event.TAG_MANAGER_PARAMETER_COMMITTED, {
+    const result = await observer({
       subject: subject,
-      parameter: parameter,
       nodes: nodes,
-      oldValue: oldValue,
+      materials: materials,
       newValue: parameterValue,
-      result: result,
+      oldValue: oldValue,
     });
+    if (result === false) {
+      // reset to old value if observer was not successful
+      this.parameters.get(subject)![parameter] = oldValue;
+    }
+    parameterObserverResultBag.nodes = nodes;
+    parameterObserverResultBag.materials = materials;
+    parameterObserverResultBag.parameterObserverResult = result;
+    emitter.emit(Event.TAG_MANAGER_PARAMETER_COMMITTED, parameterObserverResultBag);
+    return parameterObserverResultBag;
   }
 
   /**
@@ -441,17 +518,14 @@ export class TagManager {
       if (oldNode) {
         accNodeMapping[oldNode.name] = curNode.name;
       }
-
       return accNodeMapping;
     }, {} as TagMapping);
-
     for (const subject of this.parameters.keys()) {
       const isNode = subject.nodeName;
       const newName = isNode ? nodeMapping[subject.nodeName] : tagMapping[subject.tagName];
       if (!newName) {
         continue;
       }
-
       const newSubject = clone(subject);
       newSubject[isNode ? 'nodeName' : 'tagName'] = newName;
       const parameterBag = clone(this.parameters.get(subject)!);
@@ -459,19 +533,4 @@ export class TagManager {
       this.parameters.set(newSubject, parameterBag);
     }
   }
-
-  /**
-   * Clears the applied {@link ParameterBag} state of the node's metadata to ensure that observers trigger (once again).
-   * This is necessary e.g. after mapping tags when a nodeName subject shall override the parameterValue of a mapped
-   * tag.
-   * @protected
-   */
-  protected clearAppliedNodeMetadataParameters(nodes: TransformNode[]): void {
-    for (const node of nodes) {
-      if (!node.metadata?.tagManager?.parameters) {
-        continue;
-      }
-      node.metadata.tagManager.parameters = {};
-    }
-  }
 }

package/src/api/manager/variantInstanceManager.ts

@@ -120,15 +120,13 @@ export class VariantInstanceManager extends EventBroadcaster {
   public async create(
     dottedPath: DottedPathArgument,
     name?: string,
-    parameters?: ParameterBag,
-    tagManagerParameterValues?: TagManagerParameterValue[]
+    parameters?: ParameterBag
   ): Promise<VariantInstance> {
     const variant = DottedPath.create(dottedPath).path;
     const definition = {
       name: this.ensureUniqueName(name ? name : variant),
       variant: variant,
       parameters: parameters,
-      tagManagerParameterValues: tagManagerParameterValues,
     };
     return await this.createFromDefinition(definition);
   }
@@ -246,7 +244,10 @@ export class VariantInstanceManager extends EventBroadcaster {
     this.variantInstances.set(definition.name, variantInstanceClone);
     reportDuplicateNodeNames(duplicateNodeNames(this.viewer.scene.getNodes(), n => n instanceof TransformNode));
     this.viewer.tagManager.mapNodesAndTags(variantInstanceClone.variant.elementNodesFlat, tagMapping ?? {});
-    await this.viewer.tagManager.applyExistingParameterValuesTo(variantInstanceClone.variant.elementNodesFlat);
+    await this.viewer.tagManager.applyExistingParameterValuesTo([
+      ...variantInstanceClone.variant.elementNodesFlat,
+      ...variantInstanceClone.variant.elementAbstractMeshesFlat.map(n => n.material!).filter(m => !!m),
+    ]);
     variantInstance.broadcastEvent(Event.VARIANT_INSTANCE_CLONED, variantInstanceClone);
     return variantInstanceClone;
   }
@@ -285,10 +286,6 @@ export class VariantInstanceManager extends EventBroadcaster {
     const variant = await this.rootVariant.getDescendant(definition.variant);
     const variantInstance = await VariantInstance.createLiving(variant, definition.name, definition.parameters);
     this.variantInstances.set(definition.name, variantInstance);
-    // set tag manager parameter values if all definitions has been created.
-    if (definition.tagManagerParameterValues && this.areAllDefinitionsCreated) {
-      await this.viewer.tagManager.setParameterValues(definition.tagManagerParameterValues);
-    }
     this.broadcastEvent(Event.VARIANT_INSTANCE_CREATED, variantInstance);
     return variantInstance;
   }

package/src/api/util/globalTypes.ts

@@ -280,7 +280,7 @@ type ScreenshotSettings = {
 /**
  * Use this to define geometry to be excluded from autofocus, GLB export, etc.
  */
-type ExcludedGeometry = Mesh | AbstractMesh | VariantInstance | Variant | VariantElement | Node | TagManagerSubject;
+type ExcludedGeometry = TransformNode | VariantInstance | Variant | VariantElement | TagManagerSubject;
 type ExcludedGeometryList = ExcludedGeometry[];
 
 type AutofocusSettings = {
@@ -370,7 +370,6 @@ type VariantInstanceDefinition = {
   name?: string;
   variant: DottedPathArgument;
   parameters?: ParameterBag;
-  tagManagerParameterValues?: TagManagerParameterValue[];
   lazy?: boolean;
 };
 
@@ -403,7 +402,7 @@ type DottedPathArgument = string | string[] | DottedPath;
 type ParameterObserverResult = boolean | void;
 
 type ParameterObserver = (
-  payload: any,
+  object: any,
   oldValue: Undefinable<ParameterValue>,
   newValue: ParameterValue
 ) => Promise<ParameterObserverResult>;
@@ -487,13 +486,18 @@ type TagMapping = {
 type TagManagerSubject = {
   tagName?: string;
   nodeName?: string;
+  materialName?: string;
 };
 
+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.
  */
-type TagManagerParameterObserver = (payload: TagManagerParameterObserverPayload) => Promise<ParameterObserverResult>;
+type TagManagerParameterObserver = (
+  payload: TagManagerParameterObserverPayload
+) => Promise<TagManagerParameterObserverResult>;
 
 type TagManagerParameterBag = FuzzyMap<TagManagerSubject, ParameterBag>;
 
@@ -502,6 +506,7 @@ type TagManagerParameterObserverBag = Map<string, TagManagerParameterObserver>;
 type TagManagerParameterObserverPayload = {
   subject: TagManagerSubject;
   nodes: TransformNode[];
+  materials: Material[];
   newValue: ParameterValue;
   oldValue: Undefinable<ParameterValue>;
 };
@@ -509,10 +514,21 @@ type TagManagerParameterObserverPayload = {
 type TagManagerParameterValue = {
   tagName?: string;
   nodeName?: string;
+  materialName?: string;
   parameterName: string;
   value: ParameterValue;
 };
 
+type TagManagerParameterObserverResultBag = {
+  subject: TagManagerSubject;
+  parameter: string;
+  nodes: TransformNode[];
+  materials: Material[];
+  oldValue: ParameterValue;
+  newValue: ParameterValue;
+  parameterObserverResult: TagManagerParameterObserverResult;
+};
+
 type NodeNamingStrategyPayload = {
   variantInstance: VariantInstance;
   variant: Variant;