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 Feb 25, 2023
2 parents 6c0f112 + 9db592e commit 89ecb8e
Show file tree
Hide file tree
Showing 158 changed files with 2,125 additions and 150 deletions.
15 changes: 15 additions & 0 deletions Editor/WF_Dictionary.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,14 @@ internal static class WFShaderDictionary

new WFShaderName("URP", "Gem", "Basic", "Opaque", "UnlitWF_URP/WF_Gem_Opaque"),
new WFShaderName("URP", "Gem", "Basic", "Transparent", "UnlitWF_URP/WF_Gem_Transparent", represent: true),

// ================
// Water 系列(URP)
// ================

new WFShaderName("URP", "Water", "Surface", "Opaque", "UnlitWF_URP/WF_Water_Surface_Opaque", represent: true),
new WFShaderName("URP", "Water", "Surface", "TransCutout", "UnlitWF_URP/WF_Water_Surface_TransCutout"),
new WFShaderName("URP", "Water", "Surface", "Transparent", "UnlitWF_URP/WF_Water_Surface_Transparent"),
};

private static bool HasPropertyPrefix(Material mat, string prefix)
Expand Down Expand Up @@ -310,6 +318,7 @@ private static bool HasPropertyPrefix(Material mat, string prefix)
new WFI18NTranslation("Color Change", "色変更"),
new WFI18NTranslation("Detail NormalMap", "ディテールノーマルマップ"),
new WFI18NTranslation("Distance Fade", "距離フェード"),
new WFI18NTranslation("Dissolve", "ディゾルブ"),
new WFI18NTranslation("Emission", "エミッション"),
new WFI18NTranslation("Fake Fur", "ファー"),
new WFI18NTranslation("Fog", "フォグ"),
Expand Down Expand Up @@ -522,6 +531,12 @@ private static bool HasPropertyPrefix(Material mat, string prefix)
new WFI18NTranslation("DFD", "Fade Distance (Far)", "フェード距離 (Far)"),
new WFI18NTranslation("DFD", "Power", "強度"),
new WFI18NTranslation("DFD", "BackFace Shadow", "裏面は影にする"),
// Dissolve
new WFI18NTranslation("DSV", "Dissolve", "ディゾルブ"),
new WFI18NTranslation("DSV", "Invert", "反転"),
new WFI18NTranslation("DSV", "Control Texture (R)", "制御テクスチャ (R)"),
new WFI18NTranslation("DSV", "Spark Color", "スパーク色"),
new WFI18NTranslation("DSV", "Spark Width", "スパーク幅"),
// Toon Fog
new WFI18NTranslation("TFG", "Color", "フォグの色"),
new WFI18NTranslation("TFG", "Exponential", "変化の鋭さ"),
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/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_QuestSupported ("True", Float) = 0
Expand Down
18 changes: 17 additions & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_Mix.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -130,7 +143,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
}

