Merge pull request #12668 from BlakeOne/master

Add params scene, mesh to function getAttributes
BabylonJS · Jun 21, 2022 · 2746fca · 2746fca
2 parents 493810b + 2d3baab
commit 2746fca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/packages/dev/core/src/Materials/PBR/pbrBaseMaterial.ts b/packages/dev/core/src/Materials/PBR/pbrBaseMaterial.ts
@@ -1453,6 +1453,7 @@ export abstract class PBRBaseMaterial extends PushMaterial {
         this._eventInfo.samplers = samplers;
         this._eventInfo.uniformBuffersNames = uniformBuffers;
         this._eventInfo.customCode = undefined;
+        this._eventInfo.mesh = mesh;
         this._callbackPluginEventGeneric(MaterialPluginEvent.PrepareEffect, this._eventInfo);
 
         PrePassConfiguration.AddUniforms(uniforms);

diff --git a/packages/dev/core/src/Materials/materialPluginBase.ts b/packages/dev/core/src/Materials/materialPluginBase.ts
@@ -246,9 +246,11 @@ export class MaterialPluginBase {
     /**
      * Gets the attributes used by the plugin.
      * @param attributes list that the attribute names should be added to.
+     * @param scene the scene that the material belongs to.
+     * @param mesh the mesh being rendered.
      */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    public getAttributes(attributes: string[]): void {}
+    public getAttributes(attributes: string[], scene: Scene, mesh: AbstractMesh): void {}
 
     /**
      * Gets the uniform buffers names added by the plugin.

diff --git a/packages/dev/core/src/Materials/materialPluginEvent.ts b/packages/dev/core/src/Materials/materialPluginEvent.ts
@@ -46,6 +46,7 @@ export type MaterialPluginPrepareEffect = {
     uniforms: string[];
     samplers: string[];
     uniformBuffersNames: string[];
+    mesh: AbstractMesh;
 };
 
 /** @hidden */

diff --git a/packages/dev/core/src/Materials/materialPluginManager.ts b/packages/dev/core/src/Materials/materialPluginManager.ts
@@ -253,7 +253,7 @@ export class MaterialPluginManager {
                 const eventData = info as MaterialPluginPrepareEffect;
                 for (const plugin of this._activePlugins) {
                     eventData.fallbackRank = plugin.addFallbacks(eventData.defines, eventData.fallbacks, eventData.fallbackRank);
-                    plugin.getAttributes(eventData.attributes);
+                    plugin.getAttributes(eventData.attributes, this._scene, eventData.mesh);
                 }
                 if (this._uniformList.length > 0) {
                     eventData.uniforms.push(...this._uniformList);

diff --git a/packages/dev/core/src/Materials/standardMaterial.ts b/packages/dev/core/src/Materials/standardMaterial.ts
@@ -1371,6 +1371,7 @@ export class StandardMaterial extends PushMaterial {
             this._eventInfo.samplers = samplers;
             this._eventInfo.uniformBuffersNames = uniformBuffers;
             this._eventInfo.customCode = undefined;
+            this._eventInfo.mesh = mesh;
             this._callbackPluginEventGeneric(MaterialPluginEvent.PrepareEffect, this._eventInfo);
 
             PrePassConfiguration.AddUniforms(uniforms);