Skip to content

Commit 1d445c4

Browse files
DoubleStyxDoubleStyx
committed
Squashed commit of the following:
commit 494c124a4e044434d28c54dce69b7f33e1a26d1c Merge: b0fb441c1 17e408a Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 13:39:26 2026 -0500 Merge branch 'pbs-material-parity-61-70' into shader-fixes commit b0fb441c1d610f5b8b0d8921db1806c8bbe0b2fb Merge: 630871e33 afc2ebc5f Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 13:38:56 2026 -0500 Merge branch 'material-parity-51-60' into shader-fixes commit 630871e3350a68af7bebbad60a1e0f7a0060dd7c Merge: 90a403ad0 dfe7bf3d3 Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 13:37:41 2026 -0500 Merge branch 'materials-31-40-parity' into shader-fixes commit 90a403ad072486e5a5b0fce64167c959b8ec945d Merge: 334d25394 d94862b01 Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 13:37:15 2026 -0500 Merge branch 'furfx-classic-parity' into shader-fixes commit 334d25394f48958629180fc2465988cf77a3f738 Merge: 64acefe 21ab2e7b4 Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 13:34:20 2026 -0500 Merge branch 'wgsl-material-parity-11-20' into shader-fixes commit 21ab2e7b4c54dfcfddcadc8807e5752ca946fc08 Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 12:50:05 2026 -0500 Fix parity gaps in early WGSL materials commit afc2ebc5f337f4bc42a4f29c5af7eda308f4698f Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 12:50:01 2026 -0500 Improve WGSL parity for material slice 51-60 commit 17e408a Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 12:46:44 2026 -0500 Fix PBS material parity gaps commit d94862b0199f4d92e5823aeb238e7817ed5e6fcc Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 12:43:41 2026 -0500 Tighten classic FurFX source parity commit dfe7bf3d35dbe9b941a1e26d6adfaa02c380bbd9 Author: DoubleStyx <79298541+DoubleStyx@users.noreply.github.com> Date: Thu May 21 12:43:40 2026 -0500 Tighten material parity for FurFX filters
1 parent 64acefe commit 1d445c4

56 files changed

Lines changed: 755 additions & 168 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎crates/renderide/shaders/materials/depthprojection.wgsl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ fn vs_main(
9292
@builtin(view_index) view_idx: u32,
9393
#endif
9494
@location(0) pos: vec4<f32>,
95-
@location(1) n: vec4<f32>,
9695
@location(2) uv0: vec2<f32>,
9796
) -> VertexOutput {
9897
let d = pd::get_draw(instance_index);

‎crates/renderide/shaders/materials/fogboxvolume.wgsl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,5 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
196196
let dist = accumulation_distance(raw_distance);
197197
let acc_base = max(dist * mat._AccumulationRate, 0.0);
198198
let acc = pow(acc_base, max(mat._GammaCurve, vol::VOLUME_EPSILON)) * acc_color;
199-
let result = vol::clamp_volume_source_rgb(apply_saturation(mat._BaseColor + acc));
200-
return rg::retain_globals_additive(result);
199+
return rg::retain_globals_additive(apply_saturation(mat._BaseColor + acc));
201200
}

