reze-engine 0.12.2 → 0.12.3

package/src/shaders/materials/stockings.ts

@@ -113,7 +113,7 @@ fn ramp_ease_s(f: f32, p0: f32, p1: f32) -> f32 {
 
   var out: FSOut;
   out.color = vec4f(final_color, 1.0);
-  out.mask = 1.0;
+  out.mask = vec4f(1.0, 1.0, 0.0, out.color.a);
   return out;
 }
 

package/src/shaders/passes/bloom.ts

@@ -24,10 +24,13 @@ fn fetch(c: vec2<i32>, clampV: f32) -> vec3f {
   let d = vec2<i32>(textureDimensions(hdrTex));
   let cc = clamp(c, vec2<i32>(0), d - vec2<i32>(1));
   let s = textureLoad(hdrTex, cc, 0);
-  // Scene pass uses src-alpha blend with clear alpha 0 → premultiplied. Unpremultiply.
-  let rgb = max(s.rgb / max(s.a, 1e-6), vec3f(0.0));
-  // Bloom mask: MRT r8unorm written by material shaders (1.0 = bloom, 0.0 = skip).
-  let mask = textureLoad(maskTex, cc, 0).r;
+  // hdrTex is rg11b10ufloat (no alpha channel). Alpha lives in maskTex.g, written
+  // alongside the bloom mask in .r by the scene pass. Scene uses src-alpha blend
+  // with clear alpha 0 → hdr rgb is premultiplied; divide by the aux alpha to
+  // recover straight color before the Karis luminance weighting.
+  let aux = textureLoad(maskTex, cc, 0);
+  let mask = aux.r;
+  let rgb = max(s.rgb / max(aux.g, 1e-6), vec3f(0.0));
   let masked = rgb * mask;
   // Blender clamps each tap BEFORE Karis average (eevee_bloom: color = min(clampIntensity, color)).
   return select(masked, min(masked, vec3f(clampV)), clampV > 0.0);

package/src/shaders/passes/composite.ts

@@ -13,6 +13,12 @@ override APPLY_GAMMA: bool = true;
 @group(0) @binding(1) var bloomTex: texture_2d<f32>;   // bloomUpTexture mip 0 (full pyramid top)
 @group(0) @binding(2) var bloomSamp: sampler;
 @group(0) @binding(3) var<uniform> viewU: array<vec4<f32>, 2>;
+// Aux mask/alpha texture. .r = bloom mask (unused here; bloom blit uses it).
+// .g = accumulated canvas alpha (what hdr.a carried before the HDR format
+// became rg11b10ufloat). We unpremultiply HDR by this alpha for tonemap, then
+// re-premultiply the tonemapped color for output so the premultiplied canvas
+// alphaMode composites the WebGPU surface over the page background correctly.
+@group(0) @binding(4) var maskTex: texture_2d<f32>;
 // viewU[0] = (exposure, invGamma, _, _);  viewU[1] = (tint.rgb, intensity)
 // invGamma = 1/gamma precomputed on CPU — avoids a per-pixel divide.
 
@@ -39,11 +45,12 @@ fn filmic(x: f32) -> f32 {
 }
 
 @fragment fn fs(@builtin(position) fragCoord: vec4f) -> @location(0) vec4f {
-  let hdr = textureLoad(hdrTex, vec2<i32>(fragCoord.xy), 0);
-  let a = max(hdr.a, 1e-6);
+  let coord = vec2<i32>(fragCoord.xy);
+  let hdr = textureLoad(hdrTex, coord, 0);
+  let alpha = textureLoad(maskTex, coord, 0).g;
+  let a = max(alpha, 1e-6);
   let straight = hdr.rgb / a;
   let fullSz = vec2f(textureDimensions(hdrTex));
-  let bloomSz = vec2f(textureDimensions(bloomTex));
   // Bloom is at half-res (pyramid mip 0). Sampler interpolates back to full-res UVs.
   // fragCoord.xy is already at pixel center (e.g. 0.5, 0.5 for first pixel).
   let bloomUv = fragCoord.xy / max(fullSz, vec2f(1.0));
@@ -57,6 +64,6 @@ fn filmic(x: f32) -> f32 {
   if (APPLY_GAMMA) {
     disp = pow(disp, vec3f(viewU[0].y));
   }
-  return vec4f(disp * hdr.a, hdr.a);
+  return vec4f(disp * alpha, alpha);
 }
 `

package/src/shaders/passes/ground.ts

@@ -48,7 +48,7 @@ struct VO { @builtin(position) position: vec4f, @location(0) worldPos: vec3f, @l
   var o: VO; o.worldPos = position; o.normal = normal;
   o.position = camera.projection * camera.view * vec4f(position, 1.0); return o;
 }
-struct FSOut { @location(0) color: vec4f, @location(1) mask: f32 };
+struct FSOut { @location(0) color: vec4f, @location(1) mask: vec4f };
 @fragment fn fs(i: VO) -> FSOut {
   let n = normalize(i.normal);
   let centerDist = length(i.worldPos.xz);
@@ -88,7 +88,11 @@ struct FSOut { @location(0) color: vec4f, @location(1) mask: f32 };
   let finalColor = mix(baseColor, material.gridLineColor, gridLine * material.gridLineOpacity * edgeFade);
   var out: FSOut;
   out.color = vec4f(finalColor * edgeFade, edgeFade);
-  out.mask = 0.0;
+  // mask.r = 0: ground never contributes to bloom. mask.g = 1.0 with src.a =
+  // edgeFade turns the aux blend into alpha-over, so the drawable alpha fades
+  // from edgeFade at the center to 0 at the radial edge — letting the page
+  // background show through under the premultiplied canvas alphaMode.
+  out.mask = vec4f(0.0, 1.0, 0.0, edgeFade);
   return out;
 }
 `

package/src/shaders/passes/outline.ts

@@ -74,11 +74,11 @@ struct VertexOutput {
   return output;
 }
 
-struct FSOut { @location(0) color: vec4f, @location(1) mask: f32 };
+struct FSOut { @location(0) color: vec4f, @location(1) mask: vec4f };
 @fragment fn fs() -> FSOut {
   var out: FSOut;
   out.color = material.edgeColor;
-  out.mask = 1.0;
+  out.mask = vec4f(1.0, 1.0, 0.0, out.color.a);
   return out;
 }
 `

package/dist/bezier-interpolate.d.ts

@@ -1,15 +0,0 @@
-/**
- * Bezier interpolation for VMD animations
- * Based on the reference implementation from babylon-mmd
- */
-/**
- * Bezier interpolation function
- * @param x1 First control point X (0-127, normalized to 0-1)
- * @param x2 Second control point X (0-127, normalized to 0-1)
- * @param y1 First control point Y (0-127, normalized to 0-1)
- * @param y2 Second control point Y (0-127, normalized to 0-1)
- * @param t Interpolation parameter (0-1)
- * @returns Interpolated value (0-1)
- */
-export declare function bezierInterpolate(x1: number, x2: number, y1: number, y2: number, t: number): number;
-//# sourceMappingURL=bezier-interpolate.d.ts.map

package/dist/bezier-interpolate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bezier-interpolate.d.ts","sourceRoot":"","sources":["../src/bezier-interpolate.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAgCnG"}

package/dist/bezier-interpolate.js

@@ -1,40 +0,0 @@
-/**
- * Bezier interpolation for VMD animations
- * Based on the reference implementation from babylon-mmd
- */
-/**
- * Bezier interpolation function
- * @param x1 First control point X (0-127, normalized to 0-1)
- * @param x2 Second control point X (0-127, normalized to 0-1)
- * @param y1 First control point Y (0-127, normalized to 0-1)
- * @param y2 Second control point Y (0-127, normalized to 0-1)
- * @param t Interpolation parameter (0-1)
- * @returns Interpolated value (0-1)
- */
-export function bezierInterpolate(x1, x2, y1, y2, t) {
-    // Clamp t to [0, 1]
-    t = Math.max(0, Math.min(1, t));
-    // Binary search for the t value that gives us the desired x
-    // We're solving for t in the Bezier curve: x(t) = 3*(1-t)^2*t*x1 + 3*(1-t)*t^2*x2 + t^3
-    let start = 0;
-    let end = 1;
-    let mid = 0.5;
-    // Iterate until we find the t value that gives us the desired x
-    for (let i = 0; i < 15; i++) {
-        // Evaluate Bezier curve at mid point
-        const x = 3 * (1 - mid) * (1 - mid) * mid * x1 + 3 * (1 - mid) * mid * mid * x2 + mid * mid * mid;
-        if (Math.abs(x - t) < 0.0001) {
-            break;
-        }
-        if (x < t) {
-            start = mid;
-        }
-        else {
-            end = mid;
-        }
-        mid = (start + end) / 2;
-    }
-    // Now evaluate the y value at this t
-    const y = 3 * (1 - mid) * (1 - mid) * mid * y1 + 3 * (1 - mid) * mid * mid * y2 + mid * mid * mid;
-    return y;
-}

package/dist/engine_ts.d.ts

@@ -1,143 +0,0 @@
-import { Quat, Vec3 } from "reze-mmd";
-export type EngineOptions = {
-    ambientColor?: Vec3;
-    bloomIntensity?: number;
-    rimLightIntensity?: number;
-    cameraDistance?: number;
-    cameraTarget?: Vec3;
-};
-export interface EngineStats {
-    fps: number;
-    frameTime: number;
-}
-export declare class Engine {
-    private canvas;
-    private device;
-    private context;
-    private presentationFormat;
-    private camera;
-    private cameraUniformBuffer;
-    private cameraMatrixData;
-    private cameraDistance;
-    private cameraTarget;
-    private lightUniformBuffer;
-    private lightData;
-    private vertexBuffer;
-    private indexBuffer?;
-    private resizeObserver;
-    private depthTexture;
-    private modelPipeline;
-    private eyePipeline;
-    private hairPipelineOverEyes;
-    private hairPipelineOverNonEyes;
-    private hairDepthPipeline;
-    private outlinePipeline;
-    private hairOutlinePipeline;
-    private mainBindGroupLayout;
-    private outlineBindGroupLayout;
-    private jointsBuffer;
-    private weightsBuffer;
-    private skinMatrixBuffer?;
-    private multisampleTexture;
-    private readonly sampleCount;
-    private renderPassDescriptor;
-    private readonly STENCIL_EYE_VALUE;
-    private readonly BLOOM_DOWNSCALE_FACTOR;
-    private static readonly DEFAULT_BLOOM_THRESHOLD;
-    private static readonly DEFAULT_BLOOM_INTENSITY;
-    private static readonly DEFAULT_RIM_LIGHT_INTENSITY;
-    private static readonly DEFAULT_CAMERA_DISTANCE;
-    private static readonly DEFAULT_CAMERA_TARGET;
-    private static readonly TRANSPARENCY_EPSILON;
-    private static readonly STATS_FPS_UPDATE_INTERVAL_MS;
-    private static readonly STATS_FRAME_TIME_ROUNDING;
-    private ambientColor;
-    private sceneRenderTexture;
-    private sceneRenderTextureView;
-    private bloomExtractTexture;
-    private bloomBlurTexture1;
-    private bloomBlurTexture2;
-    private bloomExtractPipeline;
-    private bloomBlurPipeline;
-    private bloomComposePipeline;
-    private blurDirectionBuffer;
-    private bloomIntensityBuffer;
-    private bloomThresholdBuffer;
-    private linearSampler;
-    private bloomExtractBindGroup?;
-    private bloomBlurHBindGroup?;
-    private bloomBlurVBindGroup?;
-    private bloomComposeBindGroup?;
-    private bloomThreshold;
-    private bloomIntensity;
-    private rimLightIntensity;
-    private currentModel;
-    private modelDir;
-    private physics;
-    private materialSampler;
-    private textureCache;
-    private vertexBufferNeedsUpdate;
-    private drawCalls;
-    private lastFpsUpdate;
-    private framesSinceLastUpdate;
-    private lastFrameTime;
-    private frameTimeSum;
-    private frameTimeCount;
-    private stats;
-    private animationFrameId;
-    private renderLoopCallback;
-    private player;
-    private hasAnimation;
-    constructor(canvas: HTMLCanvasElement, options?: EngineOptions);
-    init(): Promise<void>;
-    private createRenderPipeline;
-    private createPipelines;
-    private createBloomPipelines;
-    private setupBloom;
-    private setupResize;
-    private handleResize;
-    private setupCamera;
-    private setupLighting;
-    private setAmbientColor;
-    loadAnimation(url: string): Promise<void>;
-    playAnimation(): void;
-    stopAnimation(): void;
-    pauseAnimation(): void;
-    seekAnimation(time: number): void;
-    getAnimationProgress(): import("./player").AnimationProgress;
-    /**
-     * Apply animation pose to model
-     */
-    private applyPose;
-    /**
-     * Reset bones and physics to match a given pose
-     * @param pose The pose to apply
-     * @param resetBonesWithoutKeyframes If true, reset bones that don't have keyframes in the pose to identity
-     */
-    private resetBonesAndPhysics;
-    getStats(): EngineStats;
-    runRenderLoop(callback?: () => void): void;
-    stopRenderLoop(): void;
-    dispose(): void;
-    loadModel(path: string): Promise<void>;
-    rotateBones(bones: string[], rotations: Quat[], durationMs?: number): void;
-    moveBones(bones: string[], relativeTranslations: Vec3[], durationMs?: number): void;
-    setMorphWeight(name: string, weight: number, durationMs?: number): void;
-    private updateVertexBuffer;
-    private setupModelBuffers;
-    private setupMaterials;
-    private createMaterialUniformBuffer;
-    private createUniformBuffer;
-    private createTextureFromPath;
-    private renderEyes;
-    private renderHair;
-    render(): void;
-    private applyBloom;
-    private updateCameraUniforms;
-    private updateRenderTarget;
-    private updateModelPose;
-    private computeSkinMatrices;
-    private drawOutlines;
-    private updateStats;
-}
-//# sourceMappingURL=engine_ts.d.ts.map

package/dist/engine_ts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"engine_ts.d.ts","sourceRoot":"","sources":["../src/engine_ts.ts"],"names":[],"mappings":"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"}