Skip to content

Commit

Permalink
Merge branch 'head_unity2019'
Browse files Browse the repository at this point in the history
  • Loading branch information
@whiteflare
whiteflare committed Nov 5, 2023
2 parents 673cff9 + 00cf408 commit eb55437
Show file tree
Hide file tree
Showing 81 changed files with 168 additions and 174 deletions.
6 changes: 0 additions & 6 deletions Editor/WF_MaterialConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,6 @@ protected static List<Action<SelectShaderContext>> CreateConverterList()
PropertyNameReplacement.Match("_NormalMap", "_BumpMap"));
if (HasNewPropertyValue(ctx, "_BumpMap")) {
WFAccessor.SetBool(ctx.target, "_NM_Enable", true);
var _BumpScale = WFAccessor.GetFloat(ctx.target, "_BumpScale", 1);
if (_BumpScale < 0)
{
WFAccessor.SetFloat(ctx.target, "_BumpScale", Mathf.Abs(_BumpScale));
WFAccessor.SetInt(ctx.target, "_NM_InvConvex", 1);
}
}
},
ctx => {
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_DebugView.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Shader "UnlitWF/Debug/WF_DebugView" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_QuestSupported ("True", Float) = 0
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
}

SubShader {
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
}

SubShader {
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
}

SubShader {
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_Mix.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_FakeFur_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
4 changes: 2 additions & 2 deletions Shaders/Unlit_WF_Gem_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Shader "UnlitWF/WF_Gem_Opaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0

Expand Down Expand Up @@ -125,7 +125,7 @@ Shader "UnlitWF/WF_Gem_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
4 changes: 2 additions & 2 deletions Shaders/Unlit_WF_Gem_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Shader "UnlitWF/WF_Gem_Transparent" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0

Expand Down Expand Up @@ -154,7 +154,7 @@ Shader "UnlitWF/WF_Gem_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_Grass_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Shader "UnlitWF/WF_Grass_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_QuestSupported ("True", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Addition.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Addition" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -45,7 +45,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Addition" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -158,7 +158,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Addition" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_Category ("BRP|UnToon|Custom/ClearCoat|Addition", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -76,7 +76,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -352,7 +352,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_ClearCoat_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -87,7 +87,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -363,7 +363,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_TransCutout", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_ClearCoat_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -88,7 +88,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -371,7 +371,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_ClearCoat_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_ClearBgSupported ("True", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_GhostOpaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -73,7 +73,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -337,7 +337,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostOpaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_GhostTransparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -80,7 +80,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -350,7 +350,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_GhostTransparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Transparent", Float) = 0
Expand Down
2 changes: 1 addition & 1 deletion Shaders/Unlit_WF_UnToon_Custom_LameOnly_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_LameOnly_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_Category ("BRP|UnToon|Custom/LameOnly|Transparent", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_Mirror_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -74,7 +74,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -349,7 +349,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_MirrorControl_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_OffsetOutline_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -86,7 +86,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -350,7 +350,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_OffsetOutline_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down
6 changes: 3 additions & 3 deletions Shaders/Unlit_WF_UnToon_Custom_PowerCap_Outline_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" {
_BumpMap ("[NM] NormalMap Texture", 2D) = "bump" {}
[ToggleUI]
_NM_InvConvex ("[NM] Use DirectX NormalMap", Float) = 0
_BumpScale ("[NM] Bump Scale", Range(0, 2)) = 1.0
_BumpScale ("[NM] Bump Scale", Range(-1, 2)) = 1.0
_NM_Power ("[NM] Shadow Power", Range(0, 1)) = 0.25
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0
Expand All @@ -85,7 +85,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" {
[Enum(UV1,0,UV2,1)]
_NS_UVType ("[NS] 2nd Normal UV Type", Float) = 0
_DetailNormalMap ("[NS] 2nd NormalMap Texture", 2D) = "bump" {}
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(0, 2)) = 0.4
_DetailNormalMapScale ("[NS] 2nd Bump Scale", Range(-1, 2)) = 0.4
[NoScaleOffset]
_NS_2ndMaskTex ("[NS] 2nd NormalMap Mask Texture (R)", 2D) = "white" {}
[ToggleUI]
Expand Down Expand Up @@ -415,7 +415,7 @@ Shader "UnlitWF/Custom/WF_UnToon_Custom_PowerCap_Outline_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/11/05 (1.6.0)", Float) = 0
_CurrentVersion ("2023/11/06 (1.6.1)", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Outline_Opaque", Float) = 0
Expand Down
Loading

0 comments on commit eb55437

Please sign in to comment.