@woosh/meep-engine 2.169.1 → 2.169.2

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderLitV0.js

@@ -1,4 +1,11 @@
 import { Color, ShaderMaterial, UniformsLib, UniformsUtils, Vector3 } from "three";
+import {
+    GLSL_IMPOSTOR_APPLY_FRAME_XFORM,
+    GLSL_IMPOSTOR_BILINEAR_WEIGHTS,
+    GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM,
+    GLSL_IMPOSTOR_DECODE_NORMAL_OS,
+    GLSL_OCTAHEDRAL_GRID
+} from "../../../shaders/chunks/glsl_octahedral_impostor.js";
 
 // Lit variant of ImpostorShaderV0 — runs three.js's STANDARD (physical) shading
 // model so the impostor responds to scene lights and shadow maps.
@@ -62,92 +69,9 @@ const shader_vx = `
     #include <logdepthbuf_pars_vertex>
     #include <clipping_planes_pars_vertex>
 
-    vec2 VecToSphereOct(vec3 pivotToCamera)
-    {
-        vec3 octant = sign(pivotToCamera);
-        float sum = dot(pivotToCamera, octant);
-        vec3 octahedron = pivotToCamera / sum;
-        if (octahedron.y < 0.0) {
-            vec3 absolute = abs(octahedron);
-            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
-        }
-        return octahedron.xz;
-    }
-
-    vec2 VecToHemiSphereOct(vec3 v)
-    {
-        v.y = max(v.y, 0.001);
-        v = normalize(v);
-        vec3 octant = sign(v);
-        float sum = dot(v, octant);
-        vec3 octahedron = v / sum;
-        return vec2(
-            octahedron.x + octahedron.z,
-            octahedron.z - octahedron.x
-        );
-    }
-
-    vec2 VectorToGrid(vec3 v)
-    {
-        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
-    }
-
-    vec3 OctaSphereDec(vec2 coord)
-    {
-        coord = (coord - 0.5) * 2.0;
-        vec3 p = vec3(coord.x, 0.0, coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        if (p.y < 0.0) {
-            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
-        }
-        return p;
-    }
-
-    vec3 OctaHemiSphereDec(vec2 coord)
-    {
-        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        return p;
-    }
-
-    vec3 GridToVector(vec2 coord)
-    {
-        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
-    }
-
-    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
-    {
-        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
-        return normalize(GridToVector(f));
-    }
-
-    vec4 ComputeFrameXform(vec3 D_frame, vec3 tangent_OS, vec3 binormal_OS)
-    {
-        vec3 D = abs(D_frame.y) > 0.99999
-                 ? normalize(D_frame + vec3(0.0, 0.0, 0.0001))
-                 : D_frame;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return vec4(
-            dot(tangent_OS,  bake_right),
-            dot(binormal_OS, bake_right),
-            dot(tangent_OS,  bake_up),
-            dot(binormal_OS, bake_up)
-        );
-    }
-
-    vec4 BilinearWeights(vec2 frac_uv)
-    {
-        vec2 omuv = vec2(1.0) - frac_uv;
-        return vec4(
-            omuv.x * omuv.y,
-            frac_uv.x * omuv.y,
-            omuv.x * frac_uv.y,
-            frac_uv.x * frac_uv.y
-        );
-    }
+${GLSL_OCTAHEDRAL_GRID}
+${GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM}
+${GLSL_IMPOSTOR_BILINEAR_WEIGHTS}
 
     void main() {
         vImpUv = uv;
@@ -325,101 +249,10 @@ const shader_fg = `
     // the CAMERA direction; here we need the same math evaluated for the
     // LIGHT direction.
 
