Fix: (#246)

The converter ignores custom render queue in Unitychan Toon Shader ver 2 materials.

Author: H3idi-X

com.unity.toonshader/CHANGELOG.md

@@ -1,10 +1,11 @@
 # Changelog
-## [0.8.2-preview] - 2022-09-08
+## [0.8.2-preview] - 2022-09-09
 ### Updated:
 * Updated some documents.
 
 ### Fixed:
 * Deleted some warinings.
+* The converter ignores custom render queue in Unitychan Toon Shader ver 2 materials.
 * The converter sometimes misidentified materials older than 0.7.x in Built-in UTS3 as older materials in Unitychan Toon Shader Ver 2.0.7.
 * URP shader was not working for WebGL/GLES 3.0.
 

com.unity.toonshader/Editor/Converter/FromUTS2/BuiltInUTS2toIntegratedConverter.cs

@@ -381,6 +381,9 @@ void ConvertBuiltInUTS2Materials( string[] guids)
 
                 string path = AssetDatabase.GUIDToAssetPath(guid);
                 Material material = AssetDatabase.LoadAssetAtPath<Material>(path);
+                string content = File.ReadAllText(path);
+                string[] lines = content.Split(lineSeparators, StringSplitOptions.None);
+                int renderQueueInMaterial = GetRenderQueue(path, lines);
                 var shaderID = GetShaderIDinMaterial(path);
                 material.shader = Shader.Find(IsTesselationShader(path) ? kIntegratedTessllationUTS3Name :  kIntegratedUTS3Name);
                 var shaderGUID = m_Material2GUID_Dictionary[material];
@@ -394,7 +397,7 @@ void ConvertBuiltInUTS2Materials( string[] guids)
                 int stencilNo_Setting = UTS3GUI.MaterialGetInt(material, UTS3GUI.ShaderPropStencilNo);
 
                 var renderType = UTS2Info.m_renderType;
-                var renderQueue = UTS2Info.m_renderQueue;
+                var renderQueueInShader = UTS2Info.m_renderQueue;
                 material.SetOverrideTag(UTS2INFO.RENDERTYPE, renderType);
                 UTS3GUI.UTS_Mode technique = (UTS3GUI.UTS_Mode)UTS3GUI.MaterialGetInt(material, UTS3GUI.ShaderPropUtsTechniqe);
 
@@ -420,8 +423,8 @@ void ConvertBuiltInUTS2Materials( string[] guids)
                     UTS3GUI.SetupOutline(material);
                 }
                 SetCullingMode(material);
-
-                SetAutoRenderQueue(material, 1);
+                int autoRenderQueue = renderQueueInMaterial == -1 ? 1:0;
+                SetAutoRenderQueue(material, autoRenderQueue);
 
                 SetTranparent(material, transparencyEnabled);
 
@@ -434,9 +437,28 @@ void ConvertBuiltInUTS2Materials( string[] guids)
                 ApplyAngelRing(material);
                 ApplyMatCapMode(material);
 
-
-                ApplyQueueAndRenderType(material, technique, renderQueue, transparencyEnabled);
-
+                if (renderQueueInMaterial == -1)
+                {
+                    switch (renderQueueInShader)
+                    {
+                        case UTS2RenderQueue.None:
+                            material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Geometry;
+                            break;
+                        case UTS2RenderQueue.AlphaTest:
+                            material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest;
+                            break;
+                        case UTS2RenderQueue.AlphaTestMinus1:
+                            material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest - 1;
+                            break;
+                        case UTS2RenderQueue.Transparent:
+                            material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Transparent;
+                            break;
+                    }
+                }
+                else
+                {
+                    material.renderQueue = renderQueueInMaterial;
+                }
 
             }
             AssetDatabase.SaveAssets();
@@ -482,7 +504,6 @@ void SetCullingMode(Material material)
         void SetAutoRenderQueue(Material material, int autoRenderQueue)
         {
             UTS3GUI.MaterialSetInt(material, UTS3GUI.ShaderPropAutoRenderQueue, autoRenderQueue);
-            // material.renderQueue
         }
 
         void SetTranparent(Material material, UTS3GUI.UTS_TransparentMode transperentSetting)
@@ -549,41 +570,7 @@ private bool IsShadingGrademap(Material material)
             return UTS3GUI.MaterialGetInt(material, UTS3GUI.ShaderPropUtsTechniqe) == (int)UTS3GUI.UTS_Mode.ShadingGradeMap;
         }
 
-        void ApplyQueueAndRenderType(Material material, UTS3GUI.UTS_Mode technique, UTS2RenderQueue renderQueue,UTS3GUI.UTS_TransparentMode transperentSetting )
-        {
 
-
-
-
-            // var ignoreProjection = UTS2INFO.DONT_IGNOREPROJECTION;
-
-            if (transperentSetting == UTS3GUI.UTS_TransparentMode.On)
-            {
-
-               // ignoreProjection = UTS2INFO.DO_IGNOREPROJECTION;
-            }
-            else
-            {
-
-            }
-            //            material.SetOverrideTag(UTS2INFO.IGNOREPROJECTION, ignoreProjection);
-            switch (renderQueue)
-            {
-                case UTS2RenderQueue.None:
-                    material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Geometry;
-                    break;
-                case UTS2RenderQueue.AlphaTest:
-                    material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest;
-                    break;
-                case UTS2RenderQueue.AlphaTestMinus1:
-                    material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.AlphaTest - 1;
-                    break;
-                case UTS2RenderQueue.Transparent:
-                    material.renderQueue = (int)UnityEngine.Rendering.RenderQueue.Transparent;
-                    break;
-            }
-
-        }
         void ApplyMatCapMode(Material material)
         {
             if (UTS3GUI.MaterialGetInt(material, UTS3GUI.ShaderPropClippingMode) == 0)

com.unity.toonshader/Editor/Converter/RenderPipelineConverterContainer.cs

@@ -201,7 +201,7 @@ protected void CommonConvert()
             AssetDatabase.Refresh();
         }
 
-        int GetRenderQueue( string path, string[] lines)
+        protected int GetRenderQueue( string path, string[] lines)
         {
             int renderQueue = -1;
             var targetLine = Array.Find<string>(lines, line => line.StartsWith("  m_CustomRenderQueue:"));