‎crates/renderide/shaders/materials/fresnellerp.wgsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ fn compute_lerp(uv: vec2<f32>) -> f32 {
120120
l = l * mat._Lerp;
121121
}
122122
} else if (kw_LERPTEX_POLARUV()) {
123-
let polar_uv = uvu::apply_st(uvu::polar_uv(uv, mat._LerpPolarPow), mat._LerpTex_ST);
124-
l = textureSample(_LerpTex, _LerpTex_sampler, polar_uv).r;
123+
let mapped = uvu::polar_mapping(uv, mat._LerpTex_ST, mat._LerpPolarPow);
124+
l = textureSampleGrad(_LerpTex, _LerpTex_sampler, mapped.uv, mapped.ddx_uv, mapped.ddy_uv).r;
125125
if (kw_MULTI_VALUES()) {
126126
l = l * mat._Lerp;
127127
}

‎crates/renderide/shaders/materials/furfx-2.0-10layer.wgsl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
//! FurFX 2.0 10Layer material root.
22

33
//#texture_default _MainTex white
4-
//#texture_default _NormalMap bump
4+
//#texture_default _BumpMap bump
55
//#texture_default _NoiseTex white
66
//#texture_default _Cube empty
77
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
88
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
9+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
11+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
912
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
13+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
1014
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
15+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
16+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1117
//#mat_default _Shininess float 8.0
1218
//#mat_default _Gloss float 1.0
1319
//#mat_default _FurLength float 0.05
1420
//#mat_default _Cutoff float 0.2
15-
//#mat_default _EdgeFade float 0.15
1621
//#mat_default _HairHardness float 1.0
1722
//#mat_default _HairThinness float 2.0
1823
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-2.0-20layer.wgsl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
//! FurFX 2.0 20Layer material root.
22

33
//#texture_default _MainTex white
4-
//#texture_default _NormalMap bump
4+
//#texture_default _BumpMap bump
55
//#texture_default _NoiseTex white
66
//#texture_default _Cube empty
77
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
88
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
9+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
11+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
912
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
13+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
1014
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
15+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
16+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1117
//#mat_default _Shininess float 8.0
1218
//#mat_default _Gloss float 1.0
1319
//#mat_default _FurLength float 0.05
1420
//#mat_default _Cutoff float 0.2
15-
//#mat_default _EdgeFade float 0.15
1621
//#mat_default _HairHardness float 1.0
1722
//#mat_default _HairThinness float 2.0
1823
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-3.0-10layer.wgsl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
//! FurFX 3.0 10Layer material root.
22

33
//#texture_default _MainTex white
4-
//#texture_default _NormalMap bump
4+
//#texture_default _BumpMap bump
55
//#texture_default _NoiseTex white
66
//#texture_default _Cube empty
77
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
88
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
9+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
11+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
912
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
13+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
1014
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
15+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
16+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1117
//#mat_default _Shininess float 8.0
1218
//#mat_default _Gloss float 1.0
1319
//#mat_default _FurLength float 0.05
1420
//#mat_default _Cutoff float 0.2
15-
//#mat_default _EdgeFade float 0.15
1621
//#mat_default _HairHardness float 1.0
1722
//#mat_default _HairThinness float 2.0
1823
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-3.0-20layer.wgsl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
//! FurFX 3.0 20Layer material root.
22

33
//#texture_default _MainTex white
4-
//#texture_default _NormalMap bump
4+
//#texture_default _BumpMap bump
55
//#texture_default _NoiseTex white
66
//#texture_default _Cube empty
77
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
88
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
9+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
11+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
912
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
13+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
1014
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
15+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
16+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1117
//#mat_default _Shininess float 8.0
1218
//#mat_default _Gloss float 1.0
1319
//#mat_default _FurLength float 0.05
1420
//#mat_default _Cutoff float 0.2
15-
//#mat_default _EdgeFade float 0.15
1621
//#mat_default _HairHardness float 1.0
1722
//#mat_default _HairThinness float 2.0
1823
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-3.0-shell-10layer.wgsl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
//#texture_default _Cube empty
66
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
77
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
8+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
9+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
811
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
12+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
913
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
14+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
15+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1016
//#mat_default _Shininess float 8.0
1117
//#mat_default _Gloss float 1.0
1218
//#mat_default _FurLength float 0.05
1319
//#mat_default _Cutoff float 0.2
14-
//#mat_default _EdgeFade float 0.15
1520
//#mat_default _HairHardness float 1.0
1621
//#mat_default _HairThinness float 2.0
1722
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-3.0-shell-20layer.wgsl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
//#texture_default _Cube empty
66
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
77
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
8+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
9+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
811
//#mat_default _BonusAmbient vec4 0.0 0.0 0.0 1.0
12+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
913
//#mat_default _ReflColor vec4 1.0 1.0 1.0 1.0
14+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
15+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
1016
//#mat_default _Shininess float 8.0
1117
//#mat_default _Gloss float 1.0
1218
//#mat_default _FurLength float 0.05
1319
//#mat_default _Cutoff float 0.2
14-
//#mat_default _EdgeFade float 0.15
1520
//#mat_default _HairHardness float 1.0
1621
//#mat_default _HairThinness float 2.0
1722
//#mat_default _HairShading float 0.25

‎crates/renderide/shaders/materials/furfx-advanced-10layer.wgsl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
//#texture_default _Cube empty
66
//#mat_default _Color vec4 1.0 1.0 1.0 1.0
77
//#mat_default _SpecColor vec4 1.0 1.0 1.0 1.0
8+
//#mat_default _RimColor vec4 0.0 0.0 0.0 0.0
9+
//#mat_default _ForceGlobal vec4 0.0 0.0 0.0 0.0
10+
//#mat_default _ForceLocal vec4 0.0 0.0 0.0 0.0
811
//#mat_default _Shininess float 8.0
912
//#mat_default _FurLength float 0.05
1013
//#mat_default _Cutoff float 0.0001

0 commit comments

Comments
 (0)