Refactor: split pbr shader

packages/core/src/lighting/AmbientLight.ts

@@ -104,7 +104,7 @@ export class AmbientLight {
 
     if (value) {
       shaderData.setTexture(AmbientLight._specularTextureProperty, value);
-      shaderData.setFloat(AmbientLight._mipLevelProperty, this._specularReflection.mipmapCount);
+      shaderData.setFloat(AmbientLight._mipLevelProperty, this._specularReflection.mipmapCount - 1);
       shaderData.enableMacro(AmbientLight._specularMacro);
     } else {
       shaderData.disableMacro(AmbientLight._specularMacro);

packages/core/src/material/PBRBaseMaterial.ts

@@ -151,9 +151,10 @@ export abstract class PBRBaseMaterial extends BaseMaterial {
   /**
    * Create a pbr base material instance.
    * @param engine - Engine to which the material belongs
+   * @param shader - Shader used by the material
    */
-  protected constructor(engine: Engine) {
-    super(engine, Shader.find("pbr"));
+  protected constructor(engine: Engine, shader: Shader) {
+    super(engine, shader);
 
     const shaderData = this.shaderData;
 

packages/core/src/material/PBRMaterial.ts

@@ -55,8 +55,7 @@ export class PBRMaterial extends PBRBaseMaterial {
    * @param engine - Engine to which the material belongs
    */
   constructor(engine: Engine) {
-    super(engine);
-    this.shaderData.enableMacro("IS_METALLIC_WORKFLOW");
+    super(engine, Shader.find("pbr"));
     this.shaderData.setFloat(PBRMaterial._metallicProp, 1.0);
     this.shaderData.setFloat(PBRMaterial._roughnessProp, 1.0);
   }

packages/core/src/material/PBRSpecularMaterial.ts

@@ -9,7 +9,7 @@ import { PBRBaseMaterial } from "./PBRBaseMaterial";
  */
 export class PBRSpecularMaterial extends PBRBaseMaterial {
   private static _specularColorProp = Shader.getPropertyByName("u_specularColor");
-  private static _glossinessProp = Shader.getPropertyByName("u_glossinessFactor");
+  private static _glossinessProp = Shader.getPropertyByName("u_glossiness");
   private static _specularGlossinessTextureProp = Shader.getPropertyByName("u_specularGlossinessSampler");
 
   /**
@@ -59,7 +59,7 @@ export class PBRSpecularMaterial extends PBRBaseMaterial {
    * @param engine - Engine to which the material belongs
    */
   constructor(engine: Engine) {
-    super(engine);
+    super(engine, Shader.find("pbr-specular"));
 
     this.shaderData.setColor(PBRSpecularMaterial._specularColorProp, new Color(1, 1, 1, 1));
     this.shaderData.setFloat(PBRSpecularMaterial._glossinessProp, 1.0);

packages/core/src/shader/Shader.ts

@@ -162,13 +162,9 @@ export class Shader {
     #ifdef GL_FRAGMENT_PRECISION_HIGH
       precision highp float;
       precision highp int;
-      #define O3_VERTEX_PRECISION highp
-      #define O3_FRAGMENT_PRECISION highp
     #else
       precision mediump float;
       precision mediump int;
-      #define O3_VERTEX_PRECISION mediump
-      #define O3_FRAGMENT_PRECISION mediump
     #endif
     `;
 

packages/core/src/shader/ShaderPool.ts

@@ -3,6 +3,7 @@ import blinnPhongVs from "../shaderlib/extra/blinn-phong.vs.glsl";
 import particleFs from "../shaderlib/extra/particle.fs.glsl";
 import particleVs from "../shaderlib/extra/particle.vs.glsl";
 import pbrFs from "../shaderlib/extra/pbr.fs.glsl";
+import pbrSpecularFs from "../shaderlib/extra/pbr-specular.fs.glsl";
 import pbrVs from "../shaderlib/extra/pbr.vs.glsl";
 import shadowMapFs from "../shaderlib/extra/shadow-map.fs.glsl";
 import shadowMapVs from "../shaderlib/extra/shadow-map.vs.glsl";
@@ -27,6 +28,7 @@ export class ShaderPool {
   static init(): void {
     Shader.create("blinn-phong", blinnPhongVs, blinnPhongFs);
     Shader.create("pbr", pbrVs, pbrFs);
+    Shader.create("pbr-specular", pbrVs, pbrSpecularFs);
     Shader.create("unlit", unlitVs, unlitFs);
     Shader.create("shadow-map", shadowMapVs, shadowMapFs);
     Shader.create("shadow", shadowMapVs, shadowFs);

packages/core/src/shaderlib/ShaderLib.ts

@@ -23,9 +23,7 @@ import worldpos_vert from "./worldpos_vert.glsl";
 import shadow_vert from "./shadow_vert.glsl";
 import fog_vert from "./fog_vert.glsl";
 
-import direct_light_frag from "./direct_light_frag.glsl";
-import point_light_frag from "./point_light_frag.glsl";
-import spot_light_frag from "./spot_light_frag.glsl";
+import light_frag_define from "./light_frag_define.glsl";
 import mobile_material_frag from "./mobile_material_frag.glsl";
 import fog_frag from "./fog_frag.glsl";
 
@@ -83,9 +81,7 @@ export const ShaderLib = {
   shadow_vert,
   fog_vert,
 
-  direct_light_frag,
-  point_light_frag,
-  spot_light_frag,
+  light_frag_define,
   mobile_material_frag,
   fog_frag,
 

packages/core/src/shaderlib/common.glsl

@@ -1,4 +1,6 @@
 #define PI 3.14159265359
+#define RECIPROCAL_PI 0.31830988618
+#define EPSILON 1e-6
 #define LOG2 1.442695
 
 #define saturate( a ) clamp( a, 0.0, 1.0 )

packages/core/src/shaderlib/common_frag.glsl

@@ -1,8 +1,8 @@
-uniform O3_VERTEX_PRECISION mat4 u_localMat;
-uniform O3_VERTEX_PRECISION mat4 u_modelMat;
-uniform O3_VERTEX_PRECISION mat4 u_viewMat;
-uniform O3_VERTEX_PRECISION mat4 u_projMat;
-uniform O3_VERTEX_PRECISION mat4 u_MVMat;
-uniform O3_VERTEX_PRECISION mat4 u_MVPMat;
-uniform O3_VERTEX_PRECISION mat4 u_normalMat;
-uniform O3_VERTEX_PRECISION vec3 u_cameraPos;
+uniform mat4 u_localMat;
+uniform mat4 u_modelMat;
+uniform mat4 u_viewMat;
+uniform mat4 u_projMat;
+uniform mat4 u_MVMat;
+uniform mat4 u_MVPMat;
+uniform mat4 u_normalMat;
+uniform vec3 u_cameraPos;

packages/core/src/shaderlib/extra/blinn-phong.fs.glsl

@@ -6,10 +6,7 @@
 #include <color_share>
 #include <worldpos_share>
 
-#include <pbr_envmap_light_frag_define>
-#include <direct_light_frag>
-#include <point_light_frag>
-#include <spot_light_frag>
+#include <light_frag_define>
 #include <mobile_material_frag>
 
 #include <fog_share>

packages/core/src/shaderlib/extra/pbr-specular.fs.glsl

@@ -0,0 +1,21 @@
+#include <common>
+#include <common_frag>
+
+#include <fog_share>
+
+#include <uv_share>
+#include <normal_share>
+#include <color_share>
+#include <worldpos_share>
+
+#include <light_frag_define>
+
+
+#include <pbr_frag_define>
+#include <pbr_helper>
+
+void main() {
+    #include <pbr_frag>
+    #include <gamma_frag>
+    #include <fog_frag>
+}

packages/core/src/shaderlib/extra/pbr.fs.glsl

@@ -1,7 +1,6 @@
+#define IS_METALLIC_WORKFLOW
 #include <common>
 #include <common_frag>
-#include <pbr_common_frag_define>
-#include <pbr_util_frag_define>
 
 #include <fog_share>
 
@@ -10,36 +9,14 @@
 #include <color_share>
 #include <worldpos_share>
 
-// light
-#include <direct_light_frag>
-#include <point_light_frag>
-#include <spot_light_frag>
-#include <pbr_envmap_light_frag_define>
+#include <light_frag_define>
 
-// prop & texture
-#include <pbr_base_frag_define>
-#include <pbr_texture_frag_define>
 
-// runtime context
-#include <pbr_runtime_frag_define>
-
-#include <normal_get>
-
-// todo: BxDF
-#include <pbr_brdf_cook_torrance_frag_define>
-
-
-// direct + indirect
-#include <pbr_direct_irradiance_frag_define>
-#include <pbr_ibl_diffuse_frag_define>
-#include <pbr_ibl_specular_frag_define>
+#include <pbr_frag_define>
+#include <pbr_helper>
 
 void main() {
-    #include <pbr_begin_frag>
-    #include <pbr_direct_irradiance_frag>
-    #include <pbr_ibl_diffuse_frag>
-    #include <pbr_ibl_specular_frag>
-    #include <pbr_end_frag>
+    #include <pbr_frag>
     #include <gamma_frag>
     #include <fog_frag>
 }

packages/core/src/shaderlib/fog_share.glsl

@@ -2,16 +2,16 @@
 
 varying vec3 v_fogDepth;
 
-uniform O3_VERTEX_PRECISION vec3 u_fogColor;
+uniform vec3 u_fogColor;
 
     #ifdef O3_FOG_EXP2
 
-        uniform O3_VERTEX_PRECISION float u_fogDensity;
+        uniform float u_fogDensity;
 
     #else
 
-        uniform O3_VERTEX_PRECISION float u_fogNear;
-        uniform O3_VERTEX_PRECISION float u_fogFar;
+        uniform float u_fogNear;
+        uniform float u_fogFar;
 
     #endif
 

packages/core/src/shaderlib/light_frag_define.glsl

@@ -0,0 +1,69 @@
+// directional light
+#ifdef O3_DIRECT_LIGHT_COUNT
+
+    struct DirectLight {
+        vec3 color;
+        vec3 direction;
+    };
+
+    uniform vec3 u_directLightColor[O3_DIRECT_LIGHT_COUNT];
+    uniform vec3 u_directLightDirection[O3_DIRECT_LIGHT_COUNT];
+
+#endif
+
+
+// point light
+#ifdef O3_POINT_LIGHT_COUNT
+
+    struct PointLight {
+        vec3 color;
+        vec3 position;
+        float distance;
+    };
+
+    uniform vec3 u_pointLightColor[ O3_POINT_LIGHT_COUNT ];
+    uniform vec3 u_pointLightPosition[ O3_POINT_LIGHT_COUNT ];
+    uniform float u_pointLightDistance[ O3_POINT_LIGHT_COUNT ];
+
+#endif
+
+
+// spot light
+#ifdef O3_SPOT_LIGHT_COUNT
+
+    struct SpotLight {
+        vec3 color;
+        vec3 position;
+        vec3 direction;
+        float distance;
+        float angleCos;
+        float penumbraCos;
+    };
+
+    uniform vec3 u_spotLightColor[ O3_SPOT_LIGHT_COUNT ];
+    uniform vec3 u_spotLightPosition[ O3_SPOT_LIGHT_COUNT ];
+    uniform vec3 u_spotLightDirection[ O3_SPOT_LIGHT_COUNT ];
+    uniform float u_spotLightDistance[ O3_SPOT_LIGHT_COUNT ];
+    uniform float u_spotLightAngleCos[ O3_SPOT_LIGHT_COUNT ];
+    uniform float u_spotLightPenumbraCos[ O3_SPOT_LIGHT_COUNT ];
+
+#endif
+
+// ambient light
+struct EnvMapLight {
+    vec3 diffuse;
+    float mipMapLevel;
+    float diffuseIntensity;
+    float specularIntensity;
+};
+
+
+uniform EnvMapLight u_envMapLight;
+
+#ifdef O3_USE_SH
+    uniform vec3 u_env_sh[9];
+#endif
+
+#ifdef O3_USE_SPECULAR_ENV
+    uniform samplerCube u_env_specularSampler;
+#endif