Remove lightmap from OpenPBR

Author: Mike Bond

packages/dev/core/src/Materials/PBR/openPbrMaterial.ts

@@ -251,12 +251,6 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
     public PARALLAXOCCLUSION = false;
     public NORMALXYSCALE = true;
 
-    public LIGHTMAP = false;
-    public LIGHTMAPDIRECTUV = 0;
-    public USELIGHTMAPASSHADOWMAP = false;
-    public GAMMALIGHTMAP = false;
-    public RGBDLIGHTMAP = false;
-
     public REFLECTION = false;
     public REFLECTIONMAP_3D = false;
     public REFLECTIONMAP_SPHERICAL = false;
@@ -278,7 +272,6 @@ export class OpenPBRMaterialDefines extends ImageProcessingDefinesMixin(OpenPBRM
     public LODINREFLECTIONALPHA = false;
     public GAMMAREFLECTION = false;
     public RGBDREFLECTION = false;
-    public LINEARSPECULARREFLECTION = false;
     public RADIANCEOCCLUSION = false;
     public HORIZONOCCLUSION = false;
 
@@ -658,20 +651,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     @expandToProperty("_markAllSubMeshesAsTexturesDirty")
     public useSpecularWeightFromTextureAlpha = false;
 
-    /**
-     * Stores the pre-calculated light information of a mesh in a texture.
-     */
-    @serializeAsTexture()
-    @expandToProperty("_markAllSubMeshesAsTexturesDirty", null)
-    public lightmapTexture: Nullable<BaseTexture>;
-
-    /**
-     * If true, the light map contains occlusion information instead of lighting info.
-     */
-    @serialize()
-    @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-    public useLightmapAsShadowmap = false;
-
     /**
      * Specifies that the alpha is coming form the albedo channel alpha channel for alpha blending.
      */
@@ -981,36 +960,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
      */
     public _useSpecularWeightFromTextureAlpha = false;
 
-    /**
-     * Stores the pre-calculated light information of a mesh in a texture.
-     * @internal
-     */
-    public _lightmapTexture: Nullable<BaseTexture> = null;
-
-    /**
-     * The color of a material in ambient lighting.
-     * @internal
-     */
-    public _ambientColor = new Color3(0, 0, 0);
-
-    /**
-     * AKA Specular Color in other nomenclature.
-     * @internal
-     */
-    public _reflectivityColor = new Color3(1, 1, 1);
-
-    /**
-     * The color applied when light is reflected from a material.
-     * @internal
-     */
-    public _reflectionColor = new Color3(1, 1, 1);
-
-    /**
-     * Specifies that the material will use the light map as a show map.
-     * @internal
-     */
-    public _useLightmapAsShadowmap = false;
-
     /**
      * This parameters will enable/disable Horizon occlusion to prevent normal maps to look shiny when the normal
      * makes the reflect vector face the model (under horizon).
@@ -1597,12 +1546,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                     }
                 }
 
-                if (this._lightmapTexture && MaterialFlags.LightmapTextureEnabled) {
-                    if (!this._lightmapTexture.isReadyOrNotBlocking()) {
-                        return false;
-                    }
-                }
-
                 if (this._environmentBRDFTexture && MaterialFlags.ReflectionTextureEnabled) {
                     // This is blocking.
                     if (!this._environmentBRDFTexture.isReady()) {
@@ -1691,8 +1634,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     public override buildUniformLayout(): void {
         // Order is important !
         const ubo = this._uniformBuffer;
-        ubo.addUniform("vLightmapInfos", 2);
-        ubo.addUniform("lightmapMatrix", 16);
         ubo.addUniform("vTangentSpaceParams", 2);
         ubo.addUniform("vLightingIntensity", 4);
 
@@ -1789,11 +1730,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                         }
                     }
 
-                    if (this._lightmapTexture && MaterialFlags.LightmapTextureEnabled) {
-                        ubo.updateFloat2("vLightmapInfos", this._lightmapTexture.coordinatesIndex, this._lightmapTexture.level);
-                        BindTextureMatrix(this._lightmapTexture, ubo, "lightmap");
-                    }
-
                     if (this.geometryNormalTexture) {
                         if (scene._mirroredCameraPosition) {
                             ubo.updateFloat2("vTangentSpaceParams", this._invertNormalMapX ? 1.0 : -1.0, this._invertNormalMapY ? 1.0 : -1.0);
@@ -1852,10 +1788,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                 if (defines.ENVIRONMENTBRDF) {
                     ubo.setTexture("environmentBrdfSampler", this._environmentBRDFTexture);
                 }
-
-                if (this._lightmapTexture && MaterialFlags.LightmapTextureEnabled) {
-                    ubo.setTexture("lightmapSampler", this._lightmapTexture);
-                }
             }
 
             // OIT with depth peeling
@@ -1929,10 +1861,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             results.push(this._reflectionTexture);
         }
 
-        if (this._lightmapTexture && this._lightmapTexture.animations && this._lightmapTexture.animations.length > 0) {
-            results.push(this._lightmapTexture);
-        }
-
         return results;
     }
 
@@ -1955,10 +1883,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             activeTextures.push(this._reflectionTexture);
         }
 
-        if (this._lightmapTexture) {
-            activeTextures.push(this._lightmapTexture);
-        }
-
         return activeTextures;
     }
 
@@ -1984,10 +1908,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             return true;
         }
 
-        if (this._lightmapTexture === texture) {
-            return true;
-        }
-
         return false;
     }
 
@@ -2020,7 +1940,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             }
 
             this._reflectionTexture?.dispose();
-            this._lightmapTexture?.dispose();
         }
 
         this._renderTargets.dispose();
@@ -2115,10 +2034,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             fallbacks.addFallback(fallbackRank++, "USEIRRADIANCEMAP");
         }
 
-        if (defines.LIGHTMAP) {
-            fallbacks.addFallback(fallbackRank++, "LIGHTMAP");
-        }
-
         if (defines.NORMAL) {
             fallbacks.addFallback(fallbackRank++, "NORMAL");
         }
@@ -2173,10 +2088,8 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
             "vFogInfos",
             "vFogColor",
             "pointSize",
-            "vLightmapInfos",
             "mBones",
             "normalMatrix",
-            "lightmapMatrix",
             "vLightingIntensity",
             "logarithmicDepthConstant",
             "vTangentSpaceParams",
@@ -2192,7 +2105,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         }
 
         const samplers = [
-            "lightmapSampler",
             "environmentBrdfSampler",
             "boneSampler",
             "morphTargets",
@@ -2321,7 +2233,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                 defines["MAINUV" + i] = false;
             }
             if (scene.texturesEnabled) {
-                defines.LIGHTMAPDIRECTUV = 0;
 
                 if (engine.getCaps().textureLOD) {
                     defines.LODBASEDMICROSFURACE = true;
@@ -2347,15 +2258,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
                     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;
-                    defines.GAMMALIGHTMAP = this._lightmapTexture.gammaSpace;
-                    defines.RGBDLIGHTMAP = this._lightmapTexture.isRGBD;
-                } else {
-                    defines.LIGHTMAP = false;
-                }
-
                 if (MaterialFlags.SpecularTextureEnabled) {
                     if (this._baseMetalRoughTexture) {
                         defines.AOSTOREINMETALMAPRED = this._useAmbientOcclusionFromMetallicTextureRed;

packages/dev/core/src/Shaders/ShadersInclude/openPbrUboDeclaration.fx

@@ -23,8 +23,6 @@ layout(std140, column_major) uniform;
 // }
 
 uniform Material {
-    vec2 vLightmapInfos;
-    mat4 lightmapMatrix;
     vec2 vTangentSpaceParams;
     vec4 vLightingIntensity;
     float pointSize;

packages/dev/core/src/Shaders/ShadersInclude/openpbrFragmentDeclaration.fx

@@ -42,10 +42,6 @@ uniform vec2 vGeometryOpacityInfos;
 uniform vec2 vEmissionInfos;
 #endif
 
-#ifdef LIGHTMAP
-uniform vec2 vLightmapInfos;
-#endif
-
 #ifdef METALLIC_ROUGHNESS
 uniform vec2 vBaseMetalRoughInfos;
 #endif

packages/dev/core/src/Shaders/ShadersInclude/openpbrFragmentSamplersDeclaration.fx

@@ -9,7 +9,6 @@
 
 #include<samplerFragmentDeclaration>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion,_SAMPLERNAME_,ambientOcclusion)
 #include<samplerFragmentDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal,_SAMPLERNAME_,decal)
-#include<samplerFragmentDeclaration>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap,_SAMPLERNAME_,lightmap)
 
 // Reflection
 #ifdef REFLECTION

packages/dev/core/src/Shaders/openpbr.fragment.fx

@@ -143,6 +143,19 @@ void main(void) {
 // Mopaque-base	=mix(Mglossy-diffuse,Ssubsurface,S)	whereS	=subsurface_weight
 // Mglossy-diffuse	=layer(Sdiffuse,Sgloss)
 
+// Base roughness is modified by the coat layer
+// rB′ = mix(rB, min(1, rB^4 + 2rC^4)^1/4 , C) where C = coat_weight  (61) in OpenPBR spec
+
+// Sample specular lobe IBL and analytic lights separately from BRDF for each layer
+//    - pass in roughness, anisotropy, sample vector (and tangent?). Same code for reflection and refraction.
+//    - Coat: - one sample - pass in coat_roughness_anisotropy, coat_roughness, geometry_coat_normal
+//    - Base:- one sample - pass in geometry_normal, specular_roughness, specular_anisotropy
+//    - Translucent refraction
+//    - thin-walled refraction - i.e. no refraction
+// Sample diffuse lobe IBL and analytic lights separately from BRDF for each layer
+//    - only Base layer has diffuse lobe
+//    - pass in base_diffuse_roughness, geometry_normal, base_color
+//    - Subsurface - refracted/transmitted diffuse - (geometry_thin_walled with subsurface is the same as glTF diffuse transmission)
 
 
     // _____________________________ AO  _______________________________
@@ -159,8 +172,6 @@ void main(void) {
     #endif
     );
 
-    #include<pbrBlockLightmapInit>
-
 #ifdef UNLIT
     vec3 diffuseBase = vec3(1., 1., 1.);
 #else // !UNLIT
@@ -233,6 +244,8 @@ vec4 specularColor = vSpecularColor;
     // _____________________________ Compute Geometry info _________________________________
     #include<openpbrBlockGeometryInfo>
 
+// Share code for reflection and refraction
+// Pass in values to select between reflection and refraction, diffuse and specular, anisotropic and isotropic
     // _____________________________ Reflection Info _______________________________________
     #ifdef REFLECTION
         reflectionOutParams reflectionOut;
@@ -250,9 +263,6 @@ vec4 specularColor = vSpecularColor;
             #endif
             #if defined(LODINREFLECTIONALPHA) && !defined(REFLECTIONMAP_SKYBOX)
                 , NdotVUnclamped
-            #endif
-            #ifdef LINEARSPECULARREFLECTION
-                , roughness
             #endif
                 , reflectionSampler
             #if defined(NORMAL) && defined(USESPHERICALINVERTEX)

packages/dev/core/src/Shaders/openpbr.vertex.fx

@@ -46,7 +46,6 @@ attribute vec4 color;
 #include<samplerVertexDeclaration>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion)
 #include<samplerVertexDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal)
 #include<samplerVertexDeclaration>(_DEFINENAME_,DETAIL,_VARYINGNAME_,Detail)
-#include<samplerVertexDeclaration>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap)
 
 // Output
 varying vec3 vPositionW;
@@ -225,7 +224,6 @@ void main(void) {
     #include<samplerVertexImplementation>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion,_MATRIXNAME_,ambientOcclusion,_INFONAME_,AmbientOcclusionInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal,_MATRIXNAME_,decal,_INFONAME_,DecalInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,DETAIL,_VARYINGNAME_,Detail,_MATRIXNAME_,detail,_INFONAME_,DetailInfos.x)
-    #include<samplerVertexImplementation>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap,_MATRIXNAME_,lightmap,_INFONAME_,LightmapInfos.x)
 
     // TBN
 #include<openpbrNormalMapVertex>

packages/dev/core/src/ShadersWGSL/ShadersInclude/openPbrUboDeclaration.fx

@@ -1,6 +1,4 @@
 
-uniform vLightmapInfos: vec2f;
-uniform lightmapMatrix: mat4x4f;
 uniform vTangentSpaceParams: vec2f;
 uniform vLightingIntensity: vec4f;
 uniform pointSize: f32;

packages/dev/core/src/ShadersWGSL/ShadersInclude/openpbrFragmentSamplersDeclaration.fx

@@ -9,8 +9,6 @@
 
 #include<samplerFragmentDeclaration>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion,_SAMPLERNAME_,ambientOcclusion)
 #include<samplerFragmentDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal,_SAMPLERNAME_,decal)
-#include<samplerFragmentDeclaration>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap,_SAMPLERNAME_,lightmap)
-
 
 // Reflection
 #ifdef REFLECTION

packages/dev/core/src/ShadersWGSL/openpbr.fragment.fx

@@ -132,8 +132,6 @@ fn main(input: FragmentInputs) -> FragmentOutputs {
     #endif
     );
 
-    #include<pbrBlockLightmapInit>
-
 #ifdef UNLIT
     var diffuseBase: vec3f =  vec3f(1., 1., 1.);
 #else

packages/dev/core/src/ShadersWGSL/openpbr.vertex.fx

@@ -42,7 +42,6 @@ attribute color: vec4f;
 #include<samplerVertexDeclaration>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion)
 #include<samplerVertexDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal)
 #include<samplerVertexDeclaration>(_DEFINENAME_,DETAIL,_VARYINGNAME_,Detail)
-#include<samplerVertexDeclaration>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap)
 
 // Output
 varying vPositionW: vec3f;
@@ -209,12 +208,11 @@ fn main(input : VertexInputs) -> FragmentInputs {
     #include<samplerVertexImplementation>(_DEFINENAME_,GEOMETRY_NORMAL,_VARYINGNAME_,GeometryNormal,_MATRIXNAME_,geometryNormal,_INFONAME_,GeometryNormalInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,GEOMETRY_OPACITY,_VARYINGNAME_,GeometryOpacity,_MATRIXNAME_,geometryOpacity,_INFONAME_,GeometryOpacityInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,EMISSION,_VARYINGNAME_,Emission,_MATRIXNAME_,emission,_INFONAME_,EmissionInfos.x)
-    
+
     #include<samplerVertexImplementation>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion,_MATRIXNAME_,ambientOcclusion,_INFONAME_,AmbientOcclusionInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal,_MATRIXNAME_,decal,_INFONAME_,DecalInfos.x)
     #include<samplerVertexImplementation>(_DEFINENAME_,DETAIL,_VARYINGNAME_,Detail,_MATRIXNAME_,detail,_INFONAME_,DetailInfos.x)
-    #include<samplerVertexImplementation>(_DEFINENAME_,LIGHTMAP,_VARYINGNAME_,Lightmap,_MATRIXNAME_,lightmap,_INFONAME_,LightmapInfos.x)
-    
+
     // TBN
 #include<openpbrNormalMapVertex>