@driftengine/core 4.8.2 → 4.8.4

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

@@ -3,15 +3,18 @@ import { OCTAHEDRAL_GLSL } from '../octahedral.js';
 import { PROBEGRID_GLSL } from './probeGrid.js';
 import { TANGENT_FRAME_GLSL } from '../tangentFrame.js';
 import { CUTOUT_COVERAGE_GLSL } from '../cutoutCoverage.js';
+import { CUTOUT_DITHER_GLSL } from '../../cutoutDither.js';
 import { preambleGlsl } from './preamble.js';
 import { LOBES_GLSL } from './lobes.js';
 import { POINTSHADOW_GLSL } from './pointShadow.js';
 import { DIRECTIONALSHADOW_GLSL } from './directionalShadow.js';
 import { glassTintGlsl, litSwitchesGlsl } from './glassTint.js';
 import { MORPH_GLSL } from '../morph.js';
+import { CLOTH_BINDING_GLSL } from '../clothBinding.js';
 import { SKINNING_GLSL } from '../skinning.js';
 import { SURFACE_GLSL } from './surface.js';
 import { MAIN_GLSL } from './main.js';
+import { MODELS_GLSL } from './models.js';
 import { DRIFT_LIGHT_GLSL } from './driftLight.js';
 import { SURFACE_EFFECTS_GLSL } from './surfaceEffects.js';
 import { CHANNEL_ATTRIBUTE, CHANNEL_BEND } from '../vertexChannel.js';
@@ -61,6 +64,11 @@ uniform mat4 uLightViewProj;
  * when no texture is bound.
  */
 uniform vec2 uUvScale;
+/**
+ * Where the texture starts, per axis, added after the scale: \`uv * uUvScale + uUvOffset\`. What
+ * picks a cell of a flipbook or an atlas through the material. See \`SurfaceMaterial.uOffset\`.
+ */
+uniform vec2 uUvOffset;
 
 /*
  * **Placement and tint are declared last of the shared uniforms, and the position is the
@@ -139,6 +147,10 @@ ${CHANNEL_BEND}
 #if MORPHED
 ${MORPH_GLSL}
 #endif
+#if SKINNED
+/* Samplers and a constant alone, so no field of the vertex block moves. See clothBinding.ts. */
+${CLOTH_BINDING_GLSL}
+#endif
 
 out vec3 vNormal;
 out vec3 vColor;
@@ -212,9 +224,11 @@ void main() {
   mat4 skin = skinMatrix();
   vec4 local = skin * vec4(basePosition, 1.0);
   vec3 localNormal = mat3(skin) * aNormal;
+  vec3 localTangent = mat3(skin) * aTangent.xyz;
 #else
   vec4 local = vec4(basePosition, 1.0);
   vec3 localNormal = aNormal;
+  vec3 localTangent = aTangent.xyz;
 #endif
 #if INSTANCED
   mat4 model = mat4(aInstanceModel0, aInstanceModel1, aInstanceModel2, aInstanceModel3);
@@ -235,20 +249,42 @@ void main() {
   vec3 bent = channelBend(world.xyz, aChannel.x);
 #endif
   world = vec4(bent, world.w);
-  vWorldPos = world.xyz;
   // Rotation/translation-only models (our case): mat3 is a valid normal matrix.
   vec3 worldNormal = mat3(model) * localNormal;
+  /*
+   * **The tangent turns as the normal does**, because the fragment stage crosses it with the
+   * world-space normal to build its frame. It went out in the mesh's own space until 4.8.4, which
+   * is world space only for a mesh that is moved and never turned: a turned or skinned mesh lit its
+   * normal map, and anything reading a direction along its surface, from the wrong side.
+   */
+  vec3 worldTangent = mat3(model) * localTangent;
+#if SKINNED
+  /*
+   * **Toward the cloth, after the skeleton and the bend.** The simulation already swings with the
+   * wind it was given, so the bend moves only the skinned part; the weight painted per vertex says
+   * how much of the cloth's place and turn the vertex takes. See clothBinding.ts.
+   */
+  if (CLOTH_BOUND) {
+    vec3 clothPosition;
+    mat3 turn;
+    float follow = clothPlace(clothPosition, turn);
+    world = vec4(mix(world.xyz, clothPosition, follow), world.w);
+    worldNormal = normalize(mix(worldNormal, turn * aNormal, follow));
+    worldTangent = mix(worldTangent, turn * aTangent.xyz, follow);
+  }
+#endif
+  vWorldPos = world.xyz;
   vNormal = worldNormal;
   vLightPos = uLightViewProj * world;
   vColor = aColor * tint;
   vEmissive = aEmissive;
   vSpecular = aSpecular;
-  vUv = vec3(aUv.xy * uUvScale, aUv.z);
+  vUv = vec3(aUv.xy * uUvScale + uUvOffset, aUv.z);
   vEmissiveColor = aEmissiveColor;
   vRoughness = aRoughness;
   vGrain = aGrain;
   vRelief = aRelief;
-  vTangent = aTangent;
+  vTangent = vec4(worldTangent, aTangent.w);
 #if INSTANCED
   /* No channel on this path; the neutral values are what every mesh read before it existed. */
   vSkyDirect = 1.0;
@@ -392,8 +428,11 @@ export function flatFrag(options) {
         TANGENT_FRAME_GLSL,
         /* Unconditional for the same reason, and called only where a cutoff was asked for. */
         CUTOUT_COVERAGE_GLSL,
+        CUTOUT_DITHER_GLSL,
         DRIFT_LIGHT_GLSL,
         SURFACE_EFFECTS_GLSL,
+        /* Depth zero and after the tangent frame and the lobes it calls; see models.ts. */
+        MODELS_GLSL,
         MAIN_GLSL,
     ].join('\n'), {
         POINT_SHADOWS: options.pointShadows,