@meimu/mutracer 0.1.1 → 0.1.3
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 +3525 -3484
- package/docs/materials.md +27 -7
- package/docs/threejs.md +13 -2
- package/docs/viewer.md +53 -0
- 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 +2 -1
- package/lib/renderer/MaterialTable.js.map +1 -1
- package/lib/renderer/WGPUBloomPass.js +18 -18
- package/lib/renderer/WGPUFullQuadPass.js +3 -3
- package/lib/renderer/WGPUJNLMDenoiser.js +62 -62
- package/lib/renderer/WGPURayTraceOutput.js +14 -12
- package/lib/renderer/WGPURayTraceOutput.js.map +1 -1
- package/lib/renderer/WGPURayTracePass.js +2 -2
- package/lib/renderer/WGPURayTracePass.js.map +1 -1
- package/lib/renderer/WGPURenderingPipeline.js +20 -18
- package/lib/renderer/WGPURenderingPipeline.js.map +1 -1
- package/lib/renderer/WebGLJNLMDenoiser.js +61 -61
- package/lib/renderer/WebGLRayTraceOutputPass.js +4 -4
- package/lib/renderer/WebGLRayTracePass.js +3 -1
- package/lib/renderer/WebGLRayTracePass.js.map +1 -1
- package/lib/renderer/glsl/chunks/cameraRay.glsl.js +9 -9
- package/lib/renderer/glsl/chunks/envMap.glsl.js +45 -45
- package/lib/renderer/glsl/chunks/intersect.glsl.js +262 -262
- package/lib/renderer/glsl/chunks/materialBuffer.glsl.js +111 -111
- package/lib/renderer/glsl/chunks/openPbrBsdf.glsl.js +436 -436
- 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 +32 -32
- package/lib/renderer/glsl/chunks/sampleLight.glsl.js +54 -54
- package/lib/renderer/glsl/chunks/sampleMaterial.glsl.js +71 -71
- package/lib/renderer/glsl/chunks/sampleShadowCatcher.glsl.js +12 -12
- package/lib/renderer/glsl/chunks/sampling.glsl.js +64 -64
- package/lib/renderer/glsl/chunks/sobol.glsl.js +49 -49
- package/lib/renderer/glsl/chunks/textureLinear.glsl.js +5 -5
- package/lib/renderer/glsl/chunks/uvProjection.glsl.js +5 -5
- package/lib/renderer/glsl/depthQuery.frag.js +2 -2
- package/lib/renderer/glsl/normalizeRayTraceOutput.frag.js +8 -8
- package/lib/renderer/glsl/rayTrace.frag.js +128 -128
- package/lib/renderer/glsl/shadowCatcher.frag.js +12 -12
- package/lib/renderer/glsl/webglPipeline.frag.js +49 -49
- package/lib/renderer/lightsUtil.js +1 -1
- package/lib/renderer/lightsUtil.js.map +1 -1
- package/lib/renderer/materialComparison.generated.js +5 -0
- package/lib/renderer/materialComparison.generated.js.map +1 -1
- package/lib/renderer/materialLayout.js +2 -1
- package/lib/renderer/materialLayout.js.map +1 -1
- package/lib/renderer/prepareMeshBVH.d.ts +4 -2
- package/lib/renderer/prepareMeshBVH.js +44 -20
- package/lib/renderer/prepareMeshBVH.js.map +1 -1
- package/lib/renderer/scratchSampling.js +6 -6
- package/lib/renderer/wgsl/chunks/common.wgsl.js +4 -4
- package/lib/renderer/wgsl/chunks/envMap.wgsl.js +29 -29
- package/lib/renderer/wgsl/chunks/intersect.wgsl.js +376 -379
- package/lib/renderer/wgsl/chunks/intersect.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/intersectionAlpha.wgsl.js +5 -5
- package/lib/renderer/wgsl/chunks/materialBuffer.wgsl.js +51 -51
- package/lib/renderer/wgsl/chunks/openPbrBsdf.wgsl.js +453 -453
- package/lib/renderer/wgsl/chunks/pdm_displacement.wgsl.d.ts +1 -1
- package/lib/renderer/wgsl/chunks/pdm_displacement.wgsl.js +122 -117
- 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 +13 -13
- package/lib/renderer/wgsl/chunks/sampleLight.wgsl.js +94 -94
- package/lib/renderer/wgsl/chunks/sampleMaterial.wgsl.js +119 -119
- package/lib/renderer/wgsl/chunks/sampleShadowCatcher.wgsl.js +5 -5
- package/lib/renderer/wgsl/chunks/sampling.wgsl.js +62 -62
- package/lib/renderer/wgsl/chunks/shadowCatcherAccumulation.wgsl.d.ts +3 -3
- package/lib/renderer/wgsl/chunks/shadowCatcherAccumulation.wgsl.js +2 -2
- package/lib/renderer/wgsl/chunks/shadowCatcherAccumulation.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/chunks/sobol.wgsl.js +53 -53
- package/lib/renderer/wgsl/chunks/uvProjection.wgsl.js +5 -5
- package/lib/renderer/wgsl/compose.frag.wgsl.d.ts +2 -2
- package/lib/renderer/wgsl/compose.frag.wgsl.js +120 -92
- package/lib/renderer/wgsl/compose.frag.wgsl.js.map +1 -1
- package/lib/renderer/wgsl/customDenoise.wgsl.js +10 -10
- package/lib/renderer/wgsl/depthQuery.wgsl.js +3 -3
- package/lib/renderer/wgsl/offlineAdaptive.compute.js +26 -26
- package/lib/renderer/wgsl/rayTrace.compute.js +220 -211
- package/lib/renderer/wgsl/rayTrace.compute.js.map +1 -1
- package/lib/scene/OpenPBRMaterial.d.ts +4 -2
- package/lib/scene/OpenPBRMaterial.js +4 -2
- package/lib/scene/OpenPBRMaterial.js.map +1 -1
- package/lib/scene/openPbrSchema.d.ts +7 -2
- package/lib/scene/openPbrSchema.js +2 -1
- package/lib/scene/openPbrSchema.js.map +1 -1
- package/lib/util/fromTHREE.d.ts +1 -0
- package/lib/util/fromTHREE.js +24 -6
- 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 +5 -4
|
@@ -33,15 +33,15 @@ return vec2(pow((a*a + u*u) * 0.5, 0.25), clamp(1.0 - u/a, 0.0, 1.0));
|
|
|
33
33
|
|
|
34
34
|
#endif
|
|
35
35
|
|
|
36
|
-
vec3
|
|
36
|
+
vec3 oB(vec3 c) {
|
|
37
37
|
return mix(pow(c * 0.9478672986 + 0.0521327014, vec3(2.4)), c * 0.0773993808, vec3(lessThan(c, vec3(0.04045))));
|
|
38
38
|
}
|
|
39
39
|
vec4 fetchMatData(int i) {
|
|
40
|
-
return
|
|
40
|
+
return ky(materialBuffer, i, materialBufferColumns);
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
|
|
44
|
-
float
|
|
44
|
+
float lg(float alpha, int alphaMode, float alphaCutoff) {
|
|
45
45
|
if (alphaMode == ${materialAlphaModeConstants.opaque}) {
|
|
46
46
|
return 1.0;
|
|
47
47
|
}
|
|
@@ -51,7 +51,7 @@ return alpha >= alphaCutoff ? 1.0 : 0.0;
|
|
|
51
51
|
return alpha;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
float
|
|
54
|
+
float vU(int idx) {
|
|
55
55
|
return fetchMatData(idx * MAT_DATA_SIZE + MAT_ROW_COLOR).w;
|
|
56
56
|
}
|
|
57
57
|
|
|
@@ -62,33 +62,33 @@ return vec2(float(val >> 8), float(val & 0xff) / 255.0);
|
|
|
62
62
|
#ifdef NUM_MAPS
|
|
63
63
|
vec3 decodeMapColor(int index, vec3 c) {
|
|
64
64
|
if (mapColorLinear[index] > 0.5) { return c; }
|
|
65
|
-
return
|
|
65
|
+
return oB(c);
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
vec2
|
|
68
|
+
vec2 oa(int index) {
|
|
69
69
|
return mapInfo[index].xy;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
float
|
|
72
|
+
float pj(int index) {
|
|
73
73
|
return floor(mapInfo[index].z);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
vec2
|
|
76
|
+
vec2 nZ(int index) {
|
|
77
77
|
return vec2(fract(mapInfo[index].z), mapInfo[index].w);
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
vec2
|
|
80
|
+
vec2 sg(int index, vec2 uv) {
|
|
81
81
|
vec4 transform = mapTransform[index];
|
|
82
|
-
vec2
|
|
83
|
-
vec2
|
|
84
|
-
vec2 dZ =
|
|
85
|
-
vec2
|
|
86
|
-
vec2
|
|
87
|
-
vec2
|
|
82
|
+
vec2 qz = fract(uv * transform.xy + transform.zw);
|
|
83
|
+
vec2 jg = 1.0 / vec2(textureSize(map, 0).xy);
|
|
84
|
+
vec2 dZ = nZ(index);
|
|
85
|
+
vec2 kg = oa(index) + jg;
|
|
86
|
+
vec2 oE = dZ - 0.5 * jg;
|
|
87
|
+
vec2 lr = dZ + kg - jg;
|
|
88
88
|
return clamp(
|
|
89
|
-
|
|
89
|
+
oE + qz * kg,
|
|
90
90
|
dZ,
|
|
91
|
-
|
|
91
|
+
lr
|
|
92
92
|
);
|
|
93
93
|
}
|
|
94
94
|
|
|
@@ -97,22 +97,22 @@ return mapUvChannel[index] > 0.5 ? uv1 : uv;
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
vec4 sampleMap(int index, vec2 uv) {
|
|
100
|
-
return texture(map, vec3(
|
|
100
|
+
return texture(map, vec3(sg(index, uv), pj(index)));
|
|
101
101
|
}
|
|
102
102
|
#endif
|
|
103
103
|
|
|
104
104
|
|
|
105
|
-
vec2
|
|
105
|
+
vec2 aK(float roughness, float anisotropy) {
|
|
106
106
|
float alpha = roughness * roughness;
|
|
107
|
-
float
|
|
108
|
-
if (anisotropy == 0.0) { return vec2(max(
|
|
107
|
+
float oX = ROUGHNESS_MIN * ROUGHNESS_MIN;
|
|
108
|
+
if (anisotropy == 0.0) { return vec2(max(oX, alpha)); }
|
|
109
109
|
float dg = 1.0 - anisotropy;
|
|
110
|
-
float
|
|
111
|
-
return max(vec2(
|
|
110
|
+
float rZ = alpha * sqrt(2.0 / (1.0 + dg * dg));
|
|
111
|
+
return max(vec2(oX), vec2(rZ, dg * rZ));
|
|
112
112
|
}
|
|
113
113
|
|
|
114
114
|
vec4 bv(int i);
|
|
115
|
-
vec3
|
|
115
|
+
vec3 kA(int instanceIndex) {
|
|
116
116
|
if (instanceIndex < 0) return vec3(1.0);
|
|
117
117
|
return bv(instanceIndex * ${INSTANCE_VEC4_STRIDE + ''} + 9).rgb;
|
|
118
118
|
}
|
|
@@ -125,62 +125,62 @@ vec2 uv1,
|
|
|
125
125
|
int instanceIndex
|
|
126
126
|
) {
|
|
127
127
|
int i = materialIndex * MAT_DATA_SIZE;
|
|
128
|
-
vec4
|
|
129
|
-
vec4
|
|
130
|
-
vec4
|
|
131
|
-
vec4
|
|
132
|
-
vec4
|
|
128
|
+
vec4 oM = fetchMatData(i + MAT_ROW_COLOR);
|
|
129
|
+
vec4 hc = fetchMatData(i + MAT_ROW_ROUGHNESS_NORMAL);
|
|
130
|
+
vec4 gi = fetchMatData(i + MAT_ROW_METALLIC_MAPS);
|
|
131
|
+
vec4 hE = fetchMatData(i + MAT_ROW_EMISSION);
|
|
132
|
+
vec4 gU = fetchMatData(i + MAT_ROW_IOR_TRANSMISSION);
|
|
133
133
|
vec4 misc = fetchMatData(i + MAT_ROW_MISC);
|
|
134
|
-
vec4
|
|
135
|
-
vec4
|
|
136
|
-
vec4
|
|
134
|
+
vec4 nk = fetchMatData(i + MAT_ROW_ALPHA_FILM);
|
|
135
|
+
vec4 lI = fetchMatData(i + MAT_ROW_BASE_CONTROLS);
|
|
136
|
+
vec4 oQ = fetchMatData(i + MAT_ROW_SPECULAR_FUZZ);
|
|
137
137
|
vec4 subsurface = fetchMatData(i + MAT_ROW_SUBSURFACE);
|
|
138
|
-
vec4
|
|
139
|
-
vec4
|
|
140
|
-
vec4
|
|
141
|
-
vec4
|
|
142
|
-
vec4
|
|
138
|
+
vec4 wj = fetchMatData(i + MAT_ROW_FUZZ);
|
|
139
|
+
vec4 vE = fetchMatData(i + MAT_ROW_COAT);
|
|
140
|
+
vec4 lJ = fetchMatData(i + MAT_ROW_COAT_CONTROLS);
|
|
141
|
+
vec4 mN = fetchMatData(i + MAT_ROW_FILM_DISPERSION);
|
|
142
|
+
vec4 nj = fetchMatData(i + MAT_ROW_STANDALONE_MAPS);
|
|
143
143
|
int mapAlphaUsage = int(misc.a);
|
|
144
144
|
|
|
145
|
-
mat.baseColor =
|
|
146
|
-
mat.materialType = int(
|
|
147
|
-
mat.specularRoughness =
|
|
148
|
-
mat.baseMetalness =
|
|
149
|
-
mat.specularAnisotropy = clamp(
|
|
150
|
-
mat.emission =
|
|
145
|
+
mat.baseColor = oM.rgb;
|
|
146
|
+
mat.materialType = int(oM.w);
|
|
147
|
+
mat.specularRoughness = hc.x;
|
|
148
|
+
mat.baseMetalness = gi.x;
|
|
149
|
+
mat.specularAnisotropy = clamp(gi.y, 0.0, 1.0);
|
|
150
|
+
mat.emission = hE.rgb;
|
|
151
151
|
mat.inside = false;
|
|
152
|
-
mat.specularIor =
|
|
153
|
-
mat.transmissionWeight =
|
|
152
|
+
mat.specularIor = gU.x;
|
|
153
|
+
mat.transmissionWeight = gU.y;
|
|
154
154
|
#ifdef HAS_MEDIUM
|
|
155
|
-
mat.mediumType = int(
|
|
155
|
+
mat.mediumType = int(gU.z);
|
|
156
156
|
#else
|
|
157
157
|
mat.mediumType = 0;
|
|
158
158
|
#endif
|
|
159
|
-
mat.thinWalled =
|
|
159
|
+
mat.thinWalled = gU.w > 0.5;
|
|
160
160
|
mat.bevel = misc.r;
|
|
161
161
|
mat.transmissionDispersionScale = misc.g;
|
|
162
|
-
mat.dispersionAbbeNumber = max(
|
|
162
|
+
mat.dispersionAbbeNumber = max(mN.y, 1e-6);
|
|
163
163
|
mat.thinFilmThickness = misc.b;
|
|
164
|
-
mat.thinFilmIor =
|
|
165
|
-
mat.thinFilmWeight = clamp(
|
|
164
|
+
mat.thinFilmIor = nk.b;
|
|
165
|
+
mat.thinFilmWeight = clamp(mN.x, 0.0, 1.0);
|
|
166
166
|
|
|
167
167
|
mat.thinFilmThickness *= 1000.0;
|
|
168
|
-
mat.baseWeight = clamp(
|
|
169
|
-
mat.diffuseRoughness = clamp(
|
|
170
|
-
mat.specularWeight = max(0.0,
|
|
171
|
-
mat.subsurfaceWeight = clamp(
|
|
172
|
-
mat.specularColor = max(
|
|
173
|
-
mat.fuzzWeight = clamp(
|
|
168
|
+
mat.baseWeight = clamp(lI.x, 0.0, 1.0);
|
|
169
|
+
mat.diffuseRoughness = clamp(lI.y, 0.0, 1.0);
|
|
170
|
+
mat.specularWeight = max(0.0, lI.z);
|
|
171
|
+
mat.subsurfaceWeight = clamp(lI.w, 0.0, 1.0);
|
|
172
|
+
mat.specularColor = max(oQ.rgb, vec3(0.0));
|
|
173
|
+
mat.fuzzWeight = clamp(oQ.w, 0.0, 1.0);
|
|
174
174
|
mat.subsurfaceColor = max(subsurface.rgb, vec3(0.0));
|
|
175
175
|
mat.transmissionColor = max(fetchMatData(i + MAT_ROW_TRANSMISSION_COLOR).rgb, vec3(0.0));
|
|
176
|
-
mat.fuzzColor = max(
|
|
177
|
-
mat.fuzzRoughness = clamp(
|
|
178
|
-
mat.coatColor = max(
|
|
179
|
-
mat.coatWeight = clamp(
|
|
180
|
-
mat.coatRoughness = clamp(
|
|
181
|
-
mat.coatAnisotropy = clamp(
|
|
182
|
-
mat.coatIor = max(
|
|
183
|
-
mat.coatDarkening = clamp(
|
|
176
|
+
mat.fuzzColor = max(wj.rgb, vec3(0.0));
|
|
177
|
+
mat.fuzzRoughness = clamp(wj.w, 0.0, 1.0);
|
|
178
|
+
mat.coatColor = max(vE.rgb, vec3(0.0));
|
|
179
|
+
mat.coatWeight = clamp(vE.w, 0.0, 1.0);
|
|
180
|
+
mat.coatRoughness = clamp(lJ.x, ROUGHNESS_MIN, 1.0);
|
|
181
|
+
mat.coatAnisotropy = clamp(lJ.y, 0.0, 1.0);
|
|
182
|
+
mat.coatIor = max(lJ.z, 1.0);
|
|
183
|
+
mat.coatDarkening = clamp(lJ.w, 0.0, 1.0);
|
|
184
184
|
|
|
185
185
|
#ifdef HAS_MEDIUM
|
|
186
186
|
mat.mediumExtinction = max(fetchMatData(i + MAT_ROW_MEDIUM_EXTINCTION).rgb, vec3(0.0));
|
|
@@ -191,41 +191,41 @@ mat.mediumType = max(max(mat.mediumExtinction.x, mat.mediumExtinction.y), mat.me
|
|
|
191
191
|
|
|
192
192
|
|
|
193
193
|
#ifdef HAS_ALPHA
|
|
194
|
-
mat.alpha =
|
|
194
|
+
mat.alpha = nk.r;
|
|
195
195
|
#else
|
|
196
196
|
mat.alpha = 1.0;
|
|
197
197
|
#endif
|
|
198
198
|
|
|
199
199
|
#ifdef NUM_DIFFUSE_MAPS
|
|
200
|
-
int diffuseMapIndex = int(
|
|
200
|
+
int diffuseMapIndex = int(gi.z);
|
|
201
201
|
if (diffuseMapIndex >= 0) {
|
|
202
|
-
vec4
|
|
202
|
+
vec4 nQ = sampleMap(
|
|
203
203
|
diffuseMapIndex, getMapUvSet(diffuseMapIndex, uv, uv1)
|
|
204
204
|
);
|
|
205
205
|
|
|
206
206
|
|
|
207
|
-
mat.baseColor *= decodeMapColor(diffuseMapIndex,
|
|
207
|
+
mat.baseColor *= decodeMapColor(diffuseMapIndex, nQ.rgb);
|
|
208
208
|
|
|
209
209
|
|
|
210
210
|
if (mapAlphaUsage == ${mapAlphaUsageConstants.transmission + ''}) {
|
|
211
|
-
mat.transmissionWeight = 1.0 -
|
|
211
|
+
mat.transmissionWeight = 1.0 - nQ.a;
|
|
212
212
|
}
|
|
213
213
|
else if (mapAlphaUsage == ${mapAlphaUsageConstants.alpha + ''}) {
|
|
214
|
-
mat.alpha *=
|
|
214
|
+
mat.alpha *= nQ.a;
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
217
|
#endif
|
|
218
218
|
|
|
219
219
|
${simpleTextureSample('alphaMap', 'glsl')}
|
|
220
220
|
|
|
221
|
-
mat.alpha =
|
|
222
|
-
mat.alpha, int(fetchMatData(i + MAT_ROW_ALPHA).w),
|
|
221
|
+
mat.alpha = lg(
|
|
222
|
+
mat.alpha, int(fetchMatData(i + MAT_ROW_ALPHA).w), nj.w
|
|
223
223
|
);
|
|
224
224
|
|
|
225
225
|
${simpleTextureSample('transmissionMap', 'glsl')}
|
|
226
226
|
|
|
227
227
|
#ifdef NUM_METALLIC_ROUGHNESS_MAPS
|
|
228
|
-
int metallicRoughnessMapIndex = int(
|
|
228
|
+
int metallicRoughnessMapIndex = int(gi.w);
|
|
229
229
|
if (metallicRoughnessMapIndex >= 0) {
|
|
230
230
|
vec4 fK = sampleMap(
|
|
231
231
|
metallicRoughnessMapIndex,
|
|
@@ -241,7 +241,7 @@ ${simpleTextureSample('roughnessMap', 'glsl')}
|
|
|
241
241
|
${simpleTextureSample('metalnessMap', 'glsl')}
|
|
242
242
|
|
|
243
243
|
#ifdef NUM_EMISSIVE_MAPS
|
|
244
|
-
int emissiveMapIndex = int(
|
|
244
|
+
int emissiveMapIndex = int(hE.w);
|
|
245
245
|
if (emissiveMapIndex >= 0) {
|
|
246
246
|
vec3 emissive = sampleMap(
|
|
247
247
|
emissiveMapIndex, getMapUvSet(emissiveMapIndex, uv, uv1)
|
|
@@ -251,12 +251,12 @@ mat.emission *= decodeMapColor(emissiveMapIndex, emissive);
|
|
|
251
251
|
#endif
|
|
252
252
|
|
|
253
253
|
#ifdef NUM_COAT_WEIGHT_MAPS
|
|
254
|
-
int
|
|
255
|
-
if (
|
|
256
|
-
float
|
|
257
|
-
|
|
254
|
+
int hM = int(fetchMatData(i + MAT_ROW_LAYER_MAPS).x);
|
|
255
|
+
if (hM >= 0 && mat.materialType == 0) {
|
|
256
|
+
float qo = clamp(vE.w, 0.0, 1.0) * sampleMap(
|
|
257
|
+
hM, getMapUvSet(hM, uv, uv1)
|
|
258
258
|
).r;
|
|
259
|
-
mat.emission *= mix(vec3(1.0), sqrt(max(
|
|
259
|
+
mat.emission *= mix(vec3(1.0), sqrt(max(vE.rgb, vec3(0.0))), qo);
|
|
260
260
|
}
|
|
261
261
|
#endif
|
|
262
262
|
|
|
@@ -277,29 +277,29 @@ ${simpleTextureSample('specularWeightMap', 'glsl')}
|
|
|
277
277
|
|
|
278
278
|
${simpleTextureSample('specularColorMap', 'glsl')}
|
|
279
279
|
|
|
280
|
-
vec4
|
|
280
|
+
vec4 kN = fetchMatData(i + MAT_ROW_DIRECTION_NORMAL);
|
|
281
281
|
mat.anisotropyDirection = vec2(1.0, 0.0);
|
|
282
|
-
mat.anisotropyDirectionEnabled =
|
|
282
|
+
mat.anisotropyDirectionEnabled = kN.y != 0.0;
|
|
283
283
|
mat.coatAnisotropyRotation = fetchMatData(i + MAT_ROW_FILM_TEXTURE).x;
|
|
284
284
|
#ifdef NUM_ANISOTROPY_MAPS
|
|
285
|
-
if (
|
|
286
|
-
int index = int(
|
|
287
|
-
vec4
|
|
288
|
-
mat.specularAnisotropy *=
|
|
289
|
-
vec2 direction =
|
|
285
|
+
if (kN.x >= 0.0) {
|
|
286
|
+
int index = int(kN.x);
|
|
287
|
+
vec4 iX = sampleMap(index, getMapUvSet(index, uv, uv1));
|
|
288
|
+
mat.specularAnisotropy *= iX.b;
|
|
289
|
+
vec2 direction = iX.rg * 2.0 - 1.0;
|
|
290
290
|
if (dot(direction, direction) > 1e-4) mat.anisotropyDirection = normalize(direction);
|
|
291
291
|
mat.anisotropyDirectionEnabled = true;
|
|
292
292
|
}
|
|
293
293
|
#endif
|
|
294
294
|
#ifdef HAS_GLTF_ANISOTROPY
|
|
295
295
|
if (fetchMatData(i + MAT_ROW_FILM_TEXTURE).y > 0.5 && mat.specularAnisotropy > 0.0) {
|
|
296
|
-
vec2
|
|
297
|
-
mat.specularRoughness =
|
|
298
|
-
mat.specularAnisotropy =
|
|
296
|
+
vec2 sv = fb(clamp(mat.specularRoughness, 0.0, 1.0), mat.specularAnisotropy);
|
|
297
|
+
mat.specularRoughness = sv.x;
|
|
298
|
+
mat.specularAnisotropy = sv.y;
|
|
299
299
|
}
|
|
300
300
|
#endif
|
|
301
301
|
if (mat.anisotropyDirectionEnabled) {
|
|
302
|
-
float theta =
|
|
302
|
+
float theta = kN.y;
|
|
303
303
|
vec2 d = mat.anisotropyDirection;
|
|
304
304
|
mat.anisotropyDirection = vec2(cos(theta)*d.x - sin(theta)*d.y, sin(theta)*d.x + cos(theta)*d.y);
|
|
305
305
|
}
|
|
@@ -307,57 +307,57 @@ mat.anisotropyDirection = vec2(cos(theta)*d.x - sin(theta)*d.y, sin(theta)*d.x +
|
|
|
307
307
|
|
|
308
308
|
|
|
309
309
|
if (mat.coatWeight > 0.0 && mat.coatRoughness > 0.0) {
|
|
310
|
-
float
|
|
311
|
-
float
|
|
310
|
+
float hI = mat.specularRoughness * mat.specularRoughness;
|
|
311
|
+
float hJ = mat.coatRoughness * mat.coatRoughness;
|
|
312
312
|
mat.specularRoughness = mix(mat.specularRoughness,
|
|
313
|
-
pow(min(1.0,
|
|
313
|
+
pow(min(1.0, hI * hI + 2.0 * hJ * hJ), 0.25), mat.coatWeight);
|
|
314
314
|
}
|
|
315
|
-
vec3 instanceColor =
|
|
315
|
+
vec3 instanceColor = kA(instanceIndex);
|
|
316
316
|
mat.baseColor *= instanceColor;
|
|
317
317
|
if (mat.materialType == UNLIT) mat.emission *= instanceColor;
|
|
318
318
|
|
|
319
319
|
mat.specularRoughness = clamp(mat.specularRoughness, ROUGHNESS_MIN, 1.0);
|
|
320
320
|
mat.baseMetalness = clamp(mat.baseMetalness, 0.0, 1.0);
|
|
321
|
-
vec2 specularAlpha =
|
|
321
|
+
vec2 specularAlpha = aK(mat.specularRoughness, mat.specularAnisotropy);
|
|
322
322
|
mat.alphaX = specularAlpha.x;
|
|
323
323
|
mat.alphaY = specularAlpha.y;
|
|
324
324
|
}
|
|
325
325
|
|
|
326
326
|
#if defined(NUM_NORMAL_MAPS)
|
|
327
|
-
vec3
|
|
327
|
+
vec3 ob(int materialIndex, vec2 uv, vec3 normal, vec3 dp1, vec3 dp2, vec2 nS, vec2 nT) {
|
|
328
328
|
int i = materialIndex * MAT_DATA_SIZE;
|
|
329
|
-
vec4
|
|
330
|
-
int normalMapIndex = int(
|
|
329
|
+
vec4 hc = fetchMatData(i + MAT_ROW_ROUGHNESS_NORMAL);
|
|
330
|
+
int normalMapIndex = int(hc.y);
|
|
331
331
|
if (normalMapIndex >= 0) {
|
|
332
332
|
|
|
333
333
|
|
|
334
334
|
|
|
335
|
-
vec3
|
|
336
|
-
vec3
|
|
337
|
-
vec3 dpdu =
|
|
338
|
-
vec3
|
|
339
|
-
float dS = max(dot(dpdu, dpdu), dot(
|
|
335
|
+
vec3 qO = cross(dp2, normal);
|
|
336
|
+
vec3 qM = cross(normal, dp1);
|
|
337
|
+
vec3 dpdu = qO * nS.x + qM * nT.x;
|
|
338
|
+
vec3 se = qO * nS.y + qM * nT.y;
|
|
339
|
+
float dS = max(dot(dpdu, dpdu), dot(se, se));
|
|
340
340
|
if (dS > 1e-12) {
|
|
341
|
-
float
|
|
342
|
-
dpdu *=
|
|
343
|
-
|
|
341
|
+
float sn = inversesqrt(dS);
|
|
342
|
+
dpdu *= sn;
|
|
343
|
+
se *= sn;
|
|
344
344
|
}
|
|
345
345
|
else {
|
|
346
346
|
|
|
347
347
|
|
|
348
348
|
|
|
349
|
-
vec3
|
|
349
|
+
vec3 nf = abs(normal.z) < 0.999
|
|
350
350
|
? vec3(0.0, 0.0, 1.0)
|
|
351
351
|
: vec3(0.0, 1.0, 0.0);
|
|
352
|
-
dpdu = normalize(cross(
|
|
353
|
-
|
|
352
|
+
dpdu = normalize(cross(nf, normal));
|
|
353
|
+
se = cross(normal, dpdu);
|
|
354
354
|
}
|
|
355
355
|
|
|
356
356
|
vec3 n = 2.0 * sampleMap(normalMapIndex, uv).rgb - 1.0;
|
|
357
|
-
n.xy *=
|
|
357
|
+
n.xy *= hc.zw;
|
|
358
358
|
n = normalize(n);
|
|
359
359
|
|
|
360
|
-
mat3 tbn = mat3(dpdu,
|
|
360
|
+
mat3 tbn = mat3(dpdu, se, normal);
|
|
361
361
|
|
|
362
362
|
return normalize(tbn * n);
|
|
363
363
|
} else {
|