Updated UTS2 v.2.0.7.5 / Release

Author: Nobuyuki-Kobayashi

Assets/Toon/Editor/UTS2GUI.cs

@@ -39,7 +39,6 @@ public enum _EmissiveMode{
         static float _UTS2VersionNumber = 2.075f; 
         //
         static int _StencilNo_Setting;
-        //static bool _HasOutline = true;
         static bool _OriginalInspector = false;
         static bool _SimpleUI = false; 
         //メッセージ表示用.
@@ -504,7 +503,6 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
             EditorGUILayout.Space();
 
             if(material.HasProperty("_OUTLINE")){
-                //_HasOutline = true;
                 _Outline_Foldout = Foldout(_Outline_Foldout, "【Outline Settings】");
                 if (_Outline_Foldout)
                 {
@@ -514,8 +512,6 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
                     EditorGUI.indentLevel--;
                 }
                 EditorGUILayout.Space();
-            //}else{
-                //_HasOutline = false;
             }
 
             if(material.HasProperty("_TessEdgeLength")){
@@ -818,13 +814,14 @@ void Set_Vrchat_Recommendation(Material material)
             if(material.HasProperty("_AngelRing")){//AngelRingがある場合.
                 material.SetFloat("_Is_LightColor_AR",1);
             }
+            if(material.HasProperty("_OUTLINE"))//OUTLINEがある場合.
+            {
+                material.SetFloat("_Is_LightColor_Outline",1);
+            }
             material.SetFloat("_Set_SystemShadowsToBase",1);
             material.SetFloat("_Is_Filter_HiCutPointLightColor",1);
             material.SetFloat("_CameraRolling_Stabilizer",1);
             material.SetFloat("_Is_Ortho",0);
-            // if(_HasOutline){
-            //     material.SetFloat("_Is_BlendBaseColor",1);
-            // }
             material.SetFloat("_GI_Intensity",0);
             material.SetFloat("_Unlit_Intensity",1);
             material.SetFloat("_Is_Filter_LightColor",1);
@@ -1853,6 +1850,24 @@ void GUI_LightColorContribution(Material material)
                 EditorGUILayout.EndHorizontal();
             }
 
+            if(material.HasProperty("_OUTLINE"))//OUTLINEがある場合.
+            {
+                EditorGUILayout.BeginHorizontal();
+                EditorGUILayout.PrefixLabel("Outline");
+                //GUILayout.Space(60);
+                    if(material.GetFloat("_Is_LightColor_Outline") == 0){
+                        if (GUILayout.Button("Off",shortButtonStyle))
+                        {
+                            material.SetFloat("_Is_LightColor_Outline",1);
+                        }
+                    }else{
+                        if (GUILayout.Button("Active",shortButtonStyle))
+                        {
+                            material.SetFloat("_Is_LightColor_Outline",0);
+                        }
+                    }
+                EditorGUILayout.EndHorizontal();
+            }
             EditorGUILayout.Space();
         }
 
@@ -1871,6 +1886,10 @@ void GUI_AdditionalLightingSettings(Material material)
                         material.SetFloat("_Is_LightColor_Base",1);
                         material.SetFloat("_Is_LightColor_1st_Shade",1);
                         material.SetFloat("_Is_LightColor_2nd_Shade",1);
