diff options
| -rw-r--r-- | 2ner.cginc | 4 | ||||
| -rw-r--r-- | 2ner.shader | 10 | ||||
| -rw-r--r-- | fog.cginc | 9 |
3 files changed, 12 insertions, 11 deletions
@@ -194,10 +194,10 @@ float4 frag(v2f i, uint facing : SV_IsFrontFace FogParams fog_params = {
_Raymarched_Fog_Steps,
_Raymarched_Fog_Density,
+ _Raymarched_Fog_Y_Cutoff,
_Raymarched_Fog_Dithering_Noise,
_Raymarched_Fog_Density_Noise,
- _Raymarched_Fog_Density_Noise_Scale,
- _Raymarched_Fog_Y_Cutoff
+ _Raymarched_Fog_Density_Noise_Scale
};
FogResult fog_result = raymarched_fog(i, fog_params);
depth = fog_result.depth;
diff --git a/2ner.shader b/2ner.shader index 0491a7b..d176ea7 100644 --- a/2ner.shader +++ b/2ner.shader @@ -690,7 +690,7 @@ Shader "yum_food/2ner" _Decal5_Mask("Mask", 2D) = "white" {} [HideInInspector] m_end_Decal5_Mask("Mask", Float) = 0 //endex - [HideInInspector] m_end_Decal6("Decal 5", Float) = 0 + [HideInInspector] m_end_Decal5("Decal 5", Float) = 0 //endex //ifex _Decal6_Enabled==0 [HideInInspector] m_start_Decal6("Decal 6", Float) = 0 @@ -1073,7 +1073,7 @@ Shader "yum_food/2ner" _Unigram_Letter_Grid_Data_Block09_Datum03_Byte00_Animated("Block 09, Datum 03, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block09_Datum03_Byte01_Animated("Block 09, Datum 03, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block09_Datum04_Byte00_Animated("Block 09, Datum 04, Byte 00", Range(0,255)) = 255 - _Unigram_Letter_Grid_Data_Block09_Datum04_Byte01_Animated("Block 09, iatum 04, Byte 01", Range(0,255)) = 255 + _Unigram_Letter_Grid_Data_Block09_Datum04_Byte01_Animated("Block 09, Datum 04, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block10_Datum00_Byte00_Animated("Block 10, Datum 00, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block10_Datum00_Byte01_Animated("Block 10, Datum 00, Byte 01", Range(0,255)) = 255 @@ -1183,7 +1183,7 @@ Shader "yum_food/2ner" _Unigram_Letter_Grid_Data_Block19_Datum03_Byte00_Animated("Block 19, Datum 03, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block19_Datum03_Byte01_Animated("Block 19, Datum 03, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block19_Datum04_Byte00_Animated("Block 19, Datum 04, Byte 00", Range(0,255)) = 255 - _Unigram_Letter_Grid_Data_Block19_Datum04_Byte01_Animated("Block 19, iatum 04, Byte 01", Range(0,255)) = 255 + _Unigram_Letter_Grid_Data_Block19_Datum04_Byte01_Animated("Block 19, Datum 04, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block20_Datum00_Byte00_Animated("Block 20, Datum 00, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block20_Datum00_Byte01_Animated("Block 20, Datum 00, Byte 01", Range(0,255)) = 255 @@ -1293,7 +1293,7 @@ Shader "yum_food/2ner" _Unigram_Letter_Grid_Data_Block29_Datum03_Byte00_Animated("Block 29, Datum 03, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block29_Datum03_Byte01_Animated("Block 29, Datum 03, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block29_Datum04_Byte00_Animated("Block 29, Datum 04, Byte 00", Range(0,255)) = 255 - _Unigram_Letter_Grid_Data_Block29_Datum04_Byte01_Animated("Block 29, iatum 04, Byte 01", Range(0,255)) = 255 + _Unigram_Letter_Grid_Data_Block29_Datum04_Byte01_Animated("Block 29, Datum 04, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block30_Datum00_Byte00_Animated("Block 30, Datum 00, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block30_Datum00_Byte01_Animated("Block 30, Datum 00, Byte 01", Range(0,255)) = 255 @@ -1403,7 +1403,7 @@ Shader "yum_food/2ner" _Unigram_Letter_Grid_Data_Block39_Datum03_Byte00_Animated("Block 39, Datum 03, Byte 00", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block39_Datum03_Byte01_Animated("Block 39, Datum 03, Byte 01", Range(0,255)) = 255 _Unigram_Letter_Grid_Data_Block39_Datum04_Byte00_Animated("Block 39, Datum 04, Byte 00", Range(0,255)) = 255 - _Unigram_Letter_Grid_Data_Block39_Datum04_Byte01_Animated("Block 39, iatum 04, Byte 01", Range(0,255)) = 255 + _Unigram_Letter_Grid_Data_Block39_Datum04_Byte01_Animated("Block 39, Datum 04, Byte 01", Range(0,255)) = 255 [HideInInspector] m_end_Unigram_Letter_Grid("Unigram letter grid", Float) = 0 //endex @@ -35,7 +35,7 @@ FogResult raymarched_fog(v2f i, FogParams p) linearZ = min(1E3, linearZ); // Get intersection with plane at elevation y. - float plane_y = -10; + float plane_y = p.y_cutoff; float distance_to_y = 1E3; if (abs(rd.y) > 1E-6) { float t = (plane_y - ro.y) / rd.y; @@ -48,6 +48,7 @@ FogResult raymarched_fog(v2f i, FogParams p) float step_size = linearZ / p.steps; float3 pp = ro; float d = 0; + [loop] for (uint ii = 0; ii < p.steps; ++ii) { pp += step_size * rd; float cur_d = p.density_noise.SampleLevel(linear_repeat_s, @@ -59,9 +60,9 @@ FogResult raymarched_fog(v2f i, FogParams p) FogResult r; r.color.rgb = 1; - r.color.rgb = saturate(log(linearZ) / 5.0); - //r.color.a = saturate(d); - r.color.a = 1; + //r.color.rgb = saturate(log(linearZ) / 5.0); + r.color.a = saturate(d); + //r.color.a = 1; r.depth = 0.0001; // Very small depth value to render in front return r; } |