@babylonjs/core 7.32.0 → 7.32.1

package/Materials/PBR/pbrBaseMaterial.js

@@ -27,6 +27,7 @@ import { PBRSubSurfaceConfiguration } from "./pbrSubSurfaceConfiguration.js";
 import { DetailMapConfiguration } from "../material.detailMapConfiguration.js";
 import { addClipPlaneUniforms, bindClipPlane } from "../clipPlaneMaterialHelper.js";
 import { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersList, } from "../materialHelper.functions.js";
+import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
 /**
  * Manages the defines for the PBR Material.
@@ -143,8 +144,12 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.THIN_INSTANCES = false;
         this.INSTANCESCOLOR = false;
         this.PREPASS = false;
+        this.PREPASS_COLOR = false;
+        this.PREPASS_COLOR_INDEX = -1;
         this.PREPASS_IRRADIANCE = false;
         this.PREPASS_IRRADIANCE_INDEX = -1;
+        this.PREPASS_ALBEDO = false;
+        this.PREPASS_ALBEDO_INDEX = -1;
         this.PREPASS_ALBEDO_SQRT = false;
         this.PREPASS_ALBEDO_SQRT_INDEX = -1;
         this.PREPASS_DEPTH = false;
@@ -1160,6 +1165,7 @@ export class PBRBaseMaterial extends PushMaterial {
         this._eventInfo.mesh = mesh;
         this._eventInfo.indexParameters = indexParameters;
         this._callbackPluginEventGeneric(128 /* MaterialPluginEvent.PrepareEffect */, this._eventInfo);
+        MaterialHelperGeometryRendering.AddUniformsAndSamplers(uniforms, samplers);
         PrePassConfiguration.AddUniforms(uniforms);
         PrePassConfiguration.AddSamplers(samplers);
         addClipPlaneUniforms(uniforms);
@@ -1221,6 +1227,7 @@ export class PBRBaseMaterial extends PushMaterial {
         PrepareDefinesForPrePass(scene, defines, this.canRenderToMRT && !oit);
         // Order independant transparency
         PrepareDefinesForOIT(scene, defines, oit);
+        MaterialHelperGeometryRendering.PrepareDefines(engine.currentRenderPassId, mesh, defines);
         // Textures
         defines.METALLICWORKFLOW = this.isMetallicWorkflow();
         if (defines._areTexturesDirty) {
@@ -1646,6 +1653,7 @@ export class PBRBaseMaterial extends PushMaterial {
         // Binding unconditionally
         this._uniformBuffer.bindToEffect(effect, "Material");
         this.prePassConfiguration.bindForSubMesh(this._activeEffect, scene, mesh, world, this.isFrozen);
+        MaterialHelperGeometryRendering.Bind(engine.currentRenderPassId, this._activeEffect, mesh, world);
         this._eventInfo.subMesh = subMesh;
         this._callbackPluginEventHardBindForSubMesh(this._eventInfo);
         // Normal Matrix