Added support to multiple enable properties

Author: Cibbi

Editor/Editors/Inspectors/ShaderModuleEditor.cs

@@ -1,7 +1,6 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEditor.UIElements;
 
 namespace VRLabs.ModularShaderSystem.UI
 {

Editor/Editors/Windows/Migrator.cs

@@ -52,7 +52,7 @@ public class MigratedShaderModule
         public string version;
         public string author;
         public string description;
-        public EnableProperty enabled;
+        public List<EnableProperty> enableProperties;
         public List<Property> properties;
         public List<string> moduleDependencies;
         public List<string> incompatibleWith;
@@ -312,7 +312,7 @@ private static void Import(MigratedAssets assets)
                 module.ModuleDependencies = new List<string>(asset.moduleDependencies);
                 module.IncompatibleWith = new List<string>(asset.incompatibleWith);
                 module.AdditionalSerializedData = asset.additionalSerializedData;
-                module.Enabled = asset.enabled;
+                module.EnableProperties = new List<EnableProperty>(asset.enableProperties);
                 module.Properties = new List<Property>(asset.properties);
                 module.Templates = asset.templates.Select(x =>
                 {
@@ -582,7 +582,7 @@ private void ExportSelected()
                     version = asset.Version,
                     author = asset.Author,
                     description = asset.Description,
-                    enabled = asset.Enabled,
+                    enableProperties = asset.EnableProperties,
                     properties = new List<Property>(asset.Properties),
                     moduleDependencies = new List<string>(asset.ModuleDependencies),
                     incompatibleWith = new List<string>(asset.IncompatibleWith),

Editor/Resources/MSS/MSSUIElements/ShaderModuleEditor.uxml

@@ -9,7 +9,7 @@
     <VRLabs.ModularShaderSystem.UI.InspectorList binding-path="IncompatibleWith" show-elements-text="false" />
 
     <ui:Label text="Settings" style="margin-bottom: 4px; -unity-font-style: bold; margin-top: 20px;" />
-    <uie:PropertyField binding-path="Enabled" label="Enable Property" focusable="true" />
+    <VRLabs.ModularShaderSystem.UI.InspectorList show-elements-text="false" binding-path="EnableProperties" />
     <VRLabs.ModularShaderSystem.UI.InspectorList show-elements-text="false" binding-path="Properties" />
     <VRLabs.ModularShaderSystem.UI.InspectorList show-elements-text="false" binding-path="Functions" />
     <VRLabs.ModularShaderSystem.UI.InspectorList show-elements-text="false" binding-path="Templates" />

Editor/Scriptables/ShaderModule.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace VRLabs.ModularShaderSystem
@@ -33,11 +34,11 @@ public class ShaderModule : ScriptableObject
         /// Description of the shader model.
         /// </summary>
         public string Description;
-        
+
         /// <summary>
-        /// Property used to toggle on and off the module in the generated shader.
+        /// List of properties declared by the module.
         /// </summary>
-        public EnableProperty Enabled;
+        public List<EnableProperty> EnableProperties;
 
         /// <summary>
         /// List of properties declared by the module.