@onerjs/core 9.0.2 → 9.0.3

package/Materials/PBR/pbrBaseMaterial.pure.d.ts

@@ -120,6 +120,8 @@ export declare class PBRMaterialDefines extends PBRMaterialDefines_base {
     AMBIENT: boolean;
     AMBIENTDIRECTUV: number;
     AMBIENTINGRAYSCALE: boolean;
+    BENTNORMAL: boolean;
+    BENTNORMALDIRECTUV: number;
     OPACITY: boolean;
     VERTEXALPHA: boolean;
     OPACITYDIRECTUV: number;
@@ -397,6 +399,11 @@ export declare abstract class PBRBaseMaterial extends PBRBaseMaterialBase {
      * @internal
      */
     _ambientTexture: Nullable<BaseTexture>;
+    /**
+     * Tangent-space bent normals for directional reflection occlusion.
+     * @internal
+     */
+    _bentNormalTexture: Nullable<BaseTexture>;
     /**
      * AKA Occlusion Texture Intensity in other nomenclature.
      * @internal
@@ -855,6 +862,8 @@ export declare abstract class PBRBaseMaterial extends PBRBaseMaterialBase {
      * @returns the texture used for the alpha test.
      */
     getAlphaTestTexture(): Nullable<BaseTexture>;
+    private _isEffectivelyUnlit;
+    private _isBentNormalTextureEnabled;
     /**
      * Specifies that the submesh is ready to be used.
      * @param mesh - BJS mesh.

package/Materials/PBR/pbrBaseMaterial.pure.js

@@ -63,6 +63,8 @@ export class PBRMaterialDefines extends ImageProcessingDefinesMixin(PBRMaterialD
         this.AMBIENT = false;
         this.AMBIENTDIRECTUV = 0;
         this.AMBIENTINGRAYSCALE = false;
+        this.BENTNORMAL = false;
+        this.BENTNORMALDIRECTUV = 0;
         this.OPACITY = false;
         this.VERTEXALPHA = false;
         this.OPACITYDIRECTUV = 0;
@@ -342,6 +344,11 @@ let PBRBaseMaterial = (() => {
                  * @internal
                  */
                 this._ambientTexture = null;
+                /**
+                 * Tangent-space bent normals for directional reflection occlusion.
+                 * @internal
+                 */
+                this._bentNormalTexture = null;
                 /**
                  * AKA Occlusion Texture Intensity in other nomenclature.
                  * @internal
@@ -785,6 +792,21 @@ let PBRBaseMaterial = (() => {
             getAlphaTestTexture() {
                 return this._albedoTexture;
             }
+            _isEffectivelyUnlit(mesh) {
+                return this._unlit || ((this.pointsCloud || this.wireframe) && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind));
+            }
+            _isBentNormalTextureEnabled(mesh) {
+                const scene = this.getScene();
+                return !!(this._bentNormalTexture &&
+                    !this._isEffectivelyUnlit(mesh) &&
+                    scene.texturesEnabled &&
+                    MaterialFlags.BentNormalTextureEnabled &&
+                    MaterialFlags.ReflectionTextureEnabled &&
+                    this._getReflectionTexture() &&
+                    scene.getEngine().getCaps().standardDerivatives &&
+                    ((this._ambientTexture && MaterialFlags.AmbientTextureEnabled) ||
+                        (this._metallicTexture && this._useAmbientOcclusionFromMetallicTextureRed && MaterialFlags.SpecularTextureEnabled)));
+            }
             /**
              * Specifies that the submesh is ready to be used.
              * @param mesh - BJS mesh.
@@ -807,6 +829,10 @@ let PBRBaseMaterial = (() => {
                     subMesh.materialDefines = new PBRMaterialDefines(this._eventInfo.defineNames);
                 }
                 const defines = subMesh.materialDefines;
+                if (this._bentNormalTexture && defines.UNLIT !== this._isEffectivelyUnlit(mesh)) {
+                    defines.markAsTexturesDirty();
+                    defines.markAsMiscDirty();
+                }
                 if (this._isReadyForSubMesh(subMesh)) {
                     return true;
                 }
@@ -837,6 +863,9 @@ let PBRBaseMaterial = (() => {
                                 return false;
                             }
                         }
+                        if (this._bentNormalTexture && this._isBentNormalTextureEnabled(mesh) && !this._bentNormalTexture.isReadyOrNotBlocking()) {
+                            return false;
+                        }
                         if (this._opacityTexture && MaterialFlags.OpacityTextureEnabled) {
                             if (!this._opacityTexture.isReadyOrNotBlocking()) {
                                 return false;
@@ -1098,6 +1127,7 @@ let PBRBaseMaterial = (() => {
                     "vBaseWeightInfos",
                     "vBaseDiffuseRoughnessInfos",
                     "vAmbientInfos",
+                    "vBentNormalInfos",
                     "vOpacityInfos",
                     "vEmissiveInfos",
                     "vReflectivityInfos",
@@ -1111,6 +1141,7 @@ let PBRBaseMaterial = (() => {
                     "baseWeightMatrix",
                     "baseDiffuseRoughnessMatrix",
                     "ambientMatrix",
+                    "bentNormalMatrix",
                     "opacityMatrix",
                     "emissiveMatrix",
                     "reflectivityMatrix",
@@ -1136,6 +1167,7 @@ let PBRBaseMaterial = (() => {
                     "baseDiffuseRoughnessSampler",
                     "reflectivitySampler",
                     "ambientSampler",
+                    "bentNormalSampler",
                     "emissiveSampler",
                     "bumpSampler",
                     "lightmapSampler",
@@ -1242,11 +1274,14 @@ let PBRBaseMaterial = (() => {
                     for (let i = 1; i <= 6; ++i) {
                         defines["MAINUV" + i] = false;
                     }
+                    defines.BENTNORMAL = false;
+                    defines.BENTNORMALDIRECTUV = 0;
                     if (scene.texturesEnabled) {
                         defines.ALBEDODIRECTUV = 0;
                         defines.BASE_WEIGHTDIRECTUV = 0;
                         defines.BASE_DIFFUSE_ROUGHNESSDIRECTUV = 0;
                         defines.AMBIENTDIRECTUV = 0;
+                        defines.BENTNORMALDIRECTUV = 0;
                         defines.OPACITYDIRECTUV = 0;
                         defines.EMISSIVEDIRECTUV = 0;
                         defines.REFLECTIVITYDIRECTUV = 0;
@@ -1298,6 +1333,9 @@ let PBRBaseMaterial = (() => {
                             engine.getCaps().maxVaryingVectors <= 8 ||
                             this._baseDiffuseRoughnessTexture != null;
                         PrepareDefinesForIBL(scene, reflectionTexture, defines, this.realTimeFiltering, this.realTimeFilteringQuality, !useSHInFragment);
+                        if (this._bentNormalTexture && this._isBentNormalTextureEnabled(mesh) && defines.REFLECTION) {
+                            PrepareDefinesForMergedUV(this._bentNormalTexture, defines, "BENTNORMAL");
+                        }
                         if (this._lightmapTexture && MaterialFlags.LightmapTextureEnabled) {
                             PrepareDefinesForMergedUV(this._lightmapTexture, defines, "LIGHTMAP");
                             defines.USELIGHTMAPASSHADOWMAP = this._useLightmapAsShadowmap;
@@ -1442,7 +1480,7 @@ let PBRBaseMaterial = (() => {
                 // Misc.
                 if (defines._areMiscDirty) {
                     PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this.needAlphaTestingForMesh(mesh), defines, this._applyDecalMapAfterDetailMap, this._useVertexPulling, renderingMesh, this._isVertexOutputInvariant);
-                    defines.UNLIT = this._unlit || ((this.pointsCloud || this.wireframe) && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind));
+                    defines.UNLIT = this._isEffectivelyUnlit(mesh);
                     defines.DEBUGMODE = this._debugMode;
                 }
                 // Values that need to be evaluated on every frame
@@ -1508,6 +1546,7 @@ let PBRBaseMaterial = (() => {
                 ubo.addUniform("vBaseWeightInfos", 2);
                 ubo.addUniform("vBaseDiffuseRoughnessInfos", 2);
                 ubo.addUniform("vAmbientInfos", 4);
+                ubo.addUniform("vBentNormalInfos", 2);
                 ubo.addUniform("vOpacityInfos", 2);
                 ubo.addUniform("vEmissiveInfos", 2);
                 ubo.addUniform("vLightmapInfos", 2);
@@ -1518,6 +1557,7 @@ let PBRBaseMaterial = (() => {
                 ubo.addUniform("baseWeightMatrix", 16);
                 ubo.addUniform("baseDiffuseRoughnessMatrix", 16);
                 ubo.addUniform("ambientMatrix", 16);
+                ubo.addUniform("bentNormalMatrix", 16);
                 ubo.addUniform("opacityMatrix", 16);
                 ubo.addUniform("emissiveMatrix", 16);
                 ubo.addUniform("lightmapMatrix", 16);
@@ -1617,6 +1657,10 @@ let PBRBaseMaterial = (() => {
                                 ubo.updateFloat4("vAmbientInfos", this._ambientTexture.coordinatesIndex, this._ambientTexture.level, this._ambientTextureStrength, this._ambientTextureImpactOnAnalyticalLights);
                                 BindTextureMatrix(this._ambientTexture, ubo, "ambient");
                             }
+                            if (defines.BENTNORMAL && this._bentNormalTexture) {
+                                ubo.updateFloat2("vBentNormalInfos", this._bentNormalTexture.coordinatesIndex, this._bentNormalTexture.level);
+                                BindTextureMatrix(this._bentNormalTexture, ubo, "bentNormal");
+                            }
                             if (this._opacityTexture && MaterialFlags.OpacityTextureEnabled) {
                                 ubo.updateFloat2("vOpacityInfos", this._opacityTexture.coordinatesIndex, this._opacityTexture.level);
                                 BindTextureMatrix(this._opacityTexture, ubo, "opacity");
@@ -1654,6 +1698,8 @@ let PBRBaseMaterial = (() => {
                             if (this._bumpTexture && engine.getCaps().standardDerivatives && MaterialFlags.BumpTextureEnabled && !this._disableBumpMap) {
                                 ubo.updateFloat3("vBumpInfos", this._bumpTexture.coordinatesIndex, this._bumpTexture.level, this._parallaxScaleBias);
                                 BindTextureMatrix(this._bumpTexture, ubo, "bump");
+                            }
+                            if (defines.BUMP || defines.BENTNORMAL) {
                                 if (scene._mirroredCameraPosition) {
                                     ubo.updateFloat2("vTangentSpaceParams", this._invertNormalMapX ? 1.0 : -1.0, this._invertNormalMapY ? 1.0 : -1.0);
                                 }
@@ -1719,6 +1765,9 @@ let PBRBaseMaterial = (() => {
                         if (this._ambientTexture && MaterialFlags.AmbientTextureEnabled) {
                             ubo.setTexture("ambientSampler", this._ambientTexture);
                         }
+                        if (defines.BENTNORMAL && this._bentNormalTexture) {
+                            ubo.setTexture("bentNormalSampler", this._bentNormalTexture);
+                        }
                         if (this._opacityTexture && MaterialFlags.OpacityTextureEnabled) {
                             ubo.setTexture("opacitySampler", this._opacityTexture);
                         }
@@ -1816,6 +1865,9 @@ let PBRBaseMaterial = (() => {
                 if (this._ambientTexture && this._ambientTexture.animations && this._ambientTexture.animations.length > 0) {
                     results.push(this._ambientTexture);
                 }
+                if (this._bentNormalTexture && this._bentNormalTexture.animations && this._bentNormalTexture.animations.length > 0) {
+                    results.push(this._bentNormalTexture);
+                }
                 if (this._opacityTexture && this._opacityTexture.animations && this._opacityTexture.animations.length > 0) {
                     results.push(this._opacityTexture);
                 }
@@ -1876,6 +1928,9 @@ let PBRBaseMaterial = (() => {
                 if (this._ambientTexture) {
                     activeTextures.push(this._ambientTexture);
                 }
+                if (this._bentNormalTexture) {
+                    activeTextures.push(this._bentNormalTexture);
+                }
                 if (this._opacityTexture) {
                     activeTextures.push(this._opacityTexture);
                 }
@@ -1929,6 +1984,9 @@ let PBRBaseMaterial = (() => {
                 if (this._ambientTexture === texture) {
                     return true;
                 }
+                if (this._bentNormalTexture === texture) {
+                    return true;
+                }
                 if (this._opacityTexture === texture) {
                     return true;
                 }
@@ -1992,6 +2050,7 @@ let PBRBaseMaterial = (() => {
                     this._baseWeightTexture?.dispose();
                     this._baseDiffuseRoughnessTexture?.dispose();
                     this._ambientTexture?.dispose();
+                    this._bentNormalTexture?.dispose();
                     this._opacityTexture?.dispose();
                     this._reflectionTexture?.dispose();
                     this._emissiveTexture?.dispose();