wip

Author: mlavik1

Assets/Editor/RenderPipelineDefinesSetup.cs

@@ -1,31 +1,88 @@
 using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.PackageManager;
 using UnityEngine;
 
 namespace UnityVolumeRendering
 {
     /// <summary>
     /// Automatically adds scripting define symbols when render pipeline packages are detected.
     /// This allows shaders to use #ifdef UVR_URP and #ifdef UVR_HDRP to conditionally compile code.
+    /// Updates automatically on Unity load, when build target changes, and when packages are added/removed.
     /// </summary>
     [InitializeOnLoad]
-    public class RenderPipelineDefinesSetup
+    public class RenderPipelineDefinesSetup : IActiveBuildTargetChanged
     {
         private const string URP_DEFINE = "UVR_URP";
         private const string HDRP_DEFINE = "UVR_HDRP";
+        private const string URP_PACKAGE = "com.unity.render-pipelines.universal";
+        private const string HDRP_PACKAGE = "com.unity.render-pipelines.high-definition";
+
+        // IActiveBuildTargetChanged implementation
+        public int callbackOrder => 0;
 
         static RenderPipelineDefinesSetup()
+        {
+            // Run on Unity load
+            UpdateDefines();
+
+            // Subscribe to package manager events
+            Events.registeredPackages += OnPackagesChanged;
+        }
+
+        /// <summary>
+        /// Called when packages are added, removed, or updated.
+        /// </summary>
+        private static void OnPackagesChanged(PackageRegistrationEventArgs args)
+        {
+            bool needsUpdate = false;
+
+            // Check if any render pipeline packages were added
+            foreach (var package in args.added)
+            {
+                if (package.name == URP_PACKAGE || package.name == HDRP_PACKAGE)
+                {
+                    needsUpdate = true;
+                    Debug.Log($"[Unity Volume Rendering] Detected package addition: {package.name}");
+                    break;
+                }
+            }
+
+            // Check if any render pipeline packages were removed
+            if (!needsUpdate)
+            {
+                foreach (var package in args.removed)
+                {
+                    if (package.name == URP_PACKAGE || package.name == HDRP_PACKAGE)
+                    {
+                        needsUpdate = true;
+                        Debug.Log($"[Unity Volume Rendering] Detected package removal: {package.name}");
+                        break;
+                    }
+                }
+            }
+
+            if (needsUpdate)
+            {
+                UpdateDefines();
+            }
+        }
+
+        // Called when build target changes
+        public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
         {
             UpdateDefines();
         }
 
-        [MenuItem("Tools/Unity Volume Rendering/Update Render Pipeline Defines")]
-        public static void UpdateDefines()
+        [MenuItem("Volume Rendering/Update Render Pipeline Defines")]
+        private static void UpdateDefines()
         {
             bool urpInstalled = IsPackageInstalled("com.unity.render-pipelines.universal");
             bool hdrpInstalled = IsPackageInstalled("com.unity.render-pipelines.high-definition");
 
             BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
-            string currentDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
+            NamedBuildTarget namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
+            string currentDefines = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget);
 
             bool modified = false;
 
@@ -59,7 +116,7 @@ public static void UpdateDefines()
 
             if (modified)
             {
-                PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, currentDefines);
+                PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, currentDefines);
             }
         }
 

Assets/Shaders/URP/DirectVolumeRenderingShader.shader

@@ -45,7 +45,6 @@
             #pragma fragment frag
 
             #include "../Include/URPIncludes.hlsl"
-            #include "../Include/BackwardsCompatibility.hlsl"
             #include "../Include/VolumeRendering.hlsl"
 
             #define AMBIENT_LIGHTING_FACTOR 0.2