@driftengine/core 4.11.1 → 4.12.0

package/dist/render/shaders/flat/main.js

@@ -17,6 +17,9 @@ export const MAIN_GLSL = `void main() {
   projectSurface(surfaceAt, frameAt, frameTangents);
   /* A layered material's mask, read once for every layer's share below: layered.ts. */
   if (LAYERED && layered()) layeredBegin();
+  /* And the specular every highlight below reads: its layers' own, where a material gives them. */
+  surfaceSpecular = vSpecular;
+  if (LAYERED && layered()) surfaceSpecular = layeredSpecular(vSpecular);
   if (dot(vec4(vWorldPos, 1.0), uClipPlane) < 0.0) discard;
   /*
    * The layer's surface effects, zeros where the albedo array carries no table — see
@@ -510,6 +513,8 @@ export const MAIN_GLSL = `void main() {
 #endif
     /* A draw's own ambient, where one is set, in place of the frame's: \`setAmbientSH\`. */
     if (uAmbientSH[6].w > 0.5) ambient = ambientHarmonics(n);
+    /* Less of it where a layered material's mesh occlusion darkens the ambient light: layered.ts. */
+    if (LAYERED && layered()) ambient *= layeredAmbient();
     /*
      * A metal keeps its ambient and loses its direct diffuse.
      *
@@ -563,7 +568,7 @@ export const MAIN_GLSL = `void main() {
      * mix(x, y, 0) is exactly x, so at metal 0 this is vec3(vSpecular) and the line below is the
      * one it replaces with the scalar broadened to three components.
      */
-    vec3 specColor = mix(vec3(vSpecular), albedo, metal);
+    vec3 specColor = mix(vec3(surfaceSpecular), albedo, metal);
     /*
      * **A metal's highlight goes white at a grazing angle, and that is most of what reads as
      * polished.**
@@ -1656,7 +1661,7 @@ export const MAIN_GLSL = `void main() {
        * any lamp in the scene. The condition is the old one exactly when metal is 0, so nothing
        * that binds no map takes a different branch than it took before.
        */
-      if (vSpecular > 0.0 || metal > 0.0) {
+      if (surfaceSpecular > 0.0 || metal > 0.0) {
         vec3 toEyeLamp = normalize(uCameraPos - vWorldPos);
         vec3 lampHalfway = normalize(toLight / max(dist, 1e-4) + toEyeLamp);
         /* The same grazing whitening the sun's highlight takes, and zero at metal 0 for the look. */

package/dist/render/shaders/flat/models.js

@@ -218,7 +218,7 @@ void modelSurface(vec3 n, vec3 albedo, float roughness, float metal, vec3 at) {
   if (MODEL_SKIN) {
     if (SKIN_DIFFUSE) mAlbedo = vec3(1.0);
   }
-  mSpecColor = mix(vec3(vSpecular), albedo, metal);
+  mSpecColor = mix(vec3(surfaceSpecular), albedo, metal);
   mRoughness = roughness;
   mMetal = metal;
   mMap = vec4(0.5, 0.5, 1.0, 1.0);

package/dist/render/shaders/flat/preamble.js

@@ -39,6 +39,12 @@ in vec3 vColor;
 in vec3 vWorldPos;
 in float vEmissive;
 in float vSpecular;
+/*
+ * The specular this fragment shades with: its vertices' own, or a layered material's layers'
+ * blend of theirs, set once at the top of main. Every read of the specular reads this rather than
+ * the varying, so a layer's specular reaches the highlight, the reflection and the area lights alike.
+ */
+float surfaceSpecular;
 in vec4 vLightPos;
 in vec3 vUv;
 in vec3 vEmissiveColor;

package/dist/render/shaders/generated/flat.wgsl.d.ts

@@ -282,7 +282,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -412,6 +412,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -493,6 +500,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly pointShadows: {
@@ -894,7 +902,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -1024,6 +1032,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -1117,6 +1132,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly directionalShadows: {
@@ -1422,7 +1438,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -1552,6 +1568,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -1645,6 +1668,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+pointShadows": {
@@ -2076,7 +2100,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -2206,6 +2230,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -2311,6 +2342,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly environmentProbe: {
@@ -2636,7 +2668,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -2766,6 +2798,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -2852,6 +2891,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "environmentProbe+pointShadows": {
@@ -3303,7 +3343,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -3433,6 +3473,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -3531,6 +3578,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+environmentProbe": {
@@ -3886,7 +3934,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -4016,6 +4064,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -4114,6 +4169,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+environmentProbe+pointShadows": {
@@ -4595,7 +4651,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -4725,6 +4781,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -4835,6 +4898,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly nightEmissive: {
@@ -5115,7 +5179,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -5245,6 +5309,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -5326,6 +5397,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "nightEmissive+pointShadows": {
@@ -5732,7 +5804,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -5862,6 +5934,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -5955,6 +6034,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+nightEmissive": {
@@ -6265,7 +6345,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -6395,6 +6475,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -6488,6 +6575,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+nightEmissive+pointShadows": {
@@ -6924,7 +7012,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -7054,6 +7142,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -7159,6 +7254,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "environmentProbe+nightEmissive": {
@@ -7489,7 +7585,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -7619,6 +7715,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -7705,6 +7808,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "environmentProbe+nightEmissive+pointShadows": {
@@ -8161,7 +8265,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -8291,6 +8395,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -8389,6 +8500,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+environmentProbe+nightEmissive": {
@@ -8749,7 +8861,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -8879,6 +8991,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -8977,6 +9096,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
         readonly "directionalShadows+environmentProbe+nightEmissive+pointShadows": {
@@ -9463,7 +9583,7 @@ export declare const FLAT_BINDINGS: {
                 };
             };
             readonly materialUniforms: 2;
-            readonly materialSize: 672;
+            readonly materialSize: 912;
             readonly materialFields: {
                 readonly uSeeThrough: {
                     readonly offset: 0;
@@ -9593,6 +9713,13 @@ export declare const FLAT_BINDINGS: {
                     readonly length: 4;
                     readonly stride: 16;
                 };
+                readonly uLayerLooks: {
+                    readonly offset: 672;
+                    readonly size: 240;
+                    readonly type: "vec4";
+                    readonly length: 15;
+                    readonly stride: 16;
+                };
             };
             readonly textures: {
                 readonly uRefractScene: {
@@ -9703,6 +9830,7 @@ export declare const FLAT_BINDINGS: {
                 readonly REFLECTION_MAPS: 17;
                 readonly WORLD_UVS: 18;
                 readonly LAYERED: 19;
+                readonly LAYER_LOOKS: 20;
             };
         };
     };