Added OpenPBR inspector data and WIP on coat noramls

Author: Mike Bond

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

@@ -625,6 +625,15 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     private _geometryNormalTexture: Sampler = new Sampler("geometry_normal", "geometryNormal", "GEOMETRY_NORMAL");
 
+    /**
+     * Defines the normal of the material's coat layer.
+     * See OpenPBR's specs for geometry_coat_normal
+     */
+    public geometryCoatNormalTexture: BaseTexture;
+    @addAccessorsForMaterialProperty("_markAllSubMeshesAsTexturesDirty", "geometryCoatNormalTexture")
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    private _geometryCoatNormalTexture: Sampler = new Sampler("geometry_coat_normal", "geometryCoatNormal", "GEOMETRY_COAT_NORMAL");
+
     /**
      * Defines the opacity of the material's geometry.
      * See OpenPBR's specs for geometry_opacity
@@ -643,6 +652,15 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     private _geometryOpacityTexture: Sampler = new Sampler("geometry_opacity", "geometryOpacity", "GEOMETRY_OPACITY");
 
+    /**
+     * Defines the opacity of the material's geometry.
+     * See OpenPBR's specs for geometry_opacity
+     */
+    public emissionLuminance: number;
+    @addAccessorsForMaterialProperty("_markAllSubMeshesAsTexturesDirty", "emissionLuminance")
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    private _emissionLuminance: Property<number> = new Property<number>("emission_luminance", 1.0, "vLightingIntensity", 4, 1);
+
     /**
      * Defines the color of the material's emission.
      * See OpenPBR's specs for emission_color
@@ -656,10 +674,10 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
      * Defines the color of the material's emission.
      * See OpenPBR's specs for emission_color
      */
-    public emissionTexture: BaseTexture;
-    @addAccessorsForMaterialProperty("_markAllSubMeshesAsTexturesDirty", "emissionTexture")
+    public emissionColorTexture: BaseTexture;
+    @addAccessorsForMaterialProperty("_markAllSubMeshesAsTexturesDirty", "emissionColorTexture")
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    private _emissionTexture: Sampler = new Sampler("emission", "emission", "EMISSION");
+    private _emissionColorTexture: Sampler = new Sampler("emission_color", "emissionColor", "EMISSION_COLOR");
 
     /**
      * Defines the ambient occlusion texture.
@@ -682,14 +700,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     @expandToProperty("_markAllSubMeshesAsTexturesDirty")
     public directIntensity: number = 1.0;
 
-    /**
-     * Intensity of the emissive part of the material.
-     * This helps controlling the emissive effect without modifying the emissive color.
-     */
-    @serialize()
-    @expandToProperty("_markAllSubMeshesAsTexturesDirty")
-    public emissiveIntensity: number = 1.0;
-
     /**
      * Intensity of the environment e.g. how much the environment will light the object
      * either through harmonics for rough material or through the reflection for shiny ones.
@@ -967,13 +977,6 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
      */
     public _directIntensity: number = 1.0;
 
-    /**
-     * Intensity of the emissive part of the material.
-     * This helps controlling the emissive effect without modifying the emissive color.
-     * @internal
-     */
-    public _emissiveIntensity: number = 1.0;
-
     /**
      * Intensity of the environment e.g. how much the environment will light the object
      * either through harmonics for rough material or through the reflection for shiny ones.
@@ -984,7 +987,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
     /**
      * This stores the direct, emissive, environment, and specular light intensities into a Vector4.
      */
