Fixed the case when a Mask Volume asset is saved to a file empty. The "Resample Asset" button can process an empty asset and fill it with valid data now. (#23)

AndrewSaraevUnity · pastasfuture · commit a92311e64f05 · 2021-09-14T16:17:46.000-07:00
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolume.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolume.cs
@@ -90,9 +90,9 @@ public static int GetDataSHL2Stride()
             return 9 * 3 - GetDataSHL0Stride();
         } */
 
-        public static bool IsNull(ref MaskVolumePayload payload)
+        public static bool IsEmpty(ref MaskVolumePayload payload)
         {
-            return payload.dataSHL0 == null;
+            return payload.dataSHL0 == null || payload.dataSHL0.Length == 0;
         }
 
         public static int GetLength(ref MaskVolumePayload payload)
@@ -766,6 +766,8 @@ internal void CreateAsset()
             int numMasks = parameters.resolutionX * parameters.resolutionY * parameters.resolutionZ;
             MaskVolumePayload.Allocate(ref maskVolumeAsset.payload, numMasks);
 
+            UnityEditor.EditorUtility.SetDirty(maskVolumeAsset);
+
             dataUpdated = true;
         }
 
@@ -779,36 +781,40 @@ internal void ResampleAsset()
             int numMasks = parameters.resolutionX * parameters.resolutionY * parameters.resolutionZ;
             MaskVolumePayload newPayload = default;
             MaskVolumePayload.Allocate(ref newPayload, numMasks);
-            
-            for (int z = 0; z < parameters.resolutionZ; z++)
+
+            if (oldResolutionX > 0 && oldResolutionY > 0 && oldResolutionZ > 0 && !MaskVolumePayload.IsEmpty(ref oldPayload))
             {
-                CalculateResamplingWeights(oldResolutionZ, parameters.resolutionZ, z, out int oldZLow, out int oldZHigh, out float oldZLowWeight, out float oldZHighWeight);
-                
-                for (int y = 0; y < parameters.resolutionY; y++)
+                for (int z = 0; z < parameters.resolutionZ; z++)
                 {
-                    CalculateResamplingWeights(oldResolutionY, parameters.resolutionY, y, out int oldYLow, out int oldYHigh, out float oldYLowWeight, out float oldYHighWeight);
-                    
-                    for (int x = 0; x < parameters.resolutionX; x++)
+                    CalculateResamplingWeights(oldResolutionZ, parameters.resolutionZ, z, out int oldZLow, out int oldZHigh, out float oldZLowWeight, out float oldZHighWeight);
+
+                    for (int y = 0; y < parameters.resolutionY; y++)
                     {
-                        CalculateResamplingWeights(oldResolutionX, parameters.resolutionX, x, out int oldXLow, out int oldXHigh, out float oldXLowWeight, out float oldXHighWeight);
-                        
-                        MaskVolumePayload.Resample(ref oldPayload,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYLow, oldZLow), oldXLowWeight * oldYLowWeight * oldZLowWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYLow, oldZLow), oldXHighWeight * oldYLowWeight * oldZLowWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYHigh, oldZLow), oldXLowWeight * oldYHighWeight * oldZLowWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYHigh, oldZLow), oldXHighWeight * oldYHighWeight * oldZLowWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYLow, oldZHigh), oldXLowWeight * oldYLowWeight * oldZHighWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYLow, oldZHigh), oldXHighWeight * oldYLowWeight * oldZHighWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYHigh, oldZHigh), oldXLowWeight * oldYHighWeight * oldZHighWeight,
-                            PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYHigh, oldZHigh), oldXHighWeight * oldYHighWeight * oldZHighWeight,
-                            ref newPayload,
-                            PayloadIndex(parameters.resolutionX, parameters.resolutionY, x, y, z));
+                        CalculateResamplingWeights(oldResolutionY, parameters.resolutionY, y, out int oldYLow, out int oldYHigh, out float oldYLowWeight, out float oldYHighWeight);
+
+                        for (int x = 0; x < parameters.resolutionX; x++)
+                        {
+                            CalculateResamplingWeights(oldResolutionX, parameters.resolutionX, x, out int oldXLow, out int oldXHigh, out float oldXLowWeight, out float oldXHighWeight);
+
+                            MaskVolumePayload.Resample(ref oldPayload,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYLow, oldZLow), oldXLowWeight * oldYLowWeight * oldZLowWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYLow, oldZLow), oldXHighWeight * oldYLowWeight * oldZLowWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYHigh, oldZLow), oldXLowWeight * oldYHighWeight * oldZLowWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYHigh, oldZLow), oldXHighWeight * oldYHighWeight * oldZLowWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYLow, oldZHigh), oldXLowWeight * oldYLowWeight * oldZHighWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYLow, oldZHigh), oldXHighWeight * oldYLowWeight * oldZHighWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXLow, oldYHigh, oldZHigh), oldXLowWeight * oldYHighWeight * oldZHighWeight,
+                                PayloadIndex(oldResolutionX, oldResolutionY, oldXHigh, oldYHigh, oldZHigh), oldXHighWeight * oldYHighWeight * oldZHighWeight,
+                                ref newPayload,
+                                PayloadIndex(parameters.resolutionX, parameters.resolutionY, x, y, z));
+                        }
                     }
                 }