+                        if(material.HasProperty("_OUTLINE"))//OUTLINEがある場合.
+                        {
+                            material.SetFloat("_Is_LightColor_Outline",1);
+                        }
                     }
                 }else{
                     if (GUILayout.Button("Active",shortButtonStyle))

Assets/Toon/Shader/README.txt

@@ -147,9 +147,9 @@ They will be useful for reference of the look and scene you want to make!
 
 -----
 ## 【Version】
-### 2019/05/20：2.0.7 Release：修正リリース版５  
+### 2019/05/22：2.0.7 Release：修正リリース版５  
 * 修正リリース版４を破棄し、新規に「アウトラインにZ-Offsetを指定した場合、鏡オブジェクトに映った像のアウトラインの表示不正」を修正しました。  
-* 従来はBase Colorと一緒になっていた、_Is_LightColor_Outlineを追加しました。カスタムGUIからは「LightColor Contribution to Materials」メニューからアクセスできます。  
+* アウトラインカラーへライトカラーを反応させる、"_Is_LightColor_Outline"を追加しました。カスタムGUIからは「LightColor Contribution to Materials」メニューから"Outline"ボタンを"Active"にすることで機能をONにすることができます。アウトラインの場合、ライトカラーへの反応はいくつか仕様上の制約がありますので、詳しくはマニュアルを参照してください。  
 
 ### 2019/05/15：2.0.7 Release：修正リリース版４  
 * アウトラインにZ-Offsetを指定した場合、鏡オブジェクトに映った像のアウトラインの表示不正の発生を緩和しました。  
@@ -183,9 +183,9 @@ They will be useful for reference of the look and scene you want to make!
 * 全てのバージョンのUnityで、鏡に映るMatCapの像とCamera Rolling Stabilizerが正しく機能するようになりました。  
 
 ---
-### 2019/05/20: 2.0.7 Release: Fixed release version 5
+### 2019/05/22: 2.0.7 Release: Fixed release version 5
 * Fixed Version 4 has been discarded and a new "the problem of incorrect display of the image outline reflected in the mirror object when Z-Offset is specified in the outline" has been corrected.  
-* Added _Is_LightColor_Outline, which was formerly with Base Color. You can access it from the "LightColor Contribution to Materials" menu from the custom GUI Inspctor.  
+* Added "_Is_LightColor_Outline" to make light color react to outline color. From the custom GUI, the function can be turned on by setting "Outline" button to "Active" from "LightColor Contribution to Materials" menu. In the case of the outline, there are some specification restrictions on the reaction to the light color, so please refer to the manual for details.  
 
 ### 2019/05/15: 2.0.7 Release: Fixed release version 4
 * When Z-Offset is specified for the outline, the problem of incorrect display of the outline of the image reflected in the mirror object has been alleviated.  
@@ -329,11 +329,11 @@ This function was developed based on the Issue #18 of ACiiL TwitterID: @__aciil'
 
 -----
 最新バージョン：2.0.7 Release：修正リリース版５  
-最終リリース日：2019/05/20  
+最終リリース日：2019/05/22  
 カテゴリー：3D  
 形式：zip/unitypackage  
 
 Latest Version: 2.0.7 Release: Fixed release version 5  
-Update: 2019/05/20  
+Update: 2019/05/22  
 Category: 3D  
 File format: zip/unitypackage  

Assets/Toon/Shader/Tess/UCTS_Outline_Tess.cginc

@@ -21,6 +21,7 @@
             //v.2.0.7.5
             uniform float _Unlit_Intensity;
             uniform fixed _Is_Filter_LightColor;
+            uniform fixed _Is_LightColor_Outline;
             //v.2.0.5
             uniform float4 _Color;
             uniform sampler2D _MainTex; uniform float4 _MainTex_ST;
@@ -114,31 +115,30 @@
                 //v.2.0.5
                 _Color = _BaseColor;
                 float4 objPos = mul ( unity_ObjectToWorld, float4(0,0,0,1) );
-                //v.2.0.7.5  
-                float3 defaultLightColor = saturate(max(half3(0.05,0.05,0.05),max(ShadeSH9(half4(0.0, 0.0, 0.0, 1.0)),ShadeSH9(half4(0.0, -1.0, 0.0, 1.0)).rgb)*_Unlit_Intensity));
-                float defaultLightColorIntensity = (0.299*defaultLightColor.r + 0.587*defaultLightColor.g + 0.114*defaultLightColor.b);
-                defaultLightColorIntensity = lerp(defaultLightColorIntensity, saturate(defaultLightColorIntensity), _Is_Filter_LightColor);
-                float3 lightColor = saturate(lerp(max(defaultLightColor,_LightColor0.rgb),max(defaultLightColor,saturate(_LightColor0.rgb)),_Is_Filter_LightColor));
-                float3 Unlit_LightColor_Level = saturate(float3(defaultLightColorIntensity,defaultLightColorIntensity,defaultLightColorIntensity)*_Unlit_Intensity*3);
-                lightColor = max(lightColor,Unlit_LightColor_Level);
+                //v.2.0.7.5
+                half3 ambientSkyColor = unity_AmbientSky.rgb>0.05 ? unity_AmbientSky.rgb*_Unlit_Intensity : half3(0.05,0.05,0.05)*_Unlit_Intensity;
+                float3 lightColor = _LightColor0.rgb >0.05 ? _LightColor0.rgb : ambientSkyColor.rgb;
+                float lightColorIntensity = (0.299*lightColor.r + 0.587*lightColor.g + 0.114*lightColor.b);
+                lightColor = lightColorIntensity<1 ? lightColor : lightColor/lightColorIntensity;
+                lightColor = lerp(half3(1.0,1.0,1.0), lightColor, _Is_LightColor_Outline);
                 float2 Set_UV0 = i.uv0;
                 float4 _MainTex_var = tex2D(_MainTex,TRANSFORM_TEX(Set_UV0, _MainTex));
                 float3 Set_BaseColor = _BaseColor.rgb*_MainTex_var.rgb;
-                float3 _Is_BlendBaseColor_var = lerp( _Outline_Color.rgb*lightColor, (_Outline_Color.rgb*Set_BaseColor*lightColor), _Is_BlendBaseColor );
+                float3 _Is_BlendBaseColor_var = lerp( _Outline_Color.rgb*lightColor, (_Outline_Color.rgb*Set_BaseColor*Set_BaseColor*lightColor), _Is_BlendBaseColor );
                 //
                 float3 _OutlineTex_var = tex2D(_OutlineTex,TRANSFORM_TEX(Set_UV0, _OutlineTex));
-//v.2.0.4
+//v.2.0.7.5
 #ifdef _IS_OUTLINE_CLIPPING_NO
-                float3 Set_Outline_Color = lerp(_Is_BlendBaseColor_var, _OutlineTex_var.rgb*_Is_BlendBaseColor_var, _Is_OutlineTex );
-                return fixed4(Set_Outline_Color,1.0);
+                float3 Set_Outline_Color = lerp(_Is_BlendBaseColor_var, _OutlineTex_var.rgb*_Outline_Color.rgb*lightColor, _Is_OutlineTex );
+                return float4(Set_Outline_Color,1.0);
 #elif _IS_OUTLINE_CLIPPING_YES
                 float4 _ClippingMask_var = tex2D(_ClippingMask,TRANSFORM_TEX(Set_UV0, _ClippingMask));
                 float Set_MainTexAlpha = _MainTex_var.a;
                 float _IsBaseMapAlphaAsClippingMask_var = lerp( _ClippingMask_var.r, Set_MainTexAlpha, _IsBaseMapAlphaAsClippingMask );
                 float _Inverse_Clipping_var = lerp( _IsBaseMapAlphaAsClippingMask_var, (1.0 - _IsBaseMapAlphaAsClippingMask_var), _Inverse_Clipping );
                 float Set_Clipping = saturate((_Inverse_Clipping_var+_Clipping_Level));
                 clip(Set_Clipping - 0.5);
-                float4 Set_Outline_Color = lerp( float4(_Is_BlendBaseColor_var,Set_Clipping), float4((_OutlineTex_var.rgb*_Is_BlendBaseColor_var),Set_Clipping), _Is_OutlineTex );
+                float4 Set_Outline_Color = lerp( float4(_Is_BlendBaseColor_var,Set_Clipping), float4((_OutlineTex_var.rgb*_Outline_Color.rgb*lightColor),Set_Clipping), _Is_OutlineTex );
                 return Set_Outline_Color;
 #endif
             }

