@onerjs/core 8.26.4 → 8.26.5

package/Materials/PBR/pbrBaseMaterial.js

@@ -1,6 +1,6 @@
 import { __decorate } from "../../tslib.es6.js";
 /* eslint-disable @typescript-eslint/naming-convention */
-import { serializeAsImageProcessingConfiguration, expandToProperty } from "../../Misc/decorators.js";
+import { expandToProperty } from "../../Misc/decorators.js";
 import { Logger } from "../../Misc/logger.js";
 import { SmartArray } from "../../Misc/smartArray.js";
 import { GetEnvironmentBRDFTexture } from "../../Misc/brdfTextureTools.js";
@@ -10,11 +10,11 @@ import { VertexBuffer } from "../../Buffers/buffer.js";
 import { PBRBRDFConfiguration } from "./pbrBRDFConfiguration.js";
 import { PrePassConfiguration } from "../prePassConfiguration.js";
 import { Color3, TmpColors } from "../../Maths/math.color.js";
+import { ImageProcessingDefinesMixin } from "../../Materials/imageProcessingConfiguration.defines.js";
 import { ImageProcessingConfiguration } from "../../Materials/imageProcessingConfiguration.js";
 import { Material } from "../../Materials/material.js";
 import { MaterialDefines } from "../../Materials/materialDefines.js";
 import { PushMaterial } from "../../Materials/pushMaterial.js";
-import { Texture } from "../../Materials/Textures/texture.js";
 import { MaterialFlags } from "../materialFlags.js";
 
 import "../../Materials/Textures/baseTexture.polynomial.js";
@@ -26,14 +26,18 @@ import { PBRSheenConfiguration } from "./pbrSheenConfiguration.js";
 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 { BindBonesParameters, BindFogParameters, BindLights, BindLogDepth, BindMorphTargetParameters, BindTextureMatrix, BindIBLParameters, BindIBLSamplers, HandleFallbacksForShadows, PrepareAttributesForBakedVertexAnimation, PrepareAttributesForBones, PrepareAttributesForInstances, PrepareAttributesForMorphTargets, PrepareDefinesForAttributes, PrepareDefinesForFrameBoundValues, PrepareDefinesForLights, PrepareDefinesForIBL, PrepareDefinesForMergedUV, PrepareDefinesForMisc, PrepareDefinesForMultiview, PrepareDefinesForOIT, PrepareDefinesForPrePass, PrepareUniformsAndSamplersList, PrepareUniformsAndSamplersForIBL, PrepareUniformLayoutForIBL, } from "../materialHelper.functions.js";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering.js";
+import { UVDefinesMixin } from "../uv.defines.js";
+import { ImageProcessingMixin } from "../imageProcessing.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
+class PBRMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {
+}
 /**
  * Manages the defines for the PBR Material.
  * @internal
  */
