@meimu/mutracer 0.1.3 → 0.1.4

package/lib/renderer/WGPURayTraceOutput.js

@@ -16,33 +16,33 @@ ${shadowCatcherAccumulationWGSL}
 override outputWidth: f32;
 override outputHeight: f32;
 
-struct oU {
+struct pd {
 ${layers ? `@location(0) foreground: vec4f,
 @location(1) catcherBackground: vec4f` : `@location(0) color: vec4f,
 @location(1) normal: vec4f,
 @location(2) albedo: vec4f${catcher ? ',\n  @location(3) shadowCatcher: vec4f' : ''}`}
 }
 @fragment
-fn main(@builtin(position) fD: vec4f) -> oU {
+fn main(@builtin(position) fG: vec4f) -> pd {
 let size = vec2u(u32(outputWidth), u32(outputHeight));
-let fM = vec2u(u32(fD.x), size.y - u32(fD.y) - 1u);
-var idx = fM.x + fM.y * size.x;
+let fP = vec2u(u32(fG.x), size.y - u32(fG.y) - 1u);
+var idx = fP.x + fP.y * size.x;
 
 
 
 
 if (sampleCount < 1.0 && normalBuffer[idx].a <= 0.0) {
-let uV = max(sampleTileGrid, vec2u(1u));
-let uF = min(
-((fM + uV / 2u) / uV) * uV,
-((size - vec2u(1u)) / uV) * uV
+let vc = max(sampleTileGrid, vec2u(1u));
+let uM = min(
+((fP + vc / 2u) / vc) * vc,
+((size - vec2u(1u)) / vc) * vc
 );
-let sz = uF.x + uF.y * size.x;
-if (normalBuffer[sz].a > 0.0) {
-idx = sz;
+let sH = uM.x + uM.y * size.x;
+if (normalBuffer[sH].a > 0.0) {
+idx = sH;
 }
 }
-var output: oU;
+var output: pd;
 if (normalBuffer[idx].a <= 0.0) {
 ${layers ? `output.foreground = vec4f(0.0);
 output.catcherBackground = vec4f(0.0);` : `output.color = vec4f(0.0);
@@ -62,12 +62,12 @@ let hit = albedo.a;
 let total = max(normal.a, 1.0);
 ${layers ? `
 let shadow = shadowCatcherBuffer[idx];
-let iQ = max(hit - shadow.mask.b, 0.0);
+let iV = max(hit - shadow.mask.b, 0.0);
 
 
 output.foreground = vec4f(
 (color.rgb - shadow.background.rgb)
-/ select(total, iQ, iQ > 0.0),
+/ select(total, iV, iV > 0.0),
 clamp((color.a - shadow.mask.g) / total, 0.0, 1.0)
 );
 output.catcherBackground = shadow.background / total;

package/lib/renderer/WGPURayTracePass.d.ts

@@ -57,6 +57,8 @@ export declare function makeRayTraceUniform(): {
         sequenceSeed: Uint32Array<ArrayBuffer>;
         zSobolLogSPP: Uint32Array<ArrayBuffer>;
         sampleSequenceOffset: Uint32Array<ArrayBuffer>;
+        environmentRotation: Float32Array<ArrayBuffer>;
+        backgroundMapTransform: Float32Array<ArrayBuffer>;
     };
 };
 export declare function packAnalyticsLightsToBuffer(lights: AnalyticLight[], texturesIndices: number[], selectionPmfs: number[], iesProfileTexelOffsets?: ArrayLike<number>): Float32Array<ArrayBuffer>;

package/lib/renderer/WGPURayTracePass.js

@@ -24,7 +24,7 @@ import { WGPU_SCENE_FEATURE_BITS, wgpuSceneFeatureFlags } from './WGPUSceneFeatu
 import { mat4 } from '../math.js';
 import MaterialTable, { DEFAULT_MAX_TEXTURE_ARRAY_BYTES, materialUsesMedium } from './MaterialTable.js';
 import { numberArraysEqual } from './util.js';
-import { generateBackgroundMapFromSceneBackground } from './envMapCreation.js';
+import { generateBackgroundMapFromSceneBackground, environmentRotation, backgroundMapTransform } from './envMapCreation.js';
 import rayTraceCompute, { WORKGROUP_SIZE } from './wgsl/rayTrace.compute.js';
 import { CONSTANT_DIRECTIONAL_LIGHT, CONSTANT_RECT_LIGHT, CONSTANT_SPHERE_LIGHT, CONSTANT_SPOT_LIGHT } from './lightsUtil.js';
 import { envMapDistribution, environmentMapSourcesMatch } from './envMapDistribution.js';
@@ -89,7 +89,7 @@ export function isWebGPUPipelineSpecializationFailure(...errors) {
 /** CPU-side views over the `RayTraceUniform` WGSL struct. */
 export function makeRayTraceUniform() {
     // Created from https://webgpufundamentals.org/webgpu/lessons/resources/wgsl-offset-computer.html
-    const RayTraceUniformValues = new ArrayBuffer(176);
+    const RayTraceUniformValues = new ArrayBuffer(256);
     const RayTraceUniformViews = {
         outputSize: new Float32Array(RayTraceUniformValues, 0, 2),
         sampleCount: new Float32Array(RayTraceUniformValues, 8, 1),
@@ -119,11 +119,15 @@ export function makeRayTraceUniform() {
         sceneFeatureFlags: new Uint32Array(RayTraceUniformValues, 152, 1),
         sequenceSeed: new Uint32Array(RayTraceUniformValues, 156, 1),
         zSobolLogSPP: new Uint32Array(RayTraceUniformValues, 160, 1),
-        sampleSequenceOffset: new Uint32Array(RayTraceUniformValues, 164, 1)
+        sampleSequenceOffset: new Uint32Array(RayTraceUniformValues, 164, 1),
+        environmentRotation: new Float32Array(RayTraceUniformValues, 176, 16),
+        backgroundMapTransform: new Float32Array(RayTraceUniformValues, 240, 4)
     };
     // Fixed runtime trip bounds discourage thin-film loop unrolling. Keep 4 for
     // 2 polarizations/substrates and 3 channels, independent of BSDF budgets.
     RayTraceUniformViews.loopUnrollGuard[0] = 4;
+    RayTraceUniformViews.environmentRotation.set(environmentRotation([]));
+    RayTraceUniformViews.backgroundMapTransform.set(backgroundMapTransform());
     RayTraceUniformViews.bevel[0] = 1;
     RayTraceUniformViews.dispersionWavelengths[0] = 3;
     return {
@@ -179,7 +183,7 @@ export function packAnalyticsLightsToBuffer(lights, texturesIndices, selectionPm
             data[(off + 2) * 4 + 3] = light.radius;
             packVec3(off + 3, [
                 Math.cos((light.outerAngle * Math.PI) / 180),
-                Math.min(1, Math.max(0, 1 - light.innerAngle / light.outerAngle)),
+                Math.cos((Math.min(light.innerAngle, light.outerAngle) * Math.PI) / 180),
                 0
             ]);
         }
@@ -792,8 +796,6 @@ class WGPURayTracePass {
                 ...MATERIAL_TEXTURE_DEFINES,
                 'USE_ANISOTROPY_DIRECTIONS',
                 'USE_COAT_NORMAL_FRAMES',
-                'COLOR_OFF',
-                'USE_VERTEX_COLOR',
                 'HAS_ALPHA_BLEND',
                 'HAS_ALPHA_MASK'
             ];
@@ -1621,6 +1623,7 @@ ${rayTraceCompute({
         return true;
     }
     setBackground(background) {
+        this._rtUniform.views.backgroundMapTransform.set(backgroundMapTransform(background));
         this._constants.USE_BACKGROUND = !!background;
         const backgroundImage = background && !Array.isArray(background)
             ? generateBackgroundMapFromSceneBackground(background)
@@ -2119,6 +2122,8 @@ ${rayTraceCompute({
         for (let i = 0; i < mapUvChannel.length; i++) {
             mapInfoData[numMaps * 8 + i * 4] = mapUvChannel[i];
             mapInfoData[numMaps * 8 + i * 4 + 1] = mapColorLinear[i];
+            mapInfoData[numMaps * 8 + i * 4 + 2] = materialData.bufferData.mapWrap[i * 2];
+            mapInfoData[numMaps * 8 + i * 4 + 3] = materialData.bufferData.mapWrap[i * 2 + 1];
         }
         let mapInfoUniform = this._mapInfoUniform;
         if (!mapInfoUniform || mapInfoUniform.size !== mapInfoData.byteLength) {
@@ -2186,6 +2191,7 @@ ${rayTraceCompute({
         const analyticLights = allAnalyticLights.slice(0, FIXED_LIGHT_COUNT);
         const numAnalyticLights = analyticLights.length;
         const envImage = this._sceneEnvironment.update(lights);
+        this._rtUniform.views.environmentRotation.set(environmentRotation(lights));
         this._rtUniform.views.lightsCount[0] = numAnalyticLights;
         this._setEnvMap(envImage);
         const lightTexturesChanged = this._rectLightTextures.update(analyticLights);