+
+                ReleaseFromAtlas(this);
             }
-             
-            ReleaseFromAtlas(this);
 
+            maskVolumeAsset.instanceID = GetID();
             maskVolumeAsset.resolutionX = parameters.resolutionX;
             maskVolumeAsset.resolutionY = parameters.resolutionY;
             maskVolumeAsset.resolutionZ = parameters.resolutionZ;
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolumeAsset.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolumeAsset.cs
@@ -31,7 +31,7 @@ internal enum AssetVersion
 
         internal bool IsDataAssigned()
         {
-            return !MaskVolumePayload.IsNull(ref payload) && (MaskVolumePayload.GetLength(ref payload) > 0);
+            return !MaskVolumePayload.IsEmpty(ref payload);
         }
 
 #if UNITY_EDITOR
@@ -76,12 +76,10 @@ internal static string GetFileName(int id = -1)
 
         internal static MaskVolumeAsset CreateAsset(int id = -1)
         {
-            MaskVolumeAsset asset = ScriptableObject.CreateInstance<MaskVolumeAsset>();
+            MaskVolumeAsset asset = CreateInstance<MaskVolumeAsset>();
             string assetFileName = GetFileName(id);
 
             UnityEditor.AssetDatabase.CreateAsset(asset, assetFileName);
-            UnityEditor.AssetDatabase.SaveAssets();
-            UnityEditor.AssetDatabase.Refresh();
 
             return asset;
         }
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolumeRendering.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/MaskVolume/MaskVolumeRendering.cs
@@ -261,7 +261,7 @@ internal bool EnsureMaskVolumeInAtlas(ScriptableRenderContext renderContext, Com
                 {
                     MaskVolumePayload payload = volume.GetPayload();
 
-                    if (MaskVolumePayload.IsNull(ref payload))
+                    if (MaskVolumePayload.IsEmpty(ref payload))
                     {
                         ReleaseMaskVolumeFromAtlas(volume);
                         return false;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ internal enum AssetVersion`
`31`	`31`
`32`	`32`	`internal bool IsDataAssigned()`
`33`	`33`	`{`
`34`		`- return !MaskVolumePayload.IsNull(ref payload) && (MaskVolumePayload.GetLength(ref payload) > 0);`
	`34`	`+ return !MaskVolumePayload.IsEmpty(ref payload);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#if UNITY_EDITOR`
`@@ -76,12 +76,10 @@ internal static string GetFileName(int id = -1)`
`76`	`76`
`77`	`77`	`internal static MaskVolumeAsset CreateAsset(int id = -1)`
`78`	`78`	`{`
`79`		`- MaskVolumeAsset asset = ScriptableObject.CreateInstance<MaskVolumeAsset>();`
	`79`	`+ MaskVolumeAsset asset = CreateInstance<MaskVolumeAsset>();`
`80`	`80`	`string assetFileName = GetFileName(id);`
`81`	`81`
`82`	`82`	`UnityEditor.AssetDatabase.CreateAsset(asset, assetFileName);`
`83`		`- UnityEditor.AssetDatabase.SaveAssets();`
`84`		`- UnityEditor.AssetDatabase.Refresh();`
`85`	`83`
`86`	`84`	`return asset;`
`87`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ internal bool EnsureMaskVolumeInAtlas(ScriptableRenderContext renderContext, Com`
`261`	`261`	`{`
`262`	`262`	`MaskVolumePayload payload = volume.GetPayload();`
`263`	`263`
`264`		`- if (MaskVolumePayload.IsNull(ref payload))`
	`264`	`+ if (MaskVolumePayload.IsEmpty(ref payload))`
`265`	`265`	`{`
`266`	`266`	`ReleaseMaskVolumeFromAtlas(volume);`
`267`	`267`	`return false;`