SubShader {
Expand All @@ -147,6 +160,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {
Tags { "LightMode" = "ForwardBase" }

Cull OFF
Blend One Zero, One OneMinusSrcAlpha
AlphaToMask [_AL_AlphaToMask]

CGPROGRAM
Expand All @@ -160,6 +174,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down Expand Up @@ -190,6 +205,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Mix" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#define _FUR_HEIGHT_PARAM _FUR_Height2
#define _FUR_REPEAT_PARAM _FUR_Repeat2
Expand Down
17 changes: 16 additions & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -126,7 +139,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
}

SubShader {
Expand All @@ -143,6 +156,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" {
Tags { "LightMode" = "ForwardBase" }

Cull OFF
Blend One Zero, One OneMinusSrcAlpha
AlphaToMask [_AL_AlphaToMask]

CGPROGRAM
Expand All @@ -156,6 +170,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_TransCutout" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down
16 changes: 15 additions & 1 deletion Shaders/Unlit_WF_FakeFur_FurOnly_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,19 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Transparent" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -123,7 +136,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
}

SubShader {
Expand Down Expand Up @@ -154,6 +167,7 @@ Shader "UnlitWF/WF_FakeFur_FurOnly_Transparent" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down
20 changes: 18 additions & 2 deletions Shaders/Unlit_WF_FakeFur_Mix.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,19 @@ Shader "UnlitWF/WF_FakeFur_Mix" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -181,7 +194,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down Expand Up @@ -216,9 +229,9 @@ Shader "UnlitWF/WF_FakeFur_Mix" {
#pragma shader_feature_local_fragment _HL_ENABLE_1
#pragma shader_feature_local_fragment _TR_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma multi_compile_fwdbase
#pragma multi_compile_fog
#pragma multi_compile_instancing
#pragma multi_compile _ LOD_FADE_CROSSFADE

Expand All @@ -232,6 +245,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" {
Tags { "LightMode" = "ForwardBase" }

Cull OFF
Blend One Zero, One OneMinusSrcAlpha
AlphaToMask [_AL_AlphaToMask]

CGPROGRAM
Expand All @@ -245,6 +259,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down Expand Up @@ -275,6 +290,7 @@ Shader "UnlitWF/WF_FakeFur_Mix" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#define _FUR_HEIGHT_PARAM _FUR_Height2
#define _FUR_REPEAT_PARAM _FUR_Repeat2
Expand Down
19 changes: 17 additions & 2 deletions Shaders/Unlit_WF_FakeFur_TransCutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,19 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -177,7 +190,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down Expand Up @@ -212,9 +225,9 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
#pragma shader_feature_local_fragment _HL_ENABLE_1
#pragma shader_feature_local_fragment _TR_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma multi_compile_fwdbase
#pragma multi_compile_fog
#pragma multi_compile_instancing
#pragma multi_compile _ LOD_FADE_CROSSFADE

Expand All @@ -228,6 +241,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
Tags { "LightMode" = "ForwardBase" }

Cull OFF
Blend One Zero, One OneMinusSrcAlpha
AlphaToMask [_AL_AlphaToMask]

CGPROGRAM
Expand All @@ -241,6 +255,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down
18 changes: 16 additions & 2 deletions Shaders/Unlit_WF_FakeFur_Transparent.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,19 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
[ToggleUI]
_DFD_BackShadow ("[DFD] BackFace Shadow", Float) = 1

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -174,7 +187,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down Expand Up @@ -209,9 +222,9 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
#pragma shader_feature_local_fragment _HL_ENABLE_1
#pragma shader_feature_local_fragment _TR_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma multi_compile_fwdbase
#pragma multi_compile_fog
#pragma multi_compile_instancing
#pragma multi_compile _ LOD_FADE_CROSSFADE

Expand Down Expand Up @@ -239,6 +252,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
#pragma shader_feature_local_fragment _ _TS_STEP1_ENABLE _TS_STEP2_ENABLE _TS_STEP3_ENABLE
#pragma shader_feature_local_fragment _CLC_ENABLE
#pragma shader_feature_local_fragment _DFD_ENABLE
#pragma shader_feature_local_fragment _DSV_ENABLE

#pragma target 5.0
#pragma multi_compile_fwdbase
Expand Down
16 changes: 15 additions & 1 deletion Shaders/Unlit_WF_Gem_Opaque.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ Shader "UnlitWF/WF_Gem_Opaque" {
[Enum(NONE,0,X,1,Y,2,XY,3)]
_FlipMirror ("[NM] Flip Mirror", Float) = 0

// Dissolve
[WFHeaderToggle(Dissolve)]
_DSV_Enable ("[DSV] Enable", Float) = 0
_DSV_Dissolve ("[DSV] Dissolve", Range(0, 1)) = 1.0
[ToggleUI]
_DSV_Invert ("[DSV] Invert", Range(0, 1)) = 0
_DSV_CtrlTex ("[DSV] Control Texture (R)", 2D) = "black" {}
[ToggleUI]
_DSV_TexIsSRGB ("[DSV] sRGB", Range(0, 1)) = 1
[HDR]
_DSV_SparkColor ("[DSV] Spark Color", Color) = (1, 1, 1, 1)
_DSV_SparkWidth ("[DSV] Spark Width", Range(0, 0.2)) = 0

// Lit
[WFHeader(Lit)]
[Gamma]
Expand All @@ -81,7 +94,7 @@ Shader "UnlitWF/WF_Gem_Opaque" {

[HideInInspector]
[WF_FixFloat(0.0)]
_CurrentVersion ("2023/02/04", Float) = 0
_CurrentVersion ("2023/02/25", Float) = 0
[HideInInspector]
[WF_FixFloat(0.0)]
_FallBack ("UnlitWF/UnToon_Mobile/WF_UnToon_Mobile_Opaque", Float) = 0
Expand Down Expand Up @@ -115,6 +128,7 @@ Shader "UnlitWF/WF_Gem_Opaque" {
#pragma shader_feature_local _ _GL_AUTO_ENABLE _GL_ONLYDIR_ENABLE _GL_ONLYPOINT_ENABLE _GL_WSDIR_ENABLE _GL_LSDIR_ENABLE _GL_WSPOS_ENABLE
#pragma shader_feature_local _NM_ENABLE
#pragma shader_feature_local _VC_ENABLE
#pragma shader_feature_local _DSV_ENABLE

#pragma multi_compile_fwdbase
#pragma multi_compile_fog
Expand Down
Loading

0 comments on commit 89ecb8e

Please sign in to comment.