feat: strip shaders using ShaderVariantCollection instead of 'Always …

…Include Shaders' close #211
mob-sakai · Nov 13, 2024 · a51d2c3 · a51d2c3
1 parent 9fbd6c0
commit a51d2c3
Show file tree

Hide file tree

Showing 13 changed files with 428 additions and 261 deletions.
diff --git a/Assets/ProjectSettings/UISoftMask.asset b/Assets/ProjectSettings/UISoftMask.asset
diff --git a/Assets/ProjectSettings/UISoftMaskProjectSettings.asset b/Assets/ProjectSettings/UISoftMaskProjectSettings.asset
@@ -0,0 +1,51 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb5b5e33068c14a2bacdd6575e94f505, type: 3}
+  m_Name: UISoftMaskProjectSettings
+  m_EditorClassIdentifier: 
+  m_SoftMaskEnabled: 1
+  m_StereoEnabled: 1
+  m_TransformSensitivity: 1
+  m_UseStencilOutsideScreen: 1
+  m_HideGeneratedComponents: 1
+  m_ShaderVariantRegistry:
+    m_ErrorWhenFallback: 0
+    m_ShaderAliases:
+    - key: UI/Default
+      value: Hidden/UI/Default (SoftMaskable)
+    m_UnregisteredVariants: []
+    m_Asset: {fileID: 6562417279084414694}
+--- !u!200 &6562417279084414694
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShaderVariants
+  m_Shaders:
+  - first: {fileID: 4800000, guid: 9839189d918374a318d397a86e90aa73, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+      - keywords: UNITY_UI_ALPHACLIP
+        passType: 0
+  - first: {fileID: 4800000, guid: 2933b413a51fc4ff3a83c7ef4177ae84, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 4800000, guid: 33e06cd3c50064f30a691b600fc62f3f, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
diff --git a/Assets/ProjectSettings/UISoftMask.asset.meta → ...ings/UISoftMaskProjectSettings.asset.meta b/Assets/ProjectSettings/UISoftMask.asset.meta → ...ings/UISoftMaskProjectSettings.asset.meta
diff --git a/Packages/src/Editor/ShaderPreProcessor.cs b/Packages/src/Editor/ShaderPreProcessor.cs
diff --git a/Packages/src/Editor/UISoftMaskProjectSettingsEditor.cs b/Packages/src/Editor/UISoftMaskProjectSettingsEditor.cs
@@ -7,44 +7,28 @@ namespace Coffee.UISoftMask
     [CustomEditor(typeof(UISoftMaskProjectSettings))]
     internal class UISoftMaskProjectSettingsEditor : Editor
     {
-        private static readonly GUIContent s_ContentRemove = new GUIContent("-");
-        private static readonly GUIContent s_ContentReset = new GUIContent("Reset");
-        private static readonly GUIContent s_ContentIncluded = new GUIContent("Included Shaders");
-        private static readonly GUIContent s_ContentUpgrade = new GUIContent("Upgrade");
-        private static readonly GUIContent s_ContentUpgradeButton = new GUIContent("Upgrade All Assets V1 to V2");
+        private ShaderRegistryEditor _shaderRegistryEditor;
 
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
 
-            // Draw SoftMask/SoftMaskable/TerminalShape Shaders;
-            EditorGUILayout.BeginHorizontal();
+            // Shader registry.
+            EditorGUILayout.Space();
+            EditorGUILayout.LabelField("Shader", EditorStyles.boldLabel);
+            if (_shaderRegistryEditor == null)
             {
-                EditorGUILayout.PrefixLabel(s_ContentIncluded);
-                if (GUILayout.Button(s_ContentReset, EditorStyles.miniButton, GUILayout.Width(80)))
-                {
-                    UISoftMaskProjectSettings.instance.ReloadShaders(true);
-                }
+                var property = serializedObject.FindProperty("m_ShaderVariantRegistry");
+                _shaderRegistryEditor = new ShaderRegistryEditor(property, "(SoftMaskable)");
             }
-            EditorGUILayout.EndHorizontal();
-
-            foreach (var shader in AlwaysIncludedShadersProxy.GetShaders())
-            {
-                if (!UISoftMaskProjectSettings.CanIncludeShader(shader)) continue;
 
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.ObjectField(shader, typeof(Shader), false);
-                if (GUILayout.Button(s_ContentRemove, EditorStyles.miniButton, GUILayout.Width(20)))
-                {
-                    AlwaysIncludedShadersProxy.Remove(shader);
-                }
-
-                EditorGUILayout.EndHorizontal();
-            }
+            _shaderRegistryEditor.Draw();
+            serializedObject.ApplyModifiedProperties();
 
+            // Upgrade v1 to v2.
             EditorGUILayout.Space();
-            EditorGUILayout.LabelField(s_ContentUpgrade, EditorStyles.boldLabel);
-            if (GUILayout.Button(s_ContentUpgradeButton))
+            EditorGUILayout.LabelField("Upgrade", EditorStyles.boldLabel);
+            if (GUILayout.Button("Upgrade All Assets V1 to V2"))
             {
                 EditorApplication.delayCall += () => new UISoftMaskModifierRunner().RunIfUserWantsTo();
             }