Improve packer to properly handle folder inclusion

- Allow to set the texture array names (and path)
- Change default for height normalization to false
- Properly refresh unity asset DB on TA creation

Author: mgreter

Assets/Exporter Scripts/Editor/OcbMicroSplatArrayCreator.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using UnityEditor;
 using UnityEngine;
 
@@ -8,8 +9,7 @@ public static class OcbMicroSplatArrayCreator
     {
 
 
-        public static void CopyTextureAlbedo(OcbMicroSplatArrayEntry cfg,
-            Texture2DArray dst, int i, bool linear = true)
+        public static void CopyTextureAlbedo(OcbMicroSplatArrayEntry cfg, Texture2DArray dst, int i)
         {
 
             int Width = dst.width;
@@ -169,9 +169,12 @@ public static void CreateTextureArrays(OcbMicroSplatArray cfg, string path)
 
             var textures = cfg.Textures;
 
-            var DiffPath = path.Replace(".asset", "_diff_tarray.asset");
-            var NormPath = path.Replace(".asset", "_norm_tarray.asset");
-            var ShaoPath = path.Replace(".asset", "_shao_tarray.asset");
+            string root = Path.GetDirectoryName(path);
+            string fname = Path.GetFileName(path);
+
+            var DiffPath = Path.Combine(root, cfg.AlbedoTexArrName.Replace("{name}", fname.Replace(".asset", "")) + ".asset");
+            var NormPath = Path.Combine(root, cfg.NormTexArrName.Replace("{name}", fname.Replace(".asset", "")) + ".asset");
+            var ShaoPath = Path.Combine(root, cfg.SmaoTexArrName.Replace("{name}", fname.Replace(".asset", "")) + ".asset"); 
 
             var DiffArray = new Texture2DArray(Width, Height, textures.Length, TextureFormat.DXT5, true, false);
             var NormArray = new Texture2DArray(Width, Height, textures.Length, TextureFormat.DXT5, true, true);
@@ -243,9 +246,9 @@ public static void CreateTextureArrays(OcbMicroSplatArray cfg, string path)
                 // var height = texture.Height;
 
 
-                CopyTextureAlbedo(texture, DiffArray, i, false);
+                CopyTextureAlbedo(texture, DiffArray, i);
                 CopyTextureNormal(texture, NormArray, i);
-                CopyTextureSHAO(texture, ShaoArray, i, true);
+                CopyTextureSHAO(texture, ShaoArray, i);
 
                 // texture.Albedo = albedo;
                 // texture.Normal = normal;
@@ -258,6 +261,9 @@ public static void CreateTextureArrays(OcbMicroSplatArray cfg, string path)
             CreateArrayAsset(DiffArray, DiffPath);
             CreateArrayAsset(NormArray, NormPath);
             CreateArrayAsset(ShaoArray, ShaoPath);
+
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
         }
 
         static Shader mergeInChannelShader;

Assets/Exporter Scripts/Editor/OcbMicroSplatArrayEditor.cs

@@ -56,6 +56,10 @@ private void CollectAssets(UnityEngine.Object root,
             "128", "256", "512", "1024", "2048", "4096", "8128"
         };
 
+        static GUIContent diffLabel = new GUIContent("Diffues", "Albedo red, Albedo green, Albedo blue, height");
+        static GUIContent normLabel = new GUIContent("Normal", "Emission (r), normal (x), Emission(g), normal (y)");
+        static GUIContent shaoLabel = new GUIContent("SHAO", "Emission (b), smoothness, metallic, occlusion");
+
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
@@ -82,6 +86,19 @@ public override void OnInspectorGUI()
             script.AnisoLevel = EditorGUILayout.IntSlider(
                 "Aniso Level", script.AnisoLevel, 0, 16);
 
+            script.openTaNames = EditorGUILayout.Foldout(script.openTaNames, "Texture Array Names");
+
+            if (script.openTaNames)
+            {
+                script.AlbedoTexArrName = EditorGUILayout.TextField(diffLabel, script.AlbedoTexArrName);
+                script.NormTexArrName = EditorGUILayout.TextField(normLabel, script.NormTexArrName);
+                script.SmaoTexArrName = EditorGUILayout.TextField(shaoLabel, script.SmaoTexArrName);
+            }
+
+            GUI.enabled = script.Textures.All(t => t.Albedo != null); // && t.Normal != null
+            bool generate = GUILayout.Button("Generate Texture2D Array", GUILayout.Height(24));
+            GUI.enabled = true;
+
             // int clear = -1;
             // int remove = -1
 
@@ -235,18 +252,20 @@ public override void OnInspectorGUI()
             }
 
             GUI.enabled = script.Textures.All(t => t.Albedo != null); // && t.Normal != null
-            if (GUILayout.Button("Generate Texture2D Array", GUILayout.Height(24)))
-            {
-                string path = AssetDatabase.GetAssetPath(target).Replace("\\", "/");
-                OcbMicroSplatArrayCreator.CreateTextureArrays(script, path);
-            }
+            generate |= GUILayout.Button("Generate Texture2D Array", GUILayout.Height(24));
             GUI.enabled = true;
 
             if (EditorGUI.EndChangeCheck())
             {
                 EditorUtility.SetDirty(target);
             }
 
+            if (generate)
+            {
+                string path = AssetDatabase.GetAssetPath(target).Replace("\\", "/");
+                OcbMicroSplatArrayCreator.CreateTextureArrays(script, path);
+            }
+
         }
 
         // Recognized path tails for different textures

Assets/Exporter Scripts/Runtime/OcbMicroSplatArray.cs

@@ -29,6 +29,18 @@ public class OcbMicroSplatArray : ScriptableObject
         [HideInInspector]
         public OcbMicroSplatArrayEntry[] Textures = null;
 
+        [HideInInspector]
+        public bool openTaNames = false;
+
+        [HideInInspector]
+        public string AlbedoTexArrName = "{name}_ta_rgbh";
+
+        [HideInInspector]
+        public string NormTexArrName = "{name}_ta_enen";
+
+        [HideInInspector]
+        public string SmaoTexArrName = "{name}_ta_esmo";
+
     }
 
     [System.Serializable]
@@ -50,7 +62,7 @@ public class OcbMicroSplatArrayEntry
         public bool IsNormalSwitched = true;
         public bool IsNormalInverted = false;
         public bool IsHeightCentered = false;
-        public bool IsHeightNormalized = true;
+        public bool IsHeightNormalized = false;
         public TextureChannel HeightChannel = TextureChannel.Blue;
         public TextureChannel SmoothChannel = TextureChannel.Alpha;
         public TextureChannel OcclusionChannel = TextureChannel.Green;