Removed test generator window

added generator button in the inspector of the modular shader
Adjusted InspectorList uss

Author: Cibbi

Editor/Editors/Elements/InspectorList.cs

@@ -159,7 +159,7 @@ private void CreateDrop()
                     if (_currentDrop == dropArea) _currentDrop = null;
                 }
             });
-
+            
             _listContainer.Add(dropArea);
             _drops.Add(dropArea);
         }
@@ -273,17 +273,15 @@ public InspectorListItem(IInspectorList list, VisualElement element, SerializedP
                     e.StopImmediatePropagation();
                     return;
                 }
-                else
-                {
-                    _list.draggedElement = this;
-                    _list.HighlightDrops();
-                    this.AddToClassList("inspector-list-drag-enabled");
-                }
+
+                _list.draggedElement = this;
+                _list.HighlightDrops();
+                AddToClassList("inspector-list-drag-enabled");
             });
 
             VisualElement buttonsArea = new VisualElement();
 
-            this.RegisterCallback<UnityEngine.UIElements.GeometryChangedEvent>(e =>
+            RegisterCallback<GeometryChangedEvent>(e =>
             {
                 buttonsArea.ClearClassList();
                 if (e.newRect.height > 60)

Editor/Editors/Inspectors/ModularShaderEditor.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -41,6 +42,27 @@ public override VisualElement CreateInspectorGUI()
             {
                 propertiesTemplateField.style.display = x.newValue ? DisplayStyle.Flex : DisplayStyle.None;
             });
+            
+            var generateButton = _root.Q<Button>("RegenerateShaderButton");
+
+            generateButton.clicked += () =>
+            {
+                var _issues = ShaderGenerator.CheckShaderIssues(_shader);
+                if (_issues.Count > 0)
+                {
+                    EditorUtility.DisplayDialog("Error", $"The modular shader has issues that must be resolved before generating the shader:\n  {string.Join("\n  ", _issues)}", "Ok");
+                    return;
+                }
+
+                string path = EditorUtility.OpenFolderPanel("Select folder", "Assets", "");
+                if (path.Length == 0)
+                    return;
+
+                string localPath = Environment.CurrentDirectory;
+                localPath = localPath.Replace('\\', '/');
+                path = path.Replace(localPath + "/", "");
+                ShaderGenerator.GenerateShader(path, _shader);
+            };
 
             return _root;
         }

Editor/Resources/MSS/MSSUIElements/InspectorList.uss

@@ -113,15 +113,13 @@
 
 .inspector-list-drop-area
 {
-    height: 0px;
-    
+    height: 5px;
     border-radius: 4px;
+
 }
 
 .inspector-list-drop-area-highlight
 {
-    height: 8px;
-    margin: 2px;
     background-color: rgba(128, 128, 190, 0.5);
 }
 

Editor/Resources/MSS/MSSUIElements/ModularShaderEditor.uxml

@@ -14,4 +14,5 @@
     <ui:Toggle binding-path="UseTemplatesForProperties" label="Properties from templates" name="UseTemplatesForPropertiesField" />
     <uie:ObjectField label="Shader Properties Template" binding-path="ShaderPropertiesTemplate" name="ShaderPropertiesTemplateField" allow-scene-objects="false" />
     <VRLabs.ModularShaderSystem.ModuleInspectorList name="BaseModulesField" binding-path="BaseModules" show-elements-text="false" />
+    <ui:Button name="RegenerateShaderButton" text="Generate Shader"/>
 </ui:UXML>

Editor/ShaderModuleGenerationTest.cs

@@ -16,6 +16,7 @@ MonoBehaviour:
   Name: Example Modular Shader
   Version: 1.0
   Author: VRLabs
+  Description: 
   UseTemplatesForProperties: 0
   ShaderPropertiesTemplate: {fileID: 0}
   ShaderPath: VRLabs/Examples/Example Modular Shader
@@ -52,3 +53,5 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 5a456ab203c06e341bdbdf8d48c8c643, type: 2}
   AdditionalModules: []
   LockBaseModules: 0
+  LastGeneratedShaders: []
+  AdditionalSerializedData: 

Editor/ShaderModuleGenerationTest.cs.meta

@@ -17,7 +17,6 @@ MonoBehaviour:
   Version: 1.0
   Author: VRLabs
   Description: 
-  RequiredIncludes: []
   Enabled:
     Name: 
     DisplayName: 
@@ -31,19 +30,13 @@ MonoBehaviour:
     Type: Float
     DefaultValue: 0.0
     Attributes: []
-  - Name: 
-    DisplayName: 
-    Type: 
-    DefaultValue: 0
-    Attributes:
-    - Header(hi)
   ModuleDependencies: []
   IncompatibleWith: []
   Templates: []
   Functions:
   - Name: DoSomething
     AppendAfter: '#K#MAINPASSENTRY'
-    Priority: 99
+    Queue: 99
     ShaderFunctionCode: {fileID: 1413292532103889072, guid: 55a288a5a8d45a74e8bf3f0ee396c57c,
       type: 3}
     UsedVariables: