@meimu/mutracer 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/bvh.worker.js +1 -1
- package/dist/mutracer.umd.js +4155 -4052
- package/docs/api.md +13 -10
- package/docs/materials.md +17 -26
- package/docs/threejs.md +35 -9
- package/docs/viewer.md +36 -3
- package/lib/Engine.js +18 -1
- package/lib/Engine.js.map +1 -1
- package/lib/main.d.ts +1 -1
- package/lib/main.js.map +1 -1
- package/lib/oidn.d.ts +1 -1
- package/lib/oidnBundledWeights.cdn.d.ts +2 -2
- package/lib/renderer/MaterialTable.d.ts +1 -0
- package/lib/renderer/MaterialTable.js +10 -4
- package/lib/renderer/MaterialTable.js.map +1 -1
- package/lib/renderer/WGPUBloomPass.js +18 -18
- package/lib/renderer/WGPUFullQuadPass.js +6 -6
- package/lib/renderer/WGPUJNLMDenoiser.js +69 -69
- package/lib/renderer/WGPURayTraceOutput.js +14 -14
- package/lib/renderer/WGPURayTracePass.d.ts +2 -0
- package/lib/renderer/WGPURayTracePass.js +17 -9
- package/lib/renderer/WGPURayTracePass.js.map +1 -1
- package/lib/renderer/WGPURenderingPipeline.js +15 -15
- package/lib/renderer/WebGLJNLMDenoiser.js +69 -69
- package/lib/renderer/WebGLRayTraceOutputPass.js +4 -4
- package/lib/renderer/WebGLRayTracePass.d.ts +1 -0
- package/lib/renderer/WebGLRayTracePass.js +8 -1
- package/lib/renderer/WebGLRayTracePass.js.map +1 -1
- package/lib/renderer/envMapCreation.d.ts +5 -1
- package/lib/renderer/envMapCreation.js +42 -5
- package/lib/renderer/envMapCreation.js.map +1 -1
- package/lib/renderer/geometryUpdates.js +1 -1
- package/lib/renderer/geometryUpdates.js.map +1 -1
- package/lib/renderer/glsl/chunks/cameraRay.glsl.js +12 -12
- package/lib/renderer/glsl/chunks/envMap.glsl.js +66 -54
- package/lib/renderer/glsl/chunks/envMap.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/intersect.glsl.js +323 -315
- package/lib/renderer/glsl/chunks/intersect.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/materialBuffer.glsl.js +154 -121
- package/lib/renderer/glsl/chunks/materialBuffer.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/openPbrBsdf.glsl.js +434 -434
- package/lib/renderer/glsl/chunks/openPbrBsdf.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/rand.glsl.js +3 -3
- package/lib/renderer/glsl/chunks/random.glsl.js +3 -3
- package/lib/renderer/glsl/chunks/rayTraceCore.glsl.js +42 -41
- package/lib/renderer/glsl/chunks/rayTraceCore.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/sampleLight.glsl.js +69 -69
- package/lib/renderer/glsl/chunks/sampleMaterial.glsl.js +84 -84
- package/lib/renderer/glsl/chunks/sampleMaterial.glsl.js.map +1 -1
- package/lib/renderer/glsl/chunks/sampleShadowCatcher.glsl.js +12 -12
- package/lib/renderer/glsl/chunks/sampling.glsl.js +75 -75
- package/lib/renderer/glsl/chunks/sobol.glsl.js +61 -61
- package/lib/renderer/glsl/chunks/textureLinear.glsl.js +5 -5
- package/lib/renderer/glsl/chunks/uvProjection.glsl.js +11 -11
- package/lib/renderer/glsl/depthQuery.frag.js +5 -5
- package/lib/renderer/glsl/depthQuery.frag.js.map +1 -1
- package/lib/renderer/glsl/normalizeRayTraceOutput.frag.js +8 -8
- package/lib/renderer/glsl/rayTrace.frag.js +133 -133
- package/lib/renderer/glsl/rayTrace.frag.js.map +1 -1
- package/lib/renderer/glsl/shadowCatcher.frag.js +9 -9
- package/lib/renderer/glsl/shadowCatcher.frag.js.map +1 -1
- package/lib/renderer/glsl/webglPipeline.frag.js +52 -52
- package/lib/renderer/lightsUtil.js +6 -4
- package/lib/renderer/lightsUtil.js.map +1 -1
- package/lib/renderer/materialChanges.js +1 -1
- package/lib/renderer/materialChanges.js.map +1 -1
- package/lib/renderer/materialComparison.generated.js +36 -18
- package/lib/renderer/materialComparison.generated.js.map +1 -1
- package/lib/renderer/prepareMeshBVH.js +2 -2
- package/lib/renderer/prepareMeshBVH.js.map +1 -1
- package/lib/renderer/sceneChangeDetector.js +4 -1
- package/lib/renderer/sceneChangeDetector.js.map +1 -1
- package/lib/renderer/sceneLightChanges.js +3 -2
- package/lib/renderer/sceneLightChanges.js.map +1 -1
- package/lib/renderer/scratchSampling.js +18 -18
- package/lib/renderer/wgsl/chunks/common.wgsl.js +4 -4
- package/lib/renderer/wgsl/chunks/envMap.wgsl.d.ts +1 -1
- package/lib/renderer/wgsl/chunks/envMap.wgsl.js +39 -31
- package/lib/renderer/wgsl/chunks/envMap.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/intersect.wgsl.js +476 -470
- package/lib/renderer/wgsl/chunks/intersect.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/intersectionAlpha.wgsl.js +8 -8
- package/lib/renderer/wgsl/chunks/materialBuffer.wgsl.js +95 -60
- package/lib/renderer/wgsl/chunks/materialBuffer.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/openPbrBsdf.wgsl.js +469 -469
- package/lib/renderer/wgsl/chunks/pdm_displacement.wgsl.d.ts +1 -1
- package/lib/renderer/wgsl/chunks/pdm_displacement.wgsl.js +117 -120
- package/lib/renderer/wgsl/chunks/pdm_displacement.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/rand.wgsl.js +3 -3
- package/lib/renderer/wgsl/chunks/rayTraceCore.wgsl.js +25 -22
- package/lib/renderer/wgsl/chunks/rayTraceCore.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/sampleLight.wgsl.js +127 -127
- package/lib/renderer/wgsl/chunks/sampleMaterial.wgsl.js +136 -136
- package/lib/renderer/wgsl/chunks/sampleShadowCatcher.wgsl.js +6 -6
- package/lib/renderer/wgsl/chunks/sampling.wgsl.js +73 -73
- package/lib/renderer/wgsl/chunks/sobol.wgsl.js +62 -62
- package/lib/renderer/wgsl/chunks/uvProjection.wgsl.js +11 -11
- package/lib/renderer/wgsl/compose.frag.wgsl.js +105 -105
- package/lib/renderer/wgsl/customDenoise.wgsl.js +10 -10
- package/lib/renderer/wgsl/depthQuery.wgsl.d.ts +1 -1
- package/lib/renderer/wgsl/depthQuery.wgsl.js +5 -5
- package/lib/renderer/wgsl/depthQuery.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/offlineAdaptive.compute.js +28 -28
- package/lib/renderer/wgsl/rayTrace.compute.js +251 -248
- package/lib/renderer/wgsl/rayTrace.compute.js.map +1 -1
- package/lib/scene/EnvironmentLight.d.ts +9 -3
- package/lib/scene/EnvironmentLight.js +9 -2
- package/lib/scene/EnvironmentLight.js.map +1 -1
- package/lib/scene/OpenPBRMaterial.d.ts +1 -1
- package/lib/scene/OpenPBRMaterial.js +1 -1
- package/lib/scene/OpenPBRMaterial.js.map +1 -1
- package/lib/scene/Scene.d.ts +4 -0
- package/lib/scene/Scene.js.map +1 -1
- package/lib/scene/SpotLight.d.ts +2 -2
- package/lib/scene/SpotLight.js +1 -1
- package/lib/scene/SpotLight.js.map +1 -1
- package/lib/scene/Texture.d.ts +17 -6
- package/lib/scene/Texture.js +13 -4
- package/lib/scene/Texture.js.map +1 -1
- package/lib/util/fromTHREE.js +151 -29
- package/lib/util/fromTHREE.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/lib/version.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
export function createSampleMaterialWgsl(hasAnisotropyDirections = true, hasCoatNormals = false) {
|
|
5
5
|
return /* wgsl */ `
|
|
6
6
|
|
|
7
|
-
struct
|
|
7
|
+
struct ne {
|
|
8
8
|
ray: Ray,
|
|
9
9
|
maxDistance: f32,
|
|
10
10
|
triangleIndex: i32,
|
|
@@ -16,49 +16,49 @@ lightSelectionPmf: f32,
|
|
|
16
16
|
valid: bool,
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
fn
|
|
19
|
+
fn qq(
|
|
20
20
|
si: ptr<function, ad>,
|
|
21
21
|
ma: J,
|
|
22
22
|
prepared: ag,
|
|
23
23
|
aa: ptr<function, Path>,
|
|
24
24
|
ffnormal: vec3f,
|
|
25
|
-
|
|
25
|
+
gF: bool,
|
|
26
26
|
ca: u32,
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
aV: u32,
|
|
28
|
+
gj: ptr<function, ne>
|
|
29
29
|
) -> bool {
|
|
30
|
-
(*
|
|
31
|
-
(*
|
|
32
|
-
(*
|
|
33
|
-
let
|
|
30
|
+
(*gj).valid = false;
|
|
31
|
+
(*gj).lightSelectionPmf = 0.0;
|
|
32
|
+
(*gj).risTarget = 0.0;
|
|
33
|
+
let ln = vec3f(fp(rd(ca, 1u)), dz(rd(ca, 0u)));
|
|
34
34
|
|
|
35
35
|
var lightSample: LightSampleRec;
|
|
36
|
-
|
|
36
|
+
mH(
|
|
37
37
|
(*si).position,
|
|
38
|
-
|
|
38
|
+
ln,
|
|
39
39
|
ca,
|
|
40
|
-
|
|
40
|
+
aV,
|
|
41
41
|
&lightSample
|
|
42
42
|
);
|
|
43
43
|
var Li = lightSample.emission;
|
|
44
44
|
|
|
45
45
|
let lightDir = lightSample.direction;
|
|
46
|
-
let
|
|
47
|
-
let
|
|
46
|
+
let oS = -(*aa).ray.d;
|
|
47
|
+
let fg = lightSample.pdf;
|
|
48
48
|
let lightSelectionPmf = lightSample.selectionPmf;
|
|
49
49
|
|
|
50
50
|
|
|
51
51
|
${hasCoatNormals ? /* wgsl */ `var cosThetaL = dot(ffnormal, lightDir);
|
|
52
|
-
if (
|
|
52
|
+
if (gF && ma.coatNormalEnabled) { cosThetaL = dot(ma.geometricNormal, lightDir); }` : 'let cosThetaL = dot(ffnormal, lightDir);'}
|
|
53
53
|
|
|
54
|
-
if (
|
|
54
|
+
if (fg <= 0.0 || lightSelectionPmf <= 0.0 ||
|
|
55
55
|
max(max(Li.x, Li.y), Li.z) <= 0.0) {
|
|
56
56
|
return false;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
var scatteringPdf = 0.0;
|
|
60
60
|
var f = vec3f(0.0);
|
|
61
|
-
if (
|
|
61
|
+
if (gF) {
|
|
62
62
|
|
|
63
63
|
|
|
64
64
|
if (cosThetaL <= 0.0 && ma.transmissionWeight <= 0.0 && ma.subsurfaceWeight <= 0.0) {
|
|
@@ -68,7 +68,7 @@ f = bI(prepared, lightDir, &scatteringPdf);
|
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
70
|
scatteringPdf = bD(
|
|
71
|
-
dot(
|
|
71
|
+
dot(oS, lightDir),
|
|
72
72
|
(*si).mediumAnisotropy
|
|
73
73
|
);
|
|
74
74
|
f = vec3f(scatteringPdf);
|
|
@@ -78,10 +78,10 @@ if (scatteringPdf <= 0.0 || max(max(f.x, f.y), f.z) <= 0.0) {
|
|
|
78
78
|
return false;
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
-
var
|
|
82
|
-
var
|
|
83
|
-
if (
|
|
84
|
-
|
|
81
|
+
var mz: Ray;
|
|
82
|
+
var hi = (*si).position + EPS * lightDir;
|
|
83
|
+
if (gF) {
|
|
84
|
+
hi = rQ((*si).position, (*si).faceNormal, lightDir);
|
|
85
85
|
let bZ = 0.1;
|
|
86
86
|
var dr = dot((*si).normal, lightDir);
|
|
87
87
|
${hasCoatNormals ? /* wgsl */ ` if (ma.coatNormalEnabled) { dr = dot((*si).faceNormal, lightDir); }` : ''}
|
|
@@ -91,39 +91,39 @@ let geometricNormal = select(
|
|
|
91
91
|
dr < 0.0
|
|
92
92
|
);
|
|
93
93
|
dr = abs(dr);
|
|
94
|
-
let
|
|
95
|
-
let
|
|
96
|
-
clamp(1.0 -
|
|
94
|
+
let hS = dot(geometricNormal, lightDir);
|
|
95
|
+
let oB = select(
|
|
96
|
+
clamp(1.0 - hS / bZ, 0.0, 1.0),
|
|
97
97
|
clamp(
|
|
98
|
-
2.0 - (
|
|
98
|
+
2.0 - (hS + dr) / bZ,
|
|
99
99
|
0.0,
|
|
100
100
|
1.0
|
|
101
101
|
),
|
|
102
102
|
dr < bZ
|
|
103
103
|
);
|
|
104
|
-
|
|
104
|
+
hi += (*si).shadowOffset * oB;
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
|
|
108
108
|
|
|
109
109
|
|
|
110
|
-
var
|
|
111
|
-
var
|
|
110
|
+
var lQ = lightDir;
|
|
111
|
+
var mO = lightSample.dist - EPS;
|
|
112
112
|
if (lightSample.sourceType == 1u) {
|
|
113
|
-
let
|
|
113
|
+
let sY =
|
|
114
114
|
(*si).position + lightSample.direction * lightSample.dist;
|
|
115
|
-
let
|
|
116
|
-
let
|
|
117
|
-
|
|
118
|
-
|
|
115
|
+
let qe = sY + EPS * lightSample.normal;
|
|
116
|
+
let qp = qe - hi;
|
|
117
|
+
mO = length(qp);
|
|
118
|
+
lQ = normalize(qp);
|
|
119
119
|
}
|
|
120
|
-
|
|
120
|
+
iC(&mz, hi, lQ);
|
|
121
121
|
|
|
122
122
|
|
|
123
123
|
|
|
124
124
|
|
|
125
|
-
if (
|
|
126
|
-
let background =
|
|
125
|
+
if (gF && cosThetaL < 0.0 && lightSample.sourceType == 0u) {
|
|
126
|
+
let background = hH(mz);
|
|
127
127
|
Li = background.rgb * background.a;
|
|
128
128
|
}
|
|
129
129
|
if (SPECTRAL) {
|
|
@@ -132,78 +132,78 @@ Li = ai(Li, (*si).wavelength);
|
|
|
132
132
|
|
|
133
133
|
|
|
134
134
|
|
|
135
|
-
let
|
|
136
|
-
|
|
135
|
+
let fa = select(
|
|
136
|
+
tC(fg, scatteringPdf),
|
|
137
137
|
1.0,
|
|
138
138
|
lightSample.isDelta
|
|
139
139
|
);
|
|
140
|
-
if (
|
|
141
|
-
let
|
|
142
|
-
(*
|
|
143
|
-
dot(max(
|
|
140
|
+
if (fa > 0.0) {
|
|
141
|
+
let kq = Li * f / fg * (*aa).beta;
|
|
142
|
+
(*gj).risTarget = max(
|
|
143
|
+
dot(max(kq * lightSelectionPmf, vec3f(0.0)), luminance),
|
|
144
144
|
0.0
|
|
145
145
|
);
|
|
146
|
-
(*
|
|
147
|
-
(*
|
|
148
|
-
(*
|
|
149
|
-
(*
|
|
150
|
-
(*
|
|
151
|
-
(*
|
|
146
|
+
(*gj).ray = mz;
|
|
147
|
+
(*gj).maxDistance = mO;
|
|
148
|
+
(*gj).triangleIndex = (*si).triangleIndex;
|
|
149
|
+
(*gj).contribution = fa * kq;
|
|
150
|
+
(*gj).lightSelectionPmf = lightSelectionPmf;
|
|
151
|
+
(*gj).valid = true;
|
|
152
152
|
return true;
|
|
153
153
|
}
|
|
154
154
|
return false;
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
-
fn
|
|
157
|
+
fn mT(
|
|
158
158
|
si: ptr<function, ad>,
|
|
159
159
|
ma: J,
|
|
160
160
|
prepared: ag,
|
|
161
161
|
aa: ptr<function, Path>,
|
|
162
162
|
ffnormal: vec3f,
|
|
163
|
-
|
|
163
|
+
gF: bool
|
|
164
164
|
) {
|
|
165
|
-
let
|
|
166
|
-
var selected:
|
|
165
|
+
let aV = jX();
|
|
166
|
+
var selected: ne;
|
|
167
167
|
selected.valid = false;
|
|
168
|
-
var
|
|
169
|
-
var
|
|
168
|
+
var mI = 0.0;
|
|
169
|
+
var lH = 0.0;
|
|
170
170
|
|
|
171
171
|
|
|
172
|
-
for (var ca = 0u; ca <
|
|
173
|
-
var candidate:
|
|
174
|
-
let
|
|
175
|
-
si, ma, prepared, aa, ffnormal,
|
|
176
|
-
ca,
|
|
177
|
-
if (
|
|
178
|
-
if (!
|
|
172
|
+
for (var ca = 0u; ca < aV; ca++) {
|
|
173
|
+
var candidate: ne;
|
|
174
|
+
let pj = qq(
|
|
175
|
+
si, ma, prepared, aa, ffnormal, gF,
|
|
176
|
+
ca, aV, &candidate);
|
|
177
|
+
if (aV == 1u) {
|
|
178
|
+
if (!pj) { return; }
|
|
179
179
|
selected = candidate;
|
|
180
180
|
break;
|
|
181
181
|
}
|
|
182
|
-
if (!
|
|
183
|
-
let
|
|
184
|
-
if (!(
|
|
185
|
-
|
|
182
|
+
if (!pj) { continue; }
|
|
183
|
+
let kj = candidate.risTarget / max(candidate.lightSelectionPmf, 1e-20);
|
|
184
|
+
if (!(kj > 0.0) || kj != kj) { continue; }
|
|
185
|
+
lH += kj;
|
|
186
186
|
if (!selected.valid ||
|
|
187
|
-
|
|
187
|
+
pK(ca) * lH <= kj) {
|
|
188
188
|
selected = candidate;
|
|
189
|
-
|
|
189
|
+
mI = candidate.risTarget;
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
|
-
var
|
|
193
|
-
if (
|
|
194
|
-
if (!selected.valid ||
|
|
192
|
+
var qP = 1.0;
|
|
193
|
+
if (aV > 1u) {
|
|
194
|
+
if (!selected.valid || mI <= 0.0) { return; }
|
|
195
195
|
|
|
196
196
|
|
|
197
|
-
|
|
198
|
-
(f32(
|
|
197
|
+
qP = selected.lightSelectionPmf * lH /
|
|
198
|
+
(f32(aV) * mI);
|
|
199
199
|
}
|
|
200
200
|
if (selected.valid &&
|
|
201
201
|
!ex(selected.ray, selected.maxDistance, selected.triangleIndex)) {
|
|
202
|
-
(*aa).li += selected.contribution *
|
|
202
|
+
(*aa).li += selected.contribution * qP;
|
|
203
203
|
}
|
|
204
204
|
}
|
|
205
205
|
|
|
206
|
-
fn
|
|
206
|
+
fn pp(
|
|
207
207
|
si: ptr<function, ad>,
|
|
208
208
|
aa: ptr<function, Path>
|
|
209
209
|
) -> f32 {
|
|
@@ -215,54 +215,54 @@ let samplingLuminance = dot(
|
|
|
215
215
|
materialsBuffer[(*si).materialIndex].emission,
|
|
216
216
|
luminance
|
|
217
217
|
);
|
|
218
|
-
let
|
|
219
|
-
if (samplingLuminance <= 0.0 ||
|
|
218
|
+
let pm = dot((*si).faceNormal, -(*aa).ray.d);
|
|
219
|
+
if (samplingLuminance <= 0.0 || pm <= 0.0) {
|
|
220
220
|
return 1.0;
|
|
221
221
|
}
|
|
222
|
-
let
|
|
223
|
-
let
|
|
224
|
-
|
|
225
|
-
return
|
|
222
|
+
let rY = distance((*si).position, (*aa).ray.o);
|
|
223
|
+
let fg = samplingLuminance / rtUniform.lightWeightTotal *
|
|
224
|
+
rY * rY / max(pm, 1e-8);
|
|
225
|
+
return fX((*aa).scatteringPdf, fg);
|
|
226
226
|
}
|
|
227
227
|
|
|
228
228
|
${hasCoatNormals ? /* wgsl */ `
|
|
229
229
|
|
|
230
230
|
|
|
231
|
-
fn
|
|
232
|
-
let
|
|
233
|
-
let
|
|
234
|
-
let
|
|
235
|
-
if (dot(input,
|
|
236
|
-
return
|
|
231
|
+
fn fF(input: vec3f, tq: vec3f, view: vec3f) -> vec3f {
|
|
232
|
+
let qY = dot(tq, view) >= 0.0;
|
|
233
|
+
let uo = select(-tq, tq, qY);
|
|
234
|
+
let qX = select(-input, input, qY);
|
|
235
|
+
if (dot(input, tq) <= 0.0 || dot(qX, view) <= 1e-6) { return uo; }
|
|
236
|
+
return qX;
|
|
237
237
|
}
|
|
238
238
|
` : ''}
|
|
239
|
-
fn
|
|
239
|
+
fn mb(
|
|
240
240
|
si: ptr<function, ad>,
|
|
241
241
|
ma: ptr<function, J>,
|
|
242
242
|
aa: ptr<function, Path>
|
|
243
243
|
) {
|
|
244
244
|
${hasCoatNormals ? /* wgsl */ `
|
|
245
245
|
let bC = (*si).faceNormal;
|
|
246
|
-
let
|
|
246
|
+
let mE = (*si).normal;
|
|
247
247
|
` : ''}
|
|
248
|
-
var
|
|
249
|
-
var
|
|
248
|
+
var rN: f32 = -dot((*si).faceNormal, (*aa).ray.d);
|
|
249
|
+
var sG: f32 = -dot((*si).normal, (*aa).ray.d);
|
|
250
250
|
if (((*ma).transmissionWeight > 0.0 || (*ma).subsurfaceWeight > 0.0) && (*ma).thinWalled) {
|
|
251
251
|
|
|
252
|
-
if (
|
|
252
|
+
if (rN < 0.0) {
|
|
253
253
|
(*si).faceNormal = -(*si).faceNormal;
|
|
254
|
-
|
|
254
|
+
rN = -rN;
|
|
255
255
|
}
|
|
256
|
-
if (
|
|
256
|
+
if (sG < 0.0) {
|
|
257
257
|
(*si).normal = -(*si).normal;
|
|
258
|
-
|
|
258
|
+
sG = -sG;
|
|
259
259
|
}
|
|
260
260
|
}
|
|
261
261
|
|
|
262
262
|
|
|
263
|
-
var
|
|
264
|
-
var ndv: f32 = select(
|
|
265
|
-
var N: vec3f = select((*si).normal, (*si).faceNormal,
|
|
263
|
+
var pU: bool = rN >= 0.0 && sG < 0.0;
|
|
264
|
+
var ndv: f32 = select(sG, rN, pU);
|
|
265
|
+
var N: vec3f = select((*si).normal, (*si).faceNormal, pU);
|
|
266
266
|
|
|
267
267
|
(*ma).inside = ndv <= 0.0 && !(*ma).thinWalled;
|
|
268
268
|
|
|
@@ -271,18 +271,18 @@ var ffnormal = select(-N, N, ndv >= 0.0);
|
|
|
271
271
|
${hasCoatNormals ? /* wgsl */ `
|
|
272
272
|
if ((*ma).coatNormalEnabled) {
|
|
273
273
|
let view = -(*aa).ray.d;
|
|
274
|
-
let
|
|
275
|
-
(*ma).geometricNormal = select(-bC, bC,
|
|
276
|
-
ffnormal =
|
|
277
|
-
(*ma).coatNormal =
|
|
278
|
-
(*ma).inside =
|
|
279
|
-
(*ma).relativeIor = select((*ma).specularIor, 1.0 / (*ma).specularIor,
|
|
274
|
+
let gb = dot(bC, view);
|
|
275
|
+
(*ma).geometricNormal = select(-bC, bC, gb >= 0.0);
|
|
276
|
+
ffnormal = fF(mE, bC, view);
|
|
277
|
+
(*ma).coatNormal = fF((*si).coatNormal, bC, view);
|
|
278
|
+
(*ma).inside = gb <= 0.0 && !(*ma).thinWalled;
|
|
279
|
+
(*ma).relativeIor = select((*ma).specularIor, 1.0 / (*ma).specularIor, gb > 0.0 || (*ma).thinWalled);
|
|
280
280
|
}
|
|
281
281
|
` : ''}
|
|
282
282
|
|
|
283
283
|
(*aa).scatteringIsDelta = false;
|
|
284
284
|
var bl = false;
|
|
285
|
-
var
|
|
285
|
+
var hn = false;
|
|
286
286
|
let mediumType = (*si).mediumType;
|
|
287
287
|
|
|
288
288
|
var scatteringPdf: f32;
|
|
@@ -290,42 +290,42 @@ var cG: vec3f;
|
|
|
290
290
|
|
|
291
291
|
if (HAS_MEDIUM) {
|
|
292
292
|
let d = distance((*si).position, (*aa).ray.o);
|
|
293
|
-
let
|
|
293
|
+
let nu = (*aa).ray.o;
|
|
294
294
|
let extinction = (*si).mediumExtinction;
|
|
295
295
|
let scattering = min((*si).mediumScattering, extinction);
|
|
296
|
-
let
|
|
297
|
-
if (mediumType > 0 &&
|
|
296
|
+
let sC = max(max(extinction.x, extinction.y), extinction.z);
|
|
297
|
+
if (mediumType > 0 && sC > 0.0) {
|
|
298
298
|
|
|
299
299
|
|
|
300
|
-
let
|
|
301
|
-
let
|
|
302
|
-
let
|
|
300
|
+
let nj = min(i32(dz(cw(MEDIUM_CHANNEL)) * 3.0), 2);
|
|
301
|
+
let fE = extinction[nj];
|
|
302
|
+
let ih = select(
|
|
303
303
|
d,
|
|
304
|
-
min(-log(max(dz(cw(MEDIUM_DISTANCE)), 1e-7)) /
|
|
305
|
-
|
|
304
|
+
min(-log(max(dz(cw(MEDIUM_DISTANCE)), 1e-7)) / fE, d),
|
|
305
|
+
fE > 0.0
|
|
306
306
|
);
|
|
307
|
-
bl =
|
|
308
|
-
let ew = exp(-extinction *
|
|
309
|
-
let
|
|
307
|
+
bl = ih < d;
|
|
308
|
+
let ew = exp(-extinction * ih);
|
|
309
|
+
let nZ = select(
|
|
310
310
|
ew,
|
|
311
311
|
extinction * ew,
|
|
312
312
|
bl
|
|
313
313
|
);
|
|
314
|
-
let
|
|
314
|
+
let nK = max((nZ.x + nZ.y + nZ.z) / 3.0, 1e-8);
|
|
315
315
|
if (bl) {
|
|
316
|
-
(*aa).beta *= ew * scattering /
|
|
316
|
+
(*aa).beta *= ew * scattering / nK;
|
|
317
317
|
|
|
318
|
-
(*aa).ray.o =
|
|
318
|
+
(*aa).ray.o = nu + ih * (*aa).ray.d;
|
|
319
319
|
(*si).position = (*aa).ray.o;
|
|
320
320
|
}
|
|
321
321
|
else {
|
|
322
|
-
(*aa).beta *= ew /
|
|
322
|
+
(*aa).beta *= ew / nK;
|
|
323
323
|
}
|
|
324
324
|
}
|
|
325
325
|
}
|
|
326
326
|
|
|
327
327
|
if (!bl) {
|
|
328
|
-
(*aa).li +=
|
|
328
|
+
(*aa).li += pp(si, aa) * (*ma).emission * (*aa).beta;
|
|
329
329
|
}
|
|
330
330
|
if ((*ma).materialType == UNLIT) {
|
|
331
331
|
(*aa).abort = true;
|
|
@@ -341,15 +341,15 @@ ${hasAnisotropyDirections ? /* wgsl */ `
|
|
|
341
341
|
(*ma).geometryTangent = (*si).geometryTangent;
|
|
342
342
|
(*ma).geometryBitangent = (*si).geometryBitangent;
|
|
343
343
|
` : /* wgsl */ ``}
|
|
344
|
-
prepared =
|
|
344
|
+
prepared = eH((*si).tangent, *ma, -(*aa).ray.d, ffnormal);
|
|
345
345
|
}
|
|
346
|
-
|
|
346
|
+
mT(si, *ma, prepared, aa, ffnormal, !bl);
|
|
347
347
|
if (bl) {
|
|
348
348
|
|
|
349
|
-
cG =
|
|
349
|
+
cG = fq(
|
|
350
350
|
-(*aa).ray.d,
|
|
351
351
|
(*si).mediumAnisotropy,
|
|
352
|
-
|
|
352
|
+
fp(cw(PHASE_DIRECTION))
|
|
353
353
|
);
|
|
354
354
|
scatteringPdf = bD(
|
|
355
355
|
dot(cG, -(*aa).ray.d),
|
|
@@ -360,24 +360,24 @@ else {
|
|
|
360
360
|
|
|
361
361
|
var isNextRefraction: bool;
|
|
362
362
|
var aA = 1.0;
|
|
363
|
-
var
|
|
363
|
+
var aS = false;
|
|
364
364
|
var bE = true;
|
|
365
365
|
var aR = u32(OPENPBR_LOBE_DIFFUSE);
|
|
366
|
-
var
|
|
367
|
-
let
|
|
368
|
-
var
|
|
366
|
+
var qI = 0.0;
|
|
367
|
+
let ur = vec3f(fp(cw(BSDF_DIRECTION)), dz(cw(BSDF_LOBE)));
|
|
368
|
+
var gY = vec3f(0.0);
|
|
369
369
|
let f = dv(
|
|
370
370
|
prepared,
|
|
371
|
-
|
|
371
|
+
ur,
|
|
372
372
|
&cG,
|
|
373
373
|
&scatteringPdf,
|
|
374
374
|
&isNextRefraction,
|
|
375
375
|
&aA,
|
|
376
|
-
&
|
|
376
|
+
&aS,
|
|
377
377
|
&bE,
|
|
378
378
|
&aR,
|
|
379
|
-
&
|
|
380
|
-
&
|
|
379
|
+
&qI,
|
|
380
|
+
&gY
|
|
381
381
|
);
|
|
382
382
|
|
|
383
383
|
|
|
@@ -397,7 +397,7 @@ abs(prepared.material.relativeIor - 1.0) <= 1e-6 &&
|
|
|
397
397
|
prepared.probabilities[OPENPBR_LOBE_TRANSMISSION] >= 1.0 - 1e-6;
|
|
398
398
|
(*aa).beta *= f / scatteringPdf;
|
|
399
399
|
|
|
400
|
-
|
|
400
|
+
hn = isNextRefraction && !(*ma).thinWalled;
|
|
401
401
|
(*aa).isNextRefraction = isNextRefraction;
|
|
402
402
|
|
|
403
403
|
|
|
@@ -417,8 +417,8 @@ if (bl) {
|
|
|
417
417
|
if (HAS_MEDIUM) {
|
|
418
418
|
|
|
419
419
|
|
|
420
|
-
if (!bl &&
|
|
421
|
-
if (
|
|
420
|
+
if (!bl && hn && (*ma).mediumType > 0) {
|
|
421
|
+
if (rN >= 0.0) {
|
|
422
422
|
(*si).mediumType = (*ma).mediumType;
|
|
423
423
|
(*si).mediumExtinction = (*ma).mediumExtinction;
|
|
424
424
|
(*si).mediumScattering = (*ma).mediumScattering;
|
|
@@ -11,21 +11,21 @@ export default /*wgsl*/ `
|
|
|
11
11
|
const SHADOW_CATCHER_LIGHT_SAMPLES = 4u;
|
|
12
12
|
|
|
13
13
|
fn sampleShadowCatcher(si: ad, bounce: i32, aa: ptr<function, Path>) {
|
|
14
|
-
let
|
|
14
|
+
let oS = -(*aa).ray.d;
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
if (rtUniform.lightChoiceCount > 0) {
|
|
18
18
|
var shadow = 0.0;
|
|
19
19
|
for (var candidate = 0u; candidate < SHADOW_CATCHER_LIGHT_SAMPLES; candidate++) {
|
|
20
20
|
var lightSample: LightSampleRec;
|
|
21
|
-
let
|
|
22
|
-
sampleLight(si.position,
|
|
21
|
+
let ln = vec3f(fp(rd(candidate, 1u)), dz(rd(candidate, 0u)));
|
|
22
|
+
sampleLight(si.position, ln, &lightSample, false);
|
|
23
23
|
let lightDir = lightSample.direction;
|
|
24
24
|
let cosThetaL = dot(si.normal, lightDir);
|
|
25
|
-
let
|
|
26
|
-
if (lightSample.pdf > 0.0 &&
|
|
25
|
+
let pM = dot(si.normal, oS) * cosThetaL;
|
|
26
|
+
if (lightSample.pdf > 0.0 && pM >= 0.0) {
|
|
27
27
|
var ray: Ray;
|
|
28
|
-
|
|
28
|
+
iC(&ray, si.position + EPS * lightDir, lightDir);
|
|
29
29
|
if (ex(ray, lightSample.dist - EPS, si.triangleIndex)) {
|
|
30
30
|
shadow += 1.0;
|
|
31
31
|
}
|