Assets/Toon/Shader/UCTS_Outline.cginc

@@ -17,6 +17,7 @@
             //v.2.0.7.5
             uniform float _Unlit_Intensity;
             uniform fixed _Is_Filter_LightColor;
+            uniform fixed _Is_LightColor_Outline;
             //v.2.0.5
             uniform float4 _Color;
             uniform sampler2D _MainTex; uniform float4 _MainTex_ST;
@@ -97,31 +98,30 @@
                 //v.2.0.5
                 _Color = _BaseColor;
                 float4 objPos = mul ( unity_ObjectToWorld, float4(0,0,0,1) );
-                //v.2.0.7.5  
-                float3 defaultLightColor = saturate(max(half3(0.05,0.05,0.05),max(ShadeSH9(half4(0.0, 0.0, 0.0, 1.0)),ShadeSH9(half4(0.0, -1.0, 0.0, 1.0)).rgb)*_Unlit_Intensity));
-                float defaultLightColorIntensity = (0.299*defaultLightColor.r + 0.587*defaultLightColor.g + 0.114*defaultLightColor.b);
-                defaultLightColorIntensity = lerp(defaultLightColorIntensity, saturate(defaultLightColorIntensity), _Is_Filter_LightColor);
-                float3 lightColor = saturate(lerp(max(defaultLightColor,_LightColor0.rgb),max(defaultLightColor,saturate(_LightColor0.rgb)),_Is_Filter_LightColor));
-                float3 Unlit_LightColor_Level = saturate(float3(defaultLightColorIntensity,defaultLightColorIntensity,defaultLightColorIntensity)*_Unlit_Intensity*3);
-                lightColor = max(lightColor,Unlit_LightColor_Level);
+                //v.2.0.7.5
+                half3 ambientSkyColor = unity_AmbientSky.rgb>0.05 ? unity_AmbientSky.rgb*_Unlit_Intensity : half3(0.05,0.05,0.05)*_Unlit_Intensity;
+                float3 lightColor = _LightColor0.rgb >0.05 ? _LightColor0.rgb : ambientSkyColor.rgb;
+                float lightColorIntensity = (0.299*lightColor.r + 0.587*lightColor.g + 0.114*lightColor.b);
+                lightColor = lightColorIntensity<1 ? lightColor : lightColor/lightColorIntensity;
+                lightColor = lerp(half3(1.0,1.0,1.0), lightColor, _Is_LightColor_Outline);
                 float2 Set_UV0 = i.uv0;
                 float4 _MainTex_var = tex2D(_MainTex,TRANSFORM_TEX(Set_UV0, _MainTex));
                 float3 Set_BaseColor = _BaseColor.rgb*_MainTex_var.rgb;
