diff --git a/Assets/automata/ElementaryCA/elementary_ca.shader b/Assets/automata/ElementaryCA/elementary_ca.shader index fdc066a..3cb2ab0 100644 --- a/Assets/automata/ElementaryCA/elementary_ca.shader +++ b/Assets/automata/ElementaryCA/elementary_ca.shader @@ -4,7 +4,7 @@ { [NoScaleOffset] _LastFrame ("Render texture", 2D) = "white" {} - _Rule("Rule", Int) = 110 + _Rule("Rule", Integer) = 110 } SubShader { @@ -48,7 +48,7 @@ { const uint x = (p.x + dx) % WIDTH; const uint y = (p.y + dy) % WIDTH; - return _LastFrame[uint2(x, y)].b > 0; + return _LastFrame[uint2(x, y)].b > 0.1; } float3 frag (v2f i) : SV_Target @@ -60,13 +60,12 @@ return state(p, 0, 0); } int permutation = - (state(p, -1, 1)<<2) | - (state(p, 0, 1)<<1) | - state(p, 1, 1); + (state(p, -1, 1) << 2) | + (state(p, 0, 1) << 1) | + state(p, 1, 1); float next = (_Rule >> permutation) & 1; return float3(i.uv * next, next * (_SinTime.y * 0.4 + 0.6)); - // return next; } ENDCG } diff --git a/Assets/automata/WireWorld/wireworld.shader b/Assets/automata/WireWorld/wireworld.shader index 9c93a40..4222ebd 100644 --- a/Assets/automata/WireWorld/wireworld.shader +++ b/Assets/automata/WireWorld/wireworld.shader @@ -4,7 +4,7 @@ { _LastFrame ("Texture", 2D) = "white" {} [Toggle] - _Running ("Running", Int) = 0 + _Running ("Running", Integer) = 0 } SubShader { diff --git a/Assets/raymarched/Interactive/raymarch_origin.shader b/Assets/raymarched/Interactive/raymarch_origin.shader index 4e43a07..ae4c19f 100644 --- a/Assets/raymarched/Interactive/raymarch_origin.shader +++ b/Assets/raymarched/Interactive/raymarch_origin.shader @@ -3,7 +3,7 @@ Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 256 + _MaxSteps ("Max steps", Integer) = 256 _MaxDist ("Max distance", Float) = 100 _SurfDist ("Surface distance threshold", Range(0.00001, 0.05)) = 0.001 } diff --git a/Assets/raymarched/Interactive/raymarch_secondary.shader b/Assets/raymarched/Interactive/raymarch_secondary.shader index e5648aa..1e5f4ec 100644 --- a/Assets/raymarched/Interactive/raymarch_secondary.shader +++ b/Assets/raymarched/Interactive/raymarch_secondary.shader @@ -3,7 +3,7 @@ Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 256 + _MaxSteps ("Max steps", Integer) = 256 _MaxDist ("Max distance", Float) = 100 _SurfDist ("Surface distance threshold", Range(0.00001, 0.05)) = 0.001 } diff --git a/Assets/raymarched/Interactive/rm_combined.shader b/Assets/raymarched/Interactive/rm_combined.shader index 43af9c4..1def979 100644 --- a/Assets/raymarched/Interactive/rm_combined.shader +++ b/Assets/raymarched/Interactive/rm_combined.shader @@ -6,7 +6,7 @@ _ObjectA ("Object A", Vector) = (0, 0, 0) _ObjectB ("Object B", Vector) = (0, 0, 0) [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 256 + _MaxSteps ("Max steps", Integer) = 256 _MaxDist ("Max distance", Float) = 100 _SurfDist ("Surface distance threshold", Range(0.00001, 0.05)) = 0.001 } diff --git a/Assets/raymarched/Spinny_Sunset.shader b/Assets/raymarched/Spinny_Sunset.shader index 0440f7e..050cd0e 100644 --- a/Assets/raymarched/Spinny_Sunset.shader +++ b/Assets/raymarched/Spinny_Sunset.shader @@ -3,7 +3,7 @@ Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 [Header(Sky)] diff --git a/Assets/raymarched/distortion.shader b/Assets/raymarched/distortion.shader index 911f755..274f618 100644 --- a/Assets/raymarched/distortion.shader +++ b/Assets/raymarched/distortion.shader @@ -3,7 +3,7 @@ Shader "CrispyPin/Distortion" Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 diff --git a/Assets/raymarched/gyroid.shader b/Assets/raymarched/gyroid.shader index c8cd8d1..2dd08c8 100644 --- a/Assets/raymarched/gyroid.shader +++ b/Assets/raymarched/gyroid.shader @@ -3,7 +3,7 @@ Shader "CrispyPin/Gyroid" Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 diff --git a/Assets/raymarched/lib/libgarbage_example.shader b/Assets/raymarched/lib/libgarbage_example.shader index 6a31235..0bbe3b9 100644 --- a/Assets/raymarched/lib/libgarbage_example.shader +++ b/Assets/raymarched/lib/libgarbage_example.shader @@ -3,7 +3,7 @@ Shader "CrispyPin/LibGarbageExample" Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 diff --git a/Assets/raymarched/nut.shader b/Assets/raymarched/nut.shader index f758871..7465ef6 100644 --- a/Assets/raymarched/nut.shader +++ b/Assets/raymarched/nut.shader @@ -3,7 +3,7 @@ Shader "CrispyPin/Nut" Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 } diff --git a/Assets/raymarched/spinny.shader b/Assets/raymarched/spinny.shader index 8a38822..8b40072 100644 --- a/Assets/raymarched/spinny.shader +++ b/Assets/raymarched/spinny.shader @@ -3,7 +3,7 @@ Shader "CrispyPin/LibGarbageSpinny" Properties { [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 128 + _MaxSteps ("Max steps", Integer) = 128 _MaxDist ("Max distance", Float) = 128 _SurfDist ("Surface distance threshold", Range(0.0001, 0.05)) = 0.001 } diff --git a/Assets/test/Demo4.shader b/Assets/test/Demo4.shader index fe9f76c..deff326 100644 --- a/Assets/test/Demo4.shader +++ b/Assets/test/Demo4.shader @@ -6,7 +6,7 @@ _SunPos ("Sun position", Vector) = (8, 4, 2) [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 256 + _MaxSteps ("Max steps", Integer) = 256 _MaxDist ("Max distance", Float) = 256 _SurfDist ("Surface distance threshold", Range(0.00001, 0.05)) = 0.001 diff --git a/Assets/test/FleshCube.shader b/Assets/test/FleshCube.shader index b000374..1748d6b 100644 --- a/Assets/test/FleshCube.shader +++ b/Assets/test/FleshCube.shader @@ -6,7 +6,7 @@ _SunPos ("Sun position", Vector) = (8, 4, 2) [Header(Raymarcher Properties)] - _MaxSteps ("Max steps", Int) = 256 + _MaxSteps ("Max steps", Integer) = 256 _MaxDist ("Max distance", Float) = 256 _SurfDist ("Surface distance threshold", Range(0.00001, 0.05)) = 0.001