-export class PBRMaterialDefines extends MaterialDefines {
+export class PBRMaterialDefines extends ImageProcessingDefinesMixin(PBRMaterialDefinesBase) {
     /**
      * Initializes the PBR Material defines.
      * @param externalProperties The external properties
@@ -44,18 +48,6 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.NUM_SAMPLES = "0";
         this.REALTIME_FILTERING = false;
         this.IBL_CDF_FILTERING = false;
-        this.MAINUV1 = false;
-        this.MAINUV2 = false;
-        this.MAINUV3 = false;
-        this.MAINUV4 = false;
-        this.MAINUV5 = false;
-        this.MAINUV6 = false;
-        this.UV1 = false;
-        this.UV2 = false;
-        this.UV3 = false;
-        this.UV4 = false;
-        this.UV5 = false;
-        this.UV6 = false;
         this.ALBEDO = false;
         this.GAMMAALBEDO = false;
         this.ALBEDODIRECTUV = 0;
@@ -200,21 +192,6 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.MORPHTARGETTEXTURE_HASCOLORS = false;
         this.NUM_MORPH_INFLUENCERS = 0;
         this.MORPHTARGETS_TEXTURE = false;
-        this.IMAGEPROCESSING = false;
-        this.VIGNETTE = false;
-        this.VIGNETTEBLENDMODEMULTIPLY = false;
-        this.VIGNETTEBLENDMODEOPAQUE = false;
-        this.TONEMAPPING = 0;
-        this.CONTRAST = false;
-        this.COLORCURVES = false;
-        this.COLORGRADING = false;
-        this.COLORGRADING3D = false;
-        this.SAMPLER3DGREENDEPTH = false;
-        this.SAMPLER3DBGRMAP = false;
-        this.DITHER = false;
-        this.IMAGEPROCESSINGPOSTPROCESS = false;
-        this.SKIPFINALCOLORCLAMP = false;
-        this.EXPOSURE = false;
         this.MULTIVIEW = false;
         this.ORDER_INDEPENDENT_TRANSPARENCY = false;
         this.ORDER_INDEPENDENT_TRANSPARENCY_16BITS = false;
@@ -253,6 +230,8 @@ export class PBRMaterialDefines extends MaterialDefines {
         this.NORMALXYSCALE = true;
     }
 }
+class PBRBaseMaterialBase extends ImageProcessingMixin(PushMaterial) {
+}
 /**
  * The Physically based material base class of BJS.
  *
@@ -262,7 +241,7 @@ export class PBRMaterialDefines extends MaterialDefines {
  * @see [WebGL](https://playground.babylonjs.com/#CGHTSM#1)
  * @see [WebGPU](https://playground.babylonjs.com/#CGHTSM#2)
  */
-export class PBRBaseMaterial extends PushMaterial {
+export class PBRBaseMaterial extends PBRBaseMaterialBase {
     /**
      * Enables realtime filtering on the texture.
      */
@@ -289,32 +268,6 @@ export class PBRBaseMaterial extends PushMaterial {
     get canRenderToMRT() {
         return true;
     }
-    /**
-     * Attaches a new image processing configuration to the PBR Material.
-     * @param configuration
-     */
-    _attachImageProcessingConfiguration(configuration) {
-        if (configuration === this._imageProcessingConfiguration) {
-            return;
-        }
-        // Detaches observer.
-        if (this._imageProcessingConfiguration && this._imageProcessingObserver) {
-            this._imageProcessingConfiguration.onUpdateParameters.remove(this._imageProcessingObserver);
-        }
-        // Pick the scene configuration if needed.
-        if (!configuration) {
-            this._imageProcessingConfiguration = this.getScene().imageProcessingConfiguration;
-        }
-        else {
-            this._imageProcessingConfiguration = configuration;
-        }
-        // Attaches observer.
-        if (this._imageProcessingConfiguration) {
-            this._imageProcessingObserver = this._imageProcessingConfiguration.onUpdateParameters.add(() => {
-                this._markAllSubMeshesAsImageProcessingDirty();
-            });
-        }
-    }
     /**
      * Instantiates a new PBRMaterial instance.
      *
@@ -689,10 +642,6 @@ export class PBRBaseMaterial extends PushMaterial {
          * @internal
          */
         this._enableSpecularAntiAliasing = false;
-        /**
-         * Keep track of the image processing observer to allow dispose and replace.
-         */
-        this._imageProcessingObserver = null;
         /**
          * Stores the available render targets.
          */
@@ -1132,7 +1081,6 @@ export class PBRBaseMaterial extends PushMaterial {
             "vMetallicReflectanceFactors",
             "vEmissiveColor",
             "visibility",
-            "vReflectionColor",
             "vFogInfos",
             "vFogColor",
             "pointSize",
@@ -1141,12 +1089,8 @@ export class PBRBaseMaterial extends PushMaterial {
             "vBaseDiffuseRoughnessInfos",
             "vAmbientInfos",
             "vOpacityInfos",
-            "vReflectionInfos",
-            "vReflectionPosition",
-            "vReflectionSize",
             "vEmissiveInfos",
             "vReflectivityInfos",
-            "vReflectionFilteringInfo",
             "vMetallicReflectanceInfos",
             "vReflectanceInfos",
             "vMicroSurfaceSamplerInfos",
@@ -1158,7 +1102,6 @@ export class PBRBaseMaterial extends PushMaterial {
             "baseDiffuseRoughnessMatrix",
             "ambientMatrix",
             "opacityMatrix",
-            "reflectionMatrix",
             "emissiveMatrix",
             "reflectivityMatrix",
             "normalMatrix",
@@ -1169,26 +1112,6 @@ export class PBRBaseMaterial extends PushMaterial {
             "reflectanceMatrix",
             "vLightingIntensity",
             "logarithmicDepthConstant",
-            "vSphericalX",
-            "vSphericalY",
-            "vSphericalZ",
-            "vSphericalXX_ZZ",
-            "vSphericalYY_ZZ",
-            "vSphericalZZ",
-            "vSphericalXY",
-            "vSphericalYZ",
-            "vSphericalZX",
-            "vSphericalL00",
-            "vSphericalL1_1",
-            "vSphericalL10",
-            "vSphericalL11",
-            "vSphericalL2_2",
-            "vSphericalL2_1",
-            "vSphericalL20",
-            "vSphericalL21",
-            "vSphericalL22",
-            "vReflectionMicrosurfaceInfos",
-            "vReflectionDominantDirection",
             "vTangentSpaceParams",
             "boneTextureWidth",
             "vDebugMode",
@@ -1206,10 +1129,6 @@ export class PBRBaseMaterial extends PushMaterial {
             "bumpSampler",
             "lightmapSampler",
             "opacitySampler",
-            "reflectionSampler",
-            "reflectionSamplerLow",
-            "reflectionSamplerHigh",
-            "irradianceSampler",
             "microSurfaceSampler",
             "environmentBrdfSampler",
             "boneSampler",
@@ -1218,10 +1137,10 @@ export class PBRBaseMaterial extends PushMaterial {
             "morphTargets",
             "oitDepthSampler",
             "oitFrontColorSampler",
-            "icdfSampler",
             "areaLightsLTC1Sampler",
             "areaLightsLTC2Sampler",
         ];
+        PrepareUniformsAndSamplersForIBL(uniforms, samplers, true);
         const uniformBuffers = ["Material", "Scene", "Mesh"];
         const indexParameters = { maxSimultaneousLights: this._maxSimultaneousLights, maxSimultaneousMorphTargets: defines.NUM_MORPH_INFLUENCERS };
         this._eventInfo.fallbacks = fallbacks;
@@ -1356,121 +1275,12 @@ export class PBRBaseMaterial extends PushMaterial {
                     defines.OPACITY = false;
                 }
                 const reflectionTexture = this._getReflectionTexture();
-                if (reflectionTexture && MaterialFlags.ReflectionTextureEnabled) {
-                    defines.REFLECTION = true;
-                    defines.GAMMAREFLECTION = reflectionTexture.gammaSpace;
-                    defines.RGBDREFLECTION = reflectionTexture.isRGBD;
-                    defines.LODINREFLECTIONALPHA = reflectionTexture.lodLevelInAlpha;
-                    defines.LINEARSPECULARREFLECTION = reflectionTexture.linearSpecularLOD;
-                    defines.USEIRRADIANCEMAP = false;
-                    if (this.realTimeFiltering && this.realTimeFilteringQuality > 0) {
-                        defines.NUM_SAMPLES = "" + this.realTimeFilteringQuality;
-                        if (engine._features.needTypeSuffixInShaderConstants) {
-                            defines.NUM_SAMPLES = defines.NUM_SAMPLES + "u";
-                        }
-                        defines.REALTIME_FILTERING = true;
-                        if (this.getScene().iblCdfGenerator) {
-                            defines.IBL_CDF_FILTERING = true;
-                        }
-                    }
-                    else {
-                        defines.REALTIME_FILTERING = false;
-                    }
-                    defines.INVERTCUBICMAP = reflectionTexture.coordinatesMode === Texture.INVCUBIC_MODE;
-                    defines.REFLECTIONMAP_3D = reflectionTexture.isCube;
-                    defines.REFLECTIONMAP_OPPOSITEZ = defines.REFLECTIONMAP_3D && this.getScene().useRightHandedSystem ? !reflectionTexture.invertZ : reflectionTexture.invertZ;
-                    defines.REFLECTIONMAP_CUBIC = false;
-                    defines.REFLECTIONMAP_EXPLICIT = false;
-                    defines.REFLECTIONMAP_PLANAR = false;
-                    defines.REFLECTIONMAP_PROJECTION = false;
-                    defines.REFLECTIONMAP_SKYBOX = false;
-                    defines.REFLECTIONMAP_SPHERICAL = false;
-                    defines.REFLECTIONMAP_EQUIRECTANGULAR = false;
-                    defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
-                    defines.REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED = false;
-                    switch (reflectionTexture.coordinatesMode) {
-                        case Texture.EXPLICIT_MODE:
-                            defines.REFLECTIONMAP_EXPLICIT = true;
-                            break;
-                        case Texture.PLANAR_MODE:
-                            defines.REFLECTIONMAP_PLANAR = true;
-                            break;
-                        case Texture.PROJECTION_MODE:
-                            defines.REFLECTIONMAP_PROJECTION = true;
-                            break;
-                        case Texture.SKYBOX_MODE:
-                            defines.REFLECTIONMAP_SKYBOX = true;
-                            break;
-                        case Texture.SPHERICAL_MODE:
-                            defines.REFLECTIONMAP_SPHERICAL = true;
-                            break;
-                        case Texture.EQUIRECTANGULAR_MODE:
-                            defines.REFLECTIONMAP_EQUIRECTANGULAR = true;
-                            break;
-                        case Texture.FIXED_EQUIRECTANGULAR_MODE:
-                            defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = true;
-                            break;
-                        case Texture.FIXED_EQUIRECTANGULAR_MIRRORED_MODE:
-                            defines.REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED = true;
-                            break;
-                        case Texture.CUBIC_MODE:
-                        case Texture.INVCUBIC_MODE:
-                        default:
-                            defines.REFLECTIONMAP_CUBIC = true;
-                            defines.USE_LOCAL_REFLECTIONMAP_CUBIC = reflectionTexture.boundingBoxSize ? true : false;
-                            break;
-                    }
-                    if (reflectionTexture.coordinatesMode !== Texture.SKYBOX_MODE) {
-                        if (reflectionTexture.irradianceTexture) {
-                            defines.USEIRRADIANCEMAP = true;
-                            defines.USESPHERICALFROMREFLECTIONMAP = false;
-                            defines.USESPHERICALINVERTEX = false;
-                            if (reflectionTexture.irradianceTexture._dominantDirection) {
-                                defines.USE_IRRADIANCE_DOMINANT_DIRECTION = true;
-                            }
-                        }
-                        // Assume using spherical polynomial if the reflection texture is a cube map
-                        else if (reflectionTexture.isCube) {
-                            defines.USESPHERICALFROMREFLECTIONMAP = true;
-                            defines.USEIRRADIANCEMAP = false;
-                            defines.USE_IRRADIANCE_DOMINANT_DIRECTION = false;
-                            if (this._forceIrradianceInFragment ||
-                                this.realTimeFiltering ||
-                                this._twoSidedLighting ||
-                                engine.getCaps().maxVaryingVectors <= 8 ||
-                                this._baseDiffuseRoughnessTexture) {
-                                defines.USESPHERICALINVERTEX = false;
-                            }
-                            else {
-                                defines.USESPHERICALINVERTEX = true;
-                            }
-                        }
-                    }
-                }
-                else {
-                    defines.REFLECTION = false;
-                    defines.REFLECTIONMAP_3D = false;
-                    defines.REFLECTIONMAP_SPHERICAL = false;
-                    defines.REFLECTIONMAP_PLANAR = false;
-                    defines.REFLECTIONMAP_CUBIC = false;
-                    defines.USE_LOCAL_REFLECTIONMAP_CUBIC = false;
-                    defines.REFLECTIONMAP_PROJECTION = false;
-                    defines.REFLECTIONMAP_SKYBOX = false;
-                    defines.REFLECTIONMAP_EXPLICIT = false;
-                    defines.REFLECTIONMAP_EQUIRECTANGULAR = false;
-                    defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
-                    defines.REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED = false;
-                    defines.INVERTCUBICMAP = false;
-                    defines.USESPHERICALFROMREFLECTIONMAP = false;
-                    defines.USEIRRADIANCEMAP = false;
-                    defines.USE_IRRADIANCE_DOMINANT_DIRECTION = false;
-                    defines.USESPHERICALINVERTEX = false;
-                    defines.REFLECTIONMAP_OPPOSITEZ = false;
-                    defines.LODINREFLECTIONALPHA = false;
-                    defines.GAMMAREFLECTION = false;
-                    defines.RGBDREFLECTION = false;
-                    defines.LINEARSPECULARREFLECTION = false;
-                }
+                const useSHInFragment = this._forceIrradianceInFragment ||
+                    this.realTimeFiltering ||
+                    this._twoSidedLighting ||
+                    engine.getCaps().maxVaryingVectors <= 8 ||
+                    this._baseDiffuseRoughnessTexture != null;
+                PrepareDefinesForIBL(scene, reflectionTexture, defines, this.realTimeFiltering, this.realTimeFilteringQuality, !useSHInFragment);
                 if (this._lightmapTexture && MaterialFlags.LightmapTextureEnabled) {
                     PrepareDefinesForMergedUV(this._lightmapTexture, defines, "LIGHTMAP");
                     defines.USELIGHTMAPASSHADOWMAP = this._useLightmapAsShadowmap;
@@ -1683,10 +1493,6 @@ export class PBRBaseMaterial extends PushMaterial {
         ubo.addUniform("vLightmapInfos", 2);
         ubo.addUniform("vReflectivityInfos", 3);
         ubo.addUniform("vMicroSurfaceSamplerInfos", 2);
-        ubo.addUniform("vReflectionInfos", 2);
-        ubo.addUniform("vReflectionFilteringInfo", 2);
-        ubo.addUniform("vReflectionPosition", 3);
-        ubo.addUniform("vReflectionSize", 3);
         ubo.addUniform("vBumpInfos", 3);
         ubo.addUniform("albedoMatrix", 16);
         ubo.addUniform("baseWeightMatrix", 16);
@@ -1699,14 +1505,10 @@ export class PBRBaseMaterial extends PushMaterial {
         ubo.addUniform("microSurfaceSamplerMatrix", 16);
         ubo.addUniform("bumpMatrix", 16);
         ubo.addUniform("vTangentSpaceParams", 2);
-        ubo.addUniform("reflectionMatrix", 16);
-        ubo.addUniform("vReflectionColor", 3);
         ubo.addUniform("vAlbedoColor", 4);
         ubo.addUniform("baseWeight", 1);
         ubo.addUniform("baseDiffuseRoughness", 1);
         ubo.addUniform("vLightingIntensity", 4);
-        ubo.addUniform("vReflectionMicrosurfaceInfos", 3);
-        ubo.addUniform("vReflectionDominantDirection", 3);
         ubo.addUniform("pointSize", 1);
         ubo.addUniform("vReflectivityColor", 4);
         ubo.addUniform("vEmissiveColor", 3);
@@ -1717,25 +1519,8 @@ export class PBRBaseMaterial extends PushMaterial {
         ubo.addUniform("metallicReflectanceMatrix", 16);
         ubo.addUniform("vReflectanceInfos", 2);
         ubo.addUniform("reflectanceMatrix", 16);
-        ubo.addUniform("vSphericalL00", 3);
-        ubo.addUniform("vSphericalL1_1", 3);
-        ubo.addUniform("vSphericalL10", 3);
-        ubo.addUniform("vSphericalL11", 3);
-        ubo.addUniform("vSphericalL2_2", 3);
-        ubo.addUniform("vSphericalL2_1", 3);
-        ubo.addUniform("vSphericalL20", 3);
-        ubo.addUniform("vSphericalL21", 3);
-        ubo.addUniform("vSphericalL22", 3);
-        ubo.addUniform("vSphericalX", 3);
-        ubo.addUniform("vSphericalY", 3);
-        ubo.addUniform("vSphericalZ", 3);
-        ubo.addUniform("vSphericalXX_ZZ", 3);
-        ubo.addUniform("vSphericalYY_ZZ", 3);
-        ubo.addUniform("vSphericalZZ", 3);
-        ubo.addUniform("vSphericalXY", 3);
-        ubo.addUniform("vSphericalYZ", 3);
-        ubo.addUniform("vSphericalZX", 3);
         ubo.addUniform("cameraInfo", 4);
+        PrepareUniformLayoutForIBL(ubo, true, true, true, true, true);
         super.buildUniformLayout();
     }
     /**
@@ -1808,54 +1593,6 @@ export class PBRBaseMaterial extends PushMaterial {
                         ubo.updateFloat2("vOpacityInfos", this._opacityTexture.coordinatesIndex, this._opacityTexture.level);
                         BindTextureMatrix(this._opacityTexture, ubo, "opacity");
                     }
-                    if (reflectionTexture && MaterialFlags.ReflectionTextureEnabled) {
-                        ubo.updateMatrix("reflectionMatrix", reflectionTexture.getReflectionTextureMatrix());
-                        ubo.updateFloat2("vReflectionInfos", reflectionTexture.level * scene.iblIntensity, 0);
-                        if (reflectionTexture.boundingBoxSize) {
-                            const cubeTexture = reflectionTexture;
-                            ubo.updateVector3("vReflectionPosition", cubeTexture.boundingBoxPosition);
-                            ubo.updateVector3("vReflectionSize", cubeTexture.boundingBoxSize);
-                        }
-                        if (this.realTimeFiltering) {
-                            const width = reflectionTexture.getSize().width;
-                            ubo.updateFloat2("vReflectionFilteringInfo", width, Math.log2(width));
-                        }
-                        if (!defines.USEIRRADIANCEMAP) {
-                            const polynomials = reflectionTexture.sphericalPolynomial;
-                            if (defines.USESPHERICALFROMREFLECTIONMAP && polynomials) {
-                                if (defines.SPHERICAL_HARMONICS) {
-                                    const preScaledHarmonics = polynomials.preScaledHarmonics;
-                                    ubo.updateVector3("vSphericalL00", preScaledHarmonics.l00);
-                                    ubo.updateVector3("vSphericalL1_1", preScaledHarmonics.l1_1);
-                                    ubo.updateVector3("vSphericalL10", preScaledHarmonics.l10);
-                                    ubo.updateVector3("vSphericalL11", preScaledHarmonics.l11);
-                                    ubo.updateVector3("vSphericalL2_2", preScaledHarmonics.l2_2);
-                                    ubo.updateVector3("vSphericalL2_1", preScaledHarmonics.l2_1);
-                                    ubo.updateVector3("vSphericalL20", preScaledHarmonics.l20);
-                                    ubo.updateVector3("vSphericalL21", preScaledHarmonics.l21);
-                                    ubo.updateVector3("vSphericalL22", preScaledHarmonics.l22);
-                                }
-                                else {
-                                    ubo.updateFloat3("vSphericalX", polynomials.x.x, polynomials.x.y, polynomials.x.z);
-                                    ubo.updateFloat3("vSphericalY", polynomials.y.x, polynomials.y.y, polynomials.y.z);
-                                    ubo.updateFloat3("vSphericalZ", polynomials.z.x, polynomials.z.y, polynomials.z.z);
-                                    ubo.updateFloat3("vSphericalXX_ZZ", polynomials.xx.x - polynomials.zz.x, polynomials.xx.y - polynomials.zz.y, polynomials.xx.z - polynomials.zz.z);
-                                    ubo.updateFloat3("vSphericalYY_ZZ", polynomials.yy.x - polynomials.zz.x, polynomials.yy.y - polynomials.zz.y, polynomials.yy.z - polynomials.zz.z);
-                                    ubo.updateFloat3("vSphericalZZ", polynomials.zz.x, polynomials.zz.y, polynomials.zz.z);
-                                    ubo.updateFloat3("vSphericalXY", polynomials.xy.x, polynomials.xy.y, polynomials.xy.z);
-                                    ubo.updateFloat3("vSphericalYZ", polynomials.yz.x, polynomials.yz.y, polynomials.yz.z);
-                                    ubo.updateFloat3("vSphericalZX", polynomials.zx.x, polynomials.zx.y, polynomials.zx.z);
-                                }
-                            }
-                        }
-                        else {
-                            // If we're using an irradiance map with a dominant direction assigned, set it.
-                            if (defines.USEIRRADIANCEMAP && defines.USE_IRRADIANCE_DOMINANT_DIRECTION) {
-                                ubo.updateVector3("vReflectionDominantDirection", reflectionTexture.irradianceTexture._dominantDirection);
-                            }
-                        }
-                        ubo.updateFloat3("vReflectionMicrosurfaceInfos", reflectionTexture.getSize().width, reflectionTexture.lodGenerationScale, reflectionTexture.lodGenerationOffset);
-                    }
                     if (this._emissiveTexture && MaterialFlags.EmissiveTextureEnabled) {
                         ubo.updateFloat2("vEmissiveInfos", this._emissiveTexture.coordinatesIndex, this._emissiveTexture.level);
                         BindTextureMatrix(this._emissiveTexture, ubo, "emissive");
@@ -1896,6 +1633,7 @@ export class PBRBaseMaterial extends PushMaterial {
                             ubo.updateFloat2("vTangentSpaceParams", this._invertNormalMapX ? -1.0 : 1.0, this._invertNormalMapY ? -1.0 : 1.0);
                         }
                     }
+                    BindIBLParameters(scene, defines, ubo, reflectionTexture, this.realTimeFiltering, true, true, true, true, true, this._reflectionColor);
                 }
                 // Point size
                 if (this.pointsCloud) {
@@ -1920,7 +1658,6 @@ export class PBRBaseMaterial extends PushMaterial {
                     ubo.updateColor4("vReflectivityColor", this._reflectivityColor, this._microSurface);
                 }
                 ubo.updateColor3("vEmissiveColor", MaterialFlags.EmissiveTextureEnabled ? this._emissiveColor : Color3.BlackReadOnly);
-                ubo.updateColor3("vReflectionColor", this._reflectionColor);
                 if (!defines.SS_REFRACTION && this.subSurface?._linkRefractionWithTransparency) {
                     ubo.updateColor4("vAlbedoColor", this._albedoColor, 1);
                 }
@@ -1957,24 +1694,7 @@ export class PBRBaseMaterial extends PushMaterial {
                 if (this._opacityTexture && MaterialFlags.OpacityTextureEnabled) {
                     ubo.setTexture("opacitySampler", this._opacityTexture);
                 }
-                if (reflectionTexture && MaterialFlags.ReflectionTextureEnabled) {
-                    if (defines.LODBASEDMICROSFURACE) {
-                        ubo.setTexture("reflectionSampler", reflectionTexture);
-                    }
-                    else {
-                        ubo.setTexture("reflectionSampler", reflectionTexture._lodTextureMid || reflectionTexture);
-                        ubo.setTexture("reflectionSamplerLow", reflectionTexture._lodTextureLow || reflectionTexture);
-                        ubo.setTexture("reflectionSamplerHigh", reflectionTexture._lodTextureHigh || reflectionTexture);
-                    }
-                    if (defines.USEIRRADIANCEMAP) {
-                        ubo.setTexture("irradianceSampler", reflectionTexture.irradianceTexture);
-                    }
-                    //if realtime filtering and using CDF maps, set them.
-                    const cdfGenerator = this.getScene().iblCdfGenerator;
-                    if (this.realTimeFiltering && cdfGenerator) {
-                        ubo.setTexture("icdfSampler", cdfGenerator.getIcdfTexture());
-                    }
-                }
+                BindIBLSamplers(scene, defines, ubo, reflectionTexture, this.realTimeFiltering);
                 if (defines.ENVIRONMENTBRDF) {
                     ubo.setTexture("environmentBrdfSampler", this._environmentBRDFTexture);
                 }
@@ -2303,9 +2023,6 @@ PBRBaseMaterial.LIGHTFALLOFF_STANDARD = 2;
  * False by default. This is mostly meant for backward compatibility.
  */
 PBRBaseMaterial.ForceGLSL = false;
-__decorate([
-    serializeAsImageProcessingConfiguration()
-], PBRBaseMaterial.prototype, "_imageProcessingConfiguration", void 0);
 __decorate([
     expandToProperty("_markAllSubMeshesAsMiscDirty")
 ], PBRBaseMaterial.prototype, "debugMode", void 0);