-                float3 _Is_BlendBaseColor_var = lerp( _Outline_Color.rgb*lightColor, (_Outline_Color.rgb*Set_BaseColor*lightColor), _Is_BlendBaseColor );
+                float3 _Is_BlendBaseColor_var = lerp( _Outline_Color.rgb*lightColor, (_Outline_Color.rgb*Set_BaseColor*Set_BaseColor*lightColor), _Is_BlendBaseColor );
                 //
                 float3 _OutlineTex_var = tex2D(_OutlineTex,TRANSFORM_TEX(Set_UV0, _OutlineTex));
-//v.2.0.4
+//v.2.0.7.5
 #ifdef _IS_OUTLINE_CLIPPING_NO
-                float3 Set_Outline_Color = lerp(_Is_BlendBaseColor_var, _OutlineTex_var.rgb*_Is_BlendBaseColor_var, _Is_OutlineTex );
-                return fixed4(Set_Outline_Color,1.0);
+                float3 Set_Outline_Color = lerp(_Is_BlendBaseColor_var, _OutlineTex_var.rgb*_Outline_Color.rgb*lightColor, _Is_OutlineTex );
+                return float4(Set_Outline_Color,1.0);
 #elif _IS_OUTLINE_CLIPPING_YES
                 float4 _ClippingMask_var = tex2D(_ClippingMask,TRANSFORM_TEX(Set_UV0, _ClippingMask));
                 float Set_MainTexAlpha = _MainTex_var.a;
                 float _IsBaseMapAlphaAsClippingMask_var = lerp( _ClippingMask_var.r, Set_MainTexAlpha, _IsBaseMapAlphaAsClippingMask );
                 float _Inverse_Clipping_var = lerp( _IsBaseMapAlphaAsClippingMask_var, (1.0 - _IsBaseMapAlphaAsClippingMask_var), _Inverse_Clipping );
                 float Set_Clipping = saturate((_Inverse_Clipping_var+_Clipping_Level));
                 clip(Set_Clipping - 0.5);
-                float4 Set_Outline_Color = lerp( float4(_Is_BlendBaseColor_var,Set_Clipping), float4((_OutlineTex_var.rgb*_Is_BlendBaseColor_var),Set_Clipping), _Is_OutlineTex );
+                float4 Set_Outline_Color = lerp( float4(_Is_BlendBaseColor_var,Set_Clipping), float4((_OutlineTex_var.rgb*_Outline_Color.rgb*lightColor),Set_Clipping), _Is_OutlineTex );
                 return Set_Outline_Color;
 #endif
             }