-    private _lightingInfos: Vector4 = new Vector4(this._directIntensity, this._emissiveIntensity, this._environmentIntensity, 1.0);
+    private _lightingInfos: Vector4 = new Vector4(this._directIntensity, 1.0, this._environmentIntensity, 1.0);
 
     /**
      * Stores the radiance (and, possibly, irradiance) values in a texture.
@@ -1317,10 +1320,12 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
         this._coatRoughnessTexture;
         this._coatIor;
         this._geometryNormalTexture;
+        this._geometryCoatNormalTexture;
         this._geometryOpacity;
         this._geometryOpacityTexture;
+        this._emissionLuminance;
         this._emissionColor;
-        this._emissionTexture;
+        this._emissionColorTexture;
         this._ambientOcclusionTexture;
     }
 
@@ -1781,7 +1786,7 @@ export class OpenPBRMaterial extends OpenPBRMaterialBase {
 
                 // Misc
                 this._lightingInfos.x = this._directIntensity;
-                this._lightingInfos.y = this._emissiveIntensity;
+                this._lightingInfos.y = this.emissionLuminance;
                 this._lightingInfos.z = this._environmentIntensity * scene.environmentIntensity;
                 this._lightingInfos.w = 1.0; // This is used to be _specularIntensity.
 

packages/dev/core/src/Rendering/IBLShadows/iblShadowsPluginMaterial.ts

@@ -170,11 +170,11 @@ export class IBLShadowsPluginMaterial extends MaterialPluginBase {
                             #ifdef COLORED_IBL_SHADOWS
                                 var shadowValue: vec3f = computeIndirectShadow();
                                 slab_diffuse *= shadowValue;
-                                slab_glossy *= mix(vec3f(1.0), shadowValue, alphaG);
+                                slab_glossy *= mix(vec3f(1.0), shadowValue, specularAlphaG);
                             #else
                                 var shadowValue: vec2f = computeIndirectShadow();
                                 slab_diffuse *= vec3f(shadowValue.x);
-                                slab_glossy *= vec3f(mix(pow(shadowValue.y, 4.0), shadowValue.x, alphaG));
+                                slab_glossy *= vec3f(mix(pow(shadowValue.y, 4.0), shadowValue.x, specularAlphaG));
                             #endif
                         #endif
                     #else
@@ -248,11 +248,11 @@ export class IBLShadowsPluginMaterial extends MaterialPluginBase {
                             #ifdef COLORED_IBL_SHADOWS
                                 vec3 shadowValue = computeIndirectShadow();
                                 slab_diffuse.rgb *= shadowValue.rgb;
-                                slab_glossy *= mix(vec3(1.0), shadowValue.rgb, alphaG);
+                                slab_glossy *= mix(vec3(1.0), shadowValue.rgb, specularAlphaG);
                             #else
                                 vec2 shadowValue = computeIndirectShadow();
                                 slab_diffuse *= shadowValue.x;
-                                slab_glossy *= mix(pow(shadowValue.y, 4.0), shadowValue.x, alphaG);
+                                slab_glossy *= mix(pow(shadowValue.y, 4.0), shadowValue.x, specularAlphaG);
                             #endif
                         #endif
                     #else

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

@@ -91,10 +91,12 @@ uniform Material {
     mat4 coatRoughnessMatrix;
     vec2 vGeometryNormalInfos;
     mat4 geometryNormalMatrix;
+    vec2 vGeometryCoatNormalInfos;
+    mat4 geometryCoatNormalMatrix;
     vec2 vGeometryOpacityInfos;
     mat4 geometryOpacityMatrix;
-    vec2 vEmissionInfos;
-    mat4 emissionMatrix;
+    vec2 vEmissionColorInfos;
+    mat4 emissionColorMatrix;
     vec2 vAmbientOcclusionInfos;
     mat4 ambientOcclusionMatrix;
 

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

@@ -0,0 +1,19 @@
+#if defined(FORCENORMALFORWARD) && defined(NORMAL)
+    vec3 faceNormal = normalize(cross(dFdx(vPositionW), dFdy(vPositionW))) * vEyePosition.w;
+    #if defined(TWOSIDEDLIGHTING)
+        faceNormal = gl_FrontFacing ? faceNormal : -faceNormal;
+    #endif
+
+    normalW *= sign(dot(normalW, faceNormal));
+    coatNormalW *= sign(dot(coatNormalW, faceNormal));
+#endif
+
+#if defined(TWOSIDEDLIGHTING) && defined(NORMAL)
+    #if defined(MIRRORED)
+        normalW = gl_FrontFacing ? -normalW : normalW;
+        coatNormalW = gl_FrontFacing ? -coatNormalW : coatNormalW;
+    #else
+        normalW = gl_FrontFacing ? normalW : -normalW;
+        coatNormalW = gl_FrontFacing ? coatNormalW : -coatNormalW;
+    #endif
+#endif

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

@@ -1,11 +1,6 @@
 #ifdef LIGHT{X}
     vec4 diffuse{X} = light{X}.vLightDiffuse;
 
-    // Diffuse contribution
-    #ifdef SS_TRANSLUCENCY
-        info{X}.diffuseTransmission = vec3(0.0);
-    #endif
-
     #ifdef HEMILIGHT{X}
         info{X}.diffuse = computeHemisphericDiffuseLighting(preInfo{X}, diffuse{X}.rgb, light{X}.vLightGround);
     #elif defined(AREALIGHT{X})

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

@@ -1,6 +1,6 @@
 #ifdef LIGHT{X}
     preLightingInfo preInfo{X};
-    lightingInfo info{X};
+    openpbrLightingInfo info{X};
     float shadow{X} = 1.;
     #if defined(SHADOWONLY) || defined(LIGHTMAP) && defined(LIGHTMAPEXCLUDED{X}) && defined(LIGHTMAPNOSPECULAR{X})
         //No light calculation

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

@@ -1,16 +1,18 @@
 uniform vec4 vEyePosition;
 
-uniform vec3 vReflectionColor;
-uniform vec4 vBaseColor;
 uniform float vBaseWeight;
+uniform vec4 vBaseColor;
 uniform float vBaseDiffuseRoughness;
-uniform vec4 vCoatColor;
+uniform vec4 vReflectanceInfo;
+uniform vec4 vSpecularColor;
+uniform float vCoatWeight;
+uniform vec3 vCoatColor;
+uniform float vCoatRoughness;
+uniform float vCoatIor;
+uniform vec3 vEmissionColor;
 
 // CUSTOM CONTROLS
 uniform vec4 vLightingIntensity;
-
-uniform vec3 vEmissionColor;
-
 uniform float visibility;
 
 // Samplers
@@ -35,12 +37,16 @@ uniform vec2 vGeometryNormalInfos;
 uniform vec2 vTangentSpaceParams;
 #endif
 
+#ifdef GEOMETRY_COAT_NORMAL
+uniform vec2 vGeometryCoatNormalInfos;
+#endif
+
 #ifdef GEOMETRY_OPACITY
 uniform vec2 vGeometryOpacityInfos;
 #endif
 
-#ifdef EMISSION
-uniform vec2 vEmissionInfos;
+#ifdef EMISSION_COLOR
+uniform vec2 vEmissionColorInfos;
 #endif
 
 #ifdef METALLIC_ROUGHNESS

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

@@ -8,7 +8,7 @@
 #include<samplerFragmentDeclaration>(_DEFINENAME_,COAT_COLOR,_VARYINGNAME_,CoatColor,_SAMPLERNAME_,coatColor)
 #include<samplerFragmentDeclaration>(_DEFINENAME_,COAT_ROUGHNESS,_VARYINGNAME_,CoatRoughness,_SAMPLERNAME_,coatRoughness)
 #include<samplerFragmentDeclaration>(_DEFINENAME_,GEOMETRY_OPACITY,_VARYINGNAME_,GeometryOpacity,_SAMPLERNAME_,geometryOpacity)
-#include<samplerFragmentDeclaration>(_DEFINENAME_,EMISSION,_VARYINGNAME_,Emission,_SAMPLERNAME_,emission)
+#include<samplerFragmentDeclaration>(_DEFINENAME_,EMISSION_COLOR,_VARYINGNAME_,EmissionColor,_SAMPLERNAME_,emissionColor)
 
 #include<samplerFragmentDeclaration>(_DEFINENAME_,AMBIENT_OCCLUSION,_VARYINGNAME_,AmbientOcclusion,_SAMPLERNAME_,ambientOcclusion)
 #include<samplerFragmentDeclaration>(_DEFINENAME_,DECAL,_VARYINGNAME_,Decal,_SAMPLERNAME_,decal)

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

@@ -26,7 +26,7 @@ geometryInfoOutParams geometryInfo(
     outParams.horizonOcclusion = 1.0;
     #if defined(ENVIRONMENTBRDF) && !defined(REFLECTIONMAP_SKYBOX)
         #ifdef HORIZONOCCLUSION
-            #ifdef GEOMETRY_NORMAL
+            #if defined(GEOMETRY_NORMAL) || defined(GEOMETRY_COAT_NORMAL)
                 #ifdef REFLECTIONMAP_3D
                     outParams.horizonOcclusion = environmentHorizonOcclusion(-viewDirectionW, normalW, geometricNormalW);
                 #endif

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

@@ -1,5 +1,4 @@
 vec2 uvOffset = vec2(0.0, 0.0);
-
 #if defined(GEOMETRY_NORMAL) || defined(PARALLAX) || defined(DETAIL)
 	#ifdef NORMALXYSCALE
 		float normalScale = 1.0;
@@ -48,6 +47,10 @@
     vec3 detailNormal = vec3(detailNormalRG, detailNormalB);
 #endif
 
+#ifdef GEOMETRY_COAT_NORMAL
+	coatNormalW = perturbNormal(TBN, texture2D(geometryNormalSampler, vGeometryNormalUV + uvOffset).xyz, vGeometryNormalInfos.y);
+#endif
+
 #ifdef GEOMETRY_NORMAL
 	#ifdef OBJECTSPACE_NORMALMAP