-    vec2 VecToSphereOct(vec3 pivotToCamera)
-    {
-        vec3 octant = sign(pivotToCamera);
-        float sum = dot(pivotToCamera, octant);
-        vec3 octahedron = pivotToCamera / sum;
-        if (octahedron.y < 0.0) {
-            vec3 absolute = abs(octahedron);
-            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
-        }
-        return octahedron.xz;
-    }
-
-    vec2 VecToHemiSphereOct(vec3 v)
-    {
-        v.y = max(v.y, 0.001);
-        v = normalize(v);
-        vec3 octant = sign(v);
-        float sum = dot(v, octant);
-        vec3 octahedron = v / sum;
-        return vec2(
-            octahedron.x + octahedron.z,
-            octahedron.z - octahedron.x
-        );
-    }
-
-    vec2 VectorToGrid(vec3 v)
-    {
-        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
-    }
-
-    vec3 OctaSphereDec(vec2 coord)
-    {
-        coord = (coord - 0.5) * 2.0;
-        vec3 p = vec3(coord.x, 0.0, coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        if (p.y < 0.0) {
-            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
-        }
-        return p;
-    }
-
-    vec3 OctaHemiSphereDec(vec2 coord)
-    {
-        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        return p;
-    }
-
-    vec3 GridToVector(vec2 coord)
-    {
-        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
-    }
-
-    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
-    {
-        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
-        return normalize(GridToVector(f));
-    }
-
-    vec4 ComputeFrameXform(vec3 D_frame, vec3 tangent_OS, vec3 binormal_OS)
-    {
-        vec3 D = abs(D_frame.y) > 0.99999
-                 ? normalize(D_frame + vec3(0.0, 0.0, 0.0001))
-                 : D_frame;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return vec4(
-            dot(tangent_OS,  bake_right),
-            dot(binormal_OS, bake_right),
-            dot(tangent_OS,  bake_up),
-            dot(binormal_OS, bake_up)
-        );
-    }
-
-    vec4 BilinearWeights(vec2 frac_uv)
-    {
-        vec2 omuv = vec2(1.0) - frac_uv;
-        return vec4(
-            omuv.x * omuv.y,
-            frac_uv.x * omuv.y,
-            omuv.x * frac_uv.y,
-            frac_uv.x * frac_uv.y
-        );
-    }
-
-    vec2 apply_frame_xform(vec2 card_uv, vec4 xform)
-    {
-        vec2 c = card_uv - 0.5;
-        return vec2(
-            xform.x * c.x + xform.y * c.y,
-            xform.z * c.x + xform.w * c.y
-        ) + 0.5;
-    }
+${GLSL_OCTAHEDRAL_GRID}
+${GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM}
+${GLSL_IMPOSTOR_BILINEAR_WEIGHTS}
+${GLSL_IMPOSTOR_APPLY_FRAME_XFORM}
 
     // Sample one corner's atlas tile after rotating the card UV into that
     // frame's bake-camera basis. Returns the diffuse and geometry+ORM
@@ -434,19 +267,7 @@ const shader_fg = `
         atlas_uv = (gridFloor + corner_offset + uv) * frame_size;
     }
 
-    // Decode the atlas-encoded normal (stored in bake-camera view space)
-    // back to OBJECT-LOCAL space. Inverse of the (right, up, D_frame)
-    // basis the baker used. See BakeShaderStandard.js for the encode side.
-    vec3 decode_normal_OS(vec3 encoded, vec3 D_frame_OS)
-    {
-        vec3 n_bv = encoded * 2.0 - 1.0;
-        vec3 D = abs(D_frame_OS.y) > 0.99999
-                 ? normalize(D_frame_OS + vec3(0.0, 0.0, 0.0001))
-                 : D_frame_OS;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return bake_right * n_bv.x + bake_up * n_bv.y + D * n_bv.z;
-    }
+${GLSL_IMPOSTOR_DECODE_NORMAL_OS}
 
     void main() {
 

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderNormalsV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImpostorShaderNormalsV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderNormalsV0.js"],"names":[],"mappings":"AA0VA;;;;;;;GAOG;AACH;IACI,cAkBC;CACJ;kCAtX6D,OAAO"}
+{"version":3,"file":"ImpostorShaderNormalsV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderNormalsV0.js"],"names":[],"mappings":"AA0PA;;;;;;;GAOG;AACH;IACI,cAkBC;CACJ;kCAtR6D,OAAO"}

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderNormalsV0.js

@@ -1,4 +1,11 @@
 import { GLSL3, NoBlending, RawShaderMaterial, Vector3 } from "three";
+import {
+    GLSL_IMPOSTOR_APPLY_FRAME_XFORM,
+    GLSL_IMPOSTOR_BILINEAR_WEIGHTS,
+    GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM,
+    GLSL_IMPOSTOR_DECODE_NORMAL_OS,
+    GLSL_OCTAHEDRAL_GRID
+} from "../../../shaders/chunks/glsl_octahedral_impostor.js";
 
 // Debug-viz variant: outputs the parallax-corrected world-space surface
 // normal as RGB, mapped (-1..+1) -> (0..1). Use this side-by-side with
@@ -49,92 +56,9 @@ const shader_vx = `
     uniform float uFrames;
     uniform bool uIsFullSphere;
 
-    vec2 VecToSphereOct(vec3 pivotToCamera)
-    {
-        vec3 octant = sign(pivotToCamera);
-        float sum = dot(pivotToCamera, octant);
-        vec3 octahedron = pivotToCamera / sum;
-        if (octahedron.y < 0.0) {
-            vec3 absolute = abs(octahedron);
-            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
-        }
-        return octahedron.xz;
-    }
-
-    vec2 VecToHemiSphereOct(vec3 v)
-    {
-        v.y = max(v.y, 0.001);
-        v = normalize(v);
-        vec3 octant = sign(v);
-        float sum = dot(v, octant);
-        vec3 octahedron = v / sum;
-        return vec2(
-            octahedron.x + octahedron.z,
-            octahedron.z - octahedron.x
-        );
-    }
-
-    vec2 VectorToGrid(vec3 v)
-    {
-        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
-    }
-
-    vec3 OctaSphereDec(vec2 coord)
-    {
-        coord = (coord - 0.5) * 2.0;
-        vec3 p = vec3(coord.x, 0.0, coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        if (p.y < 0.0) {
-            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
-        }
-        return p;
-    }
-
-    vec3 OctaHemiSphereDec(vec2 coord)
-    {
-        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        return p;
-    }
-
-    vec3 GridToVector(vec2 coord)
-    {
-        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
-    }
-
-    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
-    {
-        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
-        return normalize(GridToVector(f));
-    }
-
-    vec4 ComputeFrameXform(vec3 D_frame, vec3 tangent_OS, vec3 binormal_OS)
-    {
-        vec3 D = abs(D_frame.y) > 0.99999
-                 ? normalize(D_frame + vec3(0.0, 0.0, 0.0001))
-                 : D_frame;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return vec4(
-            dot(tangent_OS,  bake_right),
-            dot(binormal_OS, bake_right),
-            dot(tangent_OS,  bake_up),
-            dot(binormal_OS, bake_up)
-        );
-    }
-
-    vec4 BilinearWeights(vec2 frac_uv)
-    {
-        vec2 omuv = vec2(1.0) - frac_uv;
-        return vec4(
-            omuv.x * omuv.y,
-            frac_uv.x * omuv.y,
-            omuv.x * frac_uv.y,
-            frac_uv.x * frac_uv.y
-        );
-    }
+${GLSL_OCTAHEDRAL_GRID}
+${GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM}
+${GLSL_IMPOSTOR_BILINEAR_WEIGHTS}
 
     void main() {
         vUv = uv;
@@ -234,28 +158,8 @@ const shader_fg = `
     uniform float uFrames;
     uniform float uDepthScale;
 
-    vec2 apply_frame_xform(vec2 card_uv, vec4 xform)
-    {
-        vec2 c = card_uv - 0.5;
-        return vec2(
-            xform.x * c.x + xform.y * c.y,
-            xform.z * c.x + xform.w * c.y
-        ) + 0.5;
-    }
-
-    // Decode encoded RGB (bake-view-space normal) back to OBJECT space
-    // using the corner's D_frame direction. Mirrors BakeShaderStandard's
-    // encode side.
-    vec3 decode_normal_OS(vec3 encoded, vec3 D_frame_OS)
-    {
-        vec3 n_bv = encoded * 2.0 - 1.0;
-        vec3 D = abs(D_frame_OS.y) > 0.99999
-                 ? normalize(D_frame_OS + vec3(0.0, 0.0, 0.0001))
-                 : D_frame_OS;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return bake_right * n_bv.x + bake_up * n_bv.y + D * n_bv.z;
-    }
+${GLSL_IMPOSTOR_APPLY_FRAME_XFORM}
+${GLSL_IMPOSTOR_DECODE_NORMAL_OS}
 
     void main() {
         // Same parallax shift as V0 so the visualised normals correspond

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderPerPixelV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImpostorShaderPerPixelV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderPerPixelV0.js"],"names":[],"mappings":"AA8WA;IACI,cAqCC;IAFG,4CAAyB;CAGhC;kCA7YM,OAAO"}
+{"version":3,"file":"ImpostorShaderPerPixelV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderPerPixelV0.js"],"names":[],"mappings":"AAqMA;IACI,cAqCC;IAFG,4CAAyB;CAGhC;kCApOM,OAAO"}

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderPerPixelV0.js

@@ -7,6 +7,13 @@ import {
     RawShaderMaterial,
     Vector3
 } from "three";
+import {
+    GLSL_IMPOSTOR_APPLY_FRAME_XFORM,
+    GLSL_IMPOSTOR_BILINEAR_WEIGHTS,
+    GLSL_IMPOSTOR_BLEND_4_FRAMES,
+    GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM,
+    GLSL_OCTAHEDRAL_GRID
+} from "../../../shaders/chunks/glsl_octahedral_impostor.js";
 
 // Per-pixel variant of ImpostorShaderV0. The atlas projection (octahedral
 // grid lookup, cell selection, bilinear weights, card TBN and per-frame UV
@@ -36,77 +43,8 @@ const shader_vx = `
     uniform float uFrames;
     uniform bool uIsFullSphere;
 
-    vec2 VecToSphereOct(vec3 pivotToCamera)
-    {
-        vec3 octant = sign(pivotToCamera);
-        float sum = dot(pivotToCamera, octant);
-        vec3 octahedron = pivotToCamera / sum;
-        if (octahedron.y < 0.0) {
-            vec3 absolute = abs(octahedron);
-            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
-        }
-        return octahedron.xz;
-    }
-
-    vec2 VecToHemiSphereOct(vec3 v)
-    {
-        v.y = max(v.y, 0.001);
-        v = normalize(v);
-        vec3 octant = sign(v);
-        float sum = dot(v, octant);
-        vec3 octahedron = v / sum;
-        return vec2(
-            octahedron.x + octahedron.z,
-            octahedron.z - octahedron.x
-        );
-    }
-
-    vec2 VectorToGrid(vec3 v)
-    {
-        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
-    }
-
-    vec3 OctaSphereDec(vec2 coord)
-    {
-        coord = (coord - 0.5) * 2.0;
-        vec3 p = vec3(coord.x, 0.0, coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        if (p.y < 0.0) {
-            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
-        }
-        return p;
-    }
-
-    vec3 OctaHemiSphereDec(vec2 coord)
-    {
-        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        return p;
-    }
-
-    vec3 GridToVector(vec2 coord)
-    {
-        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
-    }
-
-    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
-    {
-        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
-        return normalize(GridToVector(f));
-    }
-
-    vec4 BilinearWeights(vec2 frac_uv)
-    {
-        vec2 omuv = vec2(1.0) - frac_uv;
-        return vec4(
-            omuv.x * omuv.y,
-            frac_uv.x * omuv.y,
-            omuv.x * frac_uv.y,
-            frac_uv.x * frac_uv.y
-        );
-    }
+${GLSL_OCTAHEDRAL_GRID}
+${GLSL_IMPOSTOR_BILINEAR_WEIGHTS}
 
     void main() {
         vUv = uv;
@@ -175,118 +113,11 @@ const shader_fg = `
     uniform float uRadius;
     uniform bool uIsFullSphere;
 
-    vec2 VecToSphereOct(vec3 pivotToCamera)
-    {
-        vec3 octant = sign(pivotToCamera);
-        float sum = dot(pivotToCamera, octant);
-        vec3 octahedron = pivotToCamera / sum;
-        if (octahedron.y < 0.0) {
-            vec3 absolute = abs(octahedron);
-            octahedron.xz = octant.xz * vec2(1.0 - absolute.z, 1.0 - absolute.x);
-        }
-        return octahedron.xz;
-    }
-
-    vec2 VecToHemiSphereOct(vec3 v)
-    {
-        v.y = max(v.y, 0.001);
-        v = normalize(v);
-        vec3 octant = sign(v);
-        float sum = dot(v, octant);
-        vec3 octahedron = v / sum;
-        return vec2(
-            octahedron.x + octahedron.z,
-            octahedron.z - octahedron.x
-        );
-    }
-
-    vec2 VectorToGrid(vec3 v)
-    {
-        return uIsFullSphere ? VecToSphereOct(v) : VecToHemiSphereOct(v);
-    }
-
-    vec3 OctaSphereDec(vec2 coord)
-    {
-        coord = (coord - 0.5) * 2.0;
-        vec3 p = vec3(coord.x, 0.0, coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        if (p.y < 0.0) {
-            p.xz = sign(p.xz) * vec2(1.0 - a.y, 1.0 - a.x);
-        }
-        return p;
-    }
-
-    vec3 OctaHemiSphereDec(vec2 coord)
-    {
-        vec3 p = vec3(coord.x - coord.y, 0.0, -1.0 + coord.x + coord.y);
-        vec2 a = abs(p.xz);
-        p.y = 1.0 - a.x - a.y;
-        return p;
-    }
-
-    vec3 GridToVector(vec2 coord)
-    {
-        return uIsFullSphere ? OctaSphereDec(coord) : OctaHemiSphereDec(coord);
-    }
-
-    vec3 FrameToRay(vec2 frame, vec2 framesMinusOne)
-    {
-        vec2 f = clamp(frame / framesMinusOne, 0.0, 1.0);
-        return normalize(GridToVector(f));
-    }
-
-    vec4 ComputeFrameXform(vec3 D_frame, vec3 tangent_OS, vec3 binormal_OS)
-    {
-        vec3 D = abs(D_frame.y) > 0.99999
-                 ? normalize(D_frame + vec3(0.0, 0.0, 0.0001))
-                 : D_frame;
-        vec3 bake_right = normalize(cross(vec3(0.0, 1.0, 0.0), D));
-        vec3 bake_up    = cross(D, bake_right);
-        return vec4(
-            dot(tangent_OS,  bake_right),
-            dot(binormal_OS, bake_right),
-            dot(tangent_OS,  bake_up),
-            dot(binormal_OS, bake_up)
-        );
-    }
-
-    vec4 BilinearWeights(vec2 frac_uv)
-    {
-        vec2 omuv = vec2(1.0) - frac_uv;
-        return vec4(
-            omuv.x * omuv.y,
-            frac_uv.x * omuv.y,
-            omuv.x * frac_uv.y,
-            frac_uv.x * frac_uv.y
-        );
-    }
-
-    vec2 apply_frame_xform(vec2 card_uv, vec4 xform)
-    {
-        vec2 c = card_uv - 0.5;
-        return vec2(
-            xform.x * c.x + xform.y * c.y,
-            xform.z * c.x + xform.w * c.y
-        ) + 0.5;
-    }
-
-    vec4 blend_4_frames(
-        sampler2D tex, vec2 card_uv,
-        vec2 gridFloor, vec4 w,
-        vec4 x00, vec4 x10, vec4 x01, vec4 x11
-    ) {
-        vec2 frame_size = vec2(1.0 / uFrames);
-        vec2 uv00 = clamp(apply_frame_xform(card_uv, x00), 0.0, 1.0);
-        vec2 uv10 = clamp(apply_frame_xform(card_uv, x10), 0.0, 1.0);
-        vec2 uv01 = clamp(apply_frame_xform(card_uv, x01), 0.0, 1.0);
-        vec2 uv11 = clamp(apply_frame_xform(card_uv, x11), 0.0, 1.0);
-        vec4 s00 = texture(tex, (gridFloor + vec2(0.0, 0.0) + uv00) * frame_size);
-        vec4 s10 = texture(tex, (gridFloor + vec2(1.0, 0.0) + uv10) * frame_size);
-        vec4 s01 = texture(tex, (gridFloor + vec2(0.0, 1.0) + uv01) * frame_size);
-        vec4 s11 = texture(tex, (gridFloor + vec2(1.0, 1.0) + uv11) * frame_size);
-        return s00 * w.x + s10 * w.y + s01 * w.z + s11 * w.w;
-    }
+${GLSL_OCTAHEDRAL_GRID}
+${GLSL_IMPOSTOR_COMPUTE_FRAME_XFORM}
+${GLSL_IMPOSTOR_BILINEAR_WEIGHTS}
+${GLSL_IMPOSTOR_APPLY_FRAME_XFORM}
+${GLSL_IMPOSTOR_BLEND_4_FRAMES}
 
     void main() {
         // ---- per-pixel projection ----

package/src/engine/graphics/impostors/octahedral/shader/ImpostorShaderV0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImpostorShaderV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderV0.js"],"names":[],"mappings":"AAwZA;IACI,cAmEC;IAHG,4CAAyB;CAIhC;kCArdM,OAAO"}
+{"version":3,"file":"ImpostorShaderV0.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/impostors/octahedral/shader/ImpostorShaderV0.js"],"names":[],"mappings":"AA0QA;IACI,cAmEC;IAHG,4CAAyB;CAIhC;kCAvUM,OAAO"}