Manual/UTS2_Manual_en.md

@@ -979,6 +979,7 @@ While actually using the character lights used in the scene, you can see in real
 | `Ap_RimLight` | Applies the light color to the Ap_RimLight Color. | _Is_LightColor_Ap_RimLight |
 | `MatCap` | Applies the light color to the MatCap Color. | _Is_LightColor_MatCap |
 | `AngelRing`  | Applies the light color to the AngelRing Color. | _Is_LightColor_AR |
+| `Outline`  | Applies the light color to the Outline Color. The contribution of the light color to the outline is: When "OFF", the color set for the outline color is displayed as it is. When "Active with 1 realtime directional light in the scene", the outline color responds to the color and brightness of the realtime directional light. When "There is no real-time directional light in the scene at the time of Active", the outline color responds to the color and brightness of Color in the Source of Environment Lighting. **At this time, please note that the value of Color is referenced even if you are using Skybox. In addition, please be careful as it does not react to ambient light other than real-time point light and color.** | _Is_LightColor_Outline |
 
 **※ Hint: Turning off any color switch will cause that color’s Light Intensity to be set to 1 with a light color of white, regardless of the strength of other lights in the environment.**  
 

Manual/UTS2_Manual_ja.md

@@ -974,6 +974,7 @@ Light版とあるものは、ライトをディレクショナルライト１灯
 | `Ap_RimLight` | APリムライト（対蹠リムライト）に対しライトカラーを有効にします。 | _Is_LightColor_Ap_RimLight |
 | `MatCap` | MatCapに対しライトカラーを有効にします。 | _Is_LightColor_MatCap |
 | `AngelRing` | 「天使の輪」に対しライトカラーを有効にします。 | _Is_LightColor_AR |
+| `Outline` | アウトラインに対しライトカラーを有効にします。アウトラインに対するライトカラーの寄与は次のとおりです。「OFF」の時、アウトラインカラーに設定したカラーがそのまま表示されます。「Activeの時でシーン中にリアルタイムディレクショナルライトが１灯ある」時、リアルタイムディレクショナルライトのカラーと明るさにアウトラインカラーが反応します。「Activeの時でシーン中にリアルタイムディレクショナルライトがない」時、Environment LightingのSourceの内、Colorの色と明るさにアウトラインカラーが反応します。**この時、Skyboxを使用していてもColorの値が参照されることに注意してください。またリアルタイムのポイントライトやColor以外の環境光には、反応しませんので合わせてご注意ください。**  | _Is_LightColor_Outline |
 
 ※ヒント：各カラーの設定が `Off` の場合、シーン内のライトの強さに関わらず、「オフにされたカラーは、常にライトのIntensityが１、ライトカラーが白の状態で照らされている状態」になります。  
 

Manual/UTS2_Props_en.md

@@ -239,6 +239,7 @@ These properties are common among UTS2’s high spec ShadingGradeMap shaders.
 | `Outline_Sampler`         | When you want to see the “start” and “end” of your outlines, or when you only want to outline certain parts, use the outline sampler (texture). The thickest width with white and the least thickest with white. |
 | `Outline_Color`           | Specifies the color of the outline.                          |
 | `Is_BlendBaseColor`       | Select this when you want to blend the color of the outline with the object’s base color. |
+| `Is_LightColor_Outline`  | Applies the light color to the Outline Color. The contribution of the light color to the outline is: When "OFF", the color set for the outline color is displayed as it is. When "Active with 1 realtime directional light in the scene", the outline color responds to the color and brightness of the realtime directional light. When "There is no real-time directional light in the scene at the time of Active", the outline color responds to the color and brightness of Color in the Source of Environment Lighting. **At this time, please note that the value of Color is referenced even if you are using Skybox. In addition, please be careful as it does not react to ambient light other than real-time point light and color.** |
 | `Is_OutlineTex`           | Turn it on when you want to paste texture to the inverted-outline object. |
 | `OutlineTex`              | Use this when you want the outline to have special textures. By changing the textures, you can give the outlines patterns, or make the outline unique by changing the texture of the inverted object which will be front-face culled. |
 | `Offset_Camera_Z`         | Offsets the outlines in direction Z. The outline will be less visible for the spikey parts in spikey hair if you input a positive value. For most cases, just set this to 0. |