From 321b2a49a402fd97f99e3894bf3342b92f623eb1 Mon Sep 17 00:00:00 2001
From: Andrew Cassidy <drewcassidy@me.com>
Date: Tue, 23 Jul 2024 22:44:41 -0700
Subject: [PATCH] Reorganize UI shaders

---
 Assets/Shaders/{ => UI}/ColorSlider.shader | 14 ++++++--------
 Assets/Shaders/{ => UI}/ColorSquare.shader |  8 ++++----
 Assets/Shaders/{ => UI}/ColorSwatch.shader | 10 +++++-----
 Assets/Shaders/{ => UI}/HSL.cginc          |  0
 4 files changed, 15 insertions(+), 17 deletions(-)
 rename Assets/Shaders/{ => UI}/ColorSlider.shader (98%)
 rename Assets/Shaders/{ => UI}/ColorSquare.shader (98%)
 rename Assets/Shaders/{ => UI}/ColorSwatch.shader (98%)
 rename Assets/Shaders/{ => UI}/HSL.cginc (100%)

diff --git a/Assets/Shaders/ColorSlider.shader b/Assets/Shaders/UI/ColorSlider.shader
similarity index 98%
rename from Assets/Shaders/ColorSlider.shader
rename to Assets/Shaders/UI/ColorSlider.shader
index 9629293d..b02c7cea 100644
--- a/Assets/Shaders/ColorSlider.shader
+++ b/Assets/Shaders/UI/ColorSlider.shader
@@ -4,11 +4,11 @@ Shader "ConformalDecals/UI/Color Slider"
     {
         _Color("Color", Color) = (0,0,0,0)
         _Radius("Radius", Float) = 4
-        
+
         _OutlineGradient("Outline Gradient Step", Range (0, 1)) = 0.6
         _OutlineOpacity("Outline Opacity", Range (0, 0.5)) = 0.1
         _OutlineWidth("Outline Width", Float) = 3
-        
+
         _StencilComp ("Stencil Comparison", Float) = 8
         _Stencil ("Stencil ID", Float) = 0
         _StencilOp ("Stencil Operation", Float) = 0
@@ -18,13 +18,11 @@ Shader "ConformalDecals/UI/Color Slider"
         _ColorMask ("Color Mask", Float) = 15
 
         [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
-        
+
         [Toggle(HUE)] _Hue ("Hue", int) = 0
         [Toggle(RED)] _Red ("Red", int) = 0
         [Toggle(GREEN)] _Green ("Green", int) = 0
         [Toggle(BLUE)] _Blue ("Blue", int) = 0
-
-
     }
     SubShader
     {
@@ -44,14 +42,14 @@ Shader "ConformalDecals/UI/Color Slider"
             ReadMask [_StencilReadMask]
             WriteMask [_StencilWriteMask]
         }
-        
+
         Cull Off
         Lighting Off
         ZWrite Off
         ZTest [unity_GUIZTestMode]
         Blend SrcAlpha OneMinusSrcAlpha
         ColorMask [_ColorMask]
-        
+
         Pass
         {
             CGPROGRAM
@@ -63,7 +61,7 @@ Shader "ConformalDecals/UI/Color Slider"
             #include "UnityCG.cginc"
             #include "UnityUI.cginc"
             #include "HSL.cginc"
-            #include "SDF.cginc"
+            #include "../SDF.cginc"
             
             #pragma multi_compile_local _ UNITY_UI_CLIP_RECT
             #pragma multi_compile_local _ UNITY_UI_ALPHACLIP
diff --git a/Assets/Shaders/ColorSquare.shader b/Assets/Shaders/UI/ColorSquare.shader
similarity index 98%
rename from Assets/Shaders/ColorSquare.shader
rename to Assets/Shaders/UI/ColorSquare.shader
index 1b3663dc..657c31fc 100644
--- a/Assets/Shaders/ColorSquare.shader
+++ b/Assets/Shaders/UI/ColorSquare.shader
@@ -8,7 +8,7 @@ Shader "ConformalDecals/UI/HSV Square"
         _OutlineGradient("Outline Gradient Step", Range (0, 1)) = 0.6
         _OutlineOpacity("Outline Opacity", Range (0, 0.5)) = 0.1
         _OutlineWidth("Outline Width", Float) = 3
-        
+
         _StencilComp ("Stencil Comparison", Float) = 8
         _Stencil ("Stencil ID", Float) = 0
         _StencilOp ("Stencil Operation", Float) = 0
@@ -37,14 +37,14 @@ Shader "ConformalDecals/UI/HSV Square"
             ReadMask [_StencilReadMask]
             WriteMask [_StencilWriteMask]
         }
-        
+
         Cull Off
         Lighting Off
         ZWrite Off
         ZTest [unity_GUIZTestMode]
         Blend SrcAlpha OneMinusSrcAlpha
         ColorMask [_ColorMask]
-        
+
         Pass
         {
             CGPROGRAM
@@ -56,7 +56,7 @@ Shader "ConformalDecals/UI/HSV Square"
             #include "UnityCG.cginc"
             #include "UnityUI.cginc"
             #include "HSL.cginc"
-            #include "SDF.cginc"
+            #include "../SDF.cginc"
             
             #pragma multi_compile_local _ UNITY_UI_CLIP_RECT
             #pragma multi_compile_local _ UNITY_UI_ALPHACLIP
diff --git a/Assets/Shaders/ColorSwatch.shader b/Assets/Shaders/UI/ColorSwatch.shader
similarity index 98%
rename from Assets/Shaders/ColorSwatch.shader
rename to Assets/Shaders/UI/ColorSwatch.shader
index dad32462..637a7ffe 100644
--- a/Assets/Shaders/ColorSwatch.shader
+++ b/Assets/Shaders/UI/ColorSwatch.shader
@@ -4,11 +4,11 @@ Shader "ConformalDecals/UI/Color Swatch"
     {
         _Color("Color", Color) = (0,0,0,0)
         _Radius("Radius", Float) = 4
-        
+
         _OutlineGradient("Outline Gradient Step", Range (0, 1)) = 0.6
         _OutlineOpacity("Outline Opacity", Range (0, 0.5)) = 0.1
         _OutlineWidth("Outline Width", Float) = 3
-        
+
         _StencilComp ("Stencil Comparison", Float) = 8
         _Stencil ("Stencil ID", Float) = 0
         _StencilOp ("Stencil Operation", Float) = 0
@@ -37,14 +37,14 @@ Shader "ConformalDecals/UI/Color Swatch"
             ReadMask [_StencilReadMask]
             WriteMask [_StencilWriteMask]
         }
-        
+
         Cull Off
         Lighting Off
         ZWrite Off
         ZTest [unity_GUIZTestMode]
         Blend SrcAlpha OneMinusSrcAlpha
         ColorMask [_ColorMask]
-        
+
         Pass
         {
             CGPROGRAM
@@ -56,7 +56,7 @@ Shader "ConformalDecals/UI/Color Swatch"
             #include "UnityCG.cginc"
             #include "UnityUI.cginc"
             #include "HSL.cginc"
-            #include "SDF.cginc"
+            #include "../SDF.cginc"
             
             #pragma multi_compile_local _ UNITY_UI_CLIP_RECT
             #pragma multi_compile_local _ UNITY_UI_ALPHACLIP
diff --git a/Assets/Shaders/HSL.cginc b/Assets/Shaders/UI/HSL.cginc
similarity index 100%
rename from Assets/Shaders/HSL.cginc
rename to Assets/Shaders/UI/HSL.cginc