From 476fdc37744a8190741896af3d756f8c4fc3cef1 Mon Sep 17 00:00:00 2001 From: Misaki Date: Fri, 24 Jan 2025 11:55:44 +0900 Subject: [PATCH] Updated dependency --- Runtime/HDRP/Shaders/HDRPToon.shader | 28 +++++++++++++++++++++------- package.json | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Runtime/HDRP/Shaders/HDRPToon.shader b/Runtime/HDRP/Shaders/HDRPToon.shader index 968d8eb..03a86a9 100644 --- a/Runtime/HDRP/Shaders/HDRPToon.shader +++ b/Runtime/HDRP/Shaders/HDRPToon.shader @@ -24,8 +24,6 @@ Shader "HDRP/Toon" _HairBlendingMap("HairBlendingMap", 2D) = "black" {} - [KeywordEnum(Standard, FrontHair, Face, Eye)] _Material_Type("Material Type", int) = 0 - [KeywordEnum(Off, Standard, Anisotropy, Hair, Toon)] _PBR_Mode("PBR MODE", int) = 0 _Metallic("_Metallic", Range(0.0, 1.0)) = 0 _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5 _MaskMap("MaskMap", 2D) = "white" {} @@ -255,9 +253,29 @@ Shader "HDRP/Toon" [ToggleUI] _ReceivesSSAO("Receives SSAO", Float) = 1.0 _AO_Factor("_AO_Factor", Range(0.0, 1.0)) = 1 [ToggleUI] _ReceivesSSGI("Receives SSGI", Float) = 1.0 - _GI_Factor("_GI_Factor", Range(1.0, 10.0)) = 1 + _GI_Factor("_GI_Factor", Range(0.0, 1.0)) = 1 [ToggleUI] _AddPrecomputedVelocity("AddPrecomputedVelocity", Float) = 0.0 + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- + + // Surface Options + [Enum(Off, 0, On, 1)] _TransparentEnabled("Transparent Mode", int) = 0 + [ToggleUI] _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0 + _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5 + [Enum(Off, 0, FRONT, 1, BACK, 2)] _CullMode("Cull Mode", int) = 2 //OFF/FRONT/BACK + [KeywordEnum(Standard, FrontHair, Face, Eye)] _Material_Type("Material Type", int) = 0 + [KeywordEnum(Off, Standard, Anisotropy, Hair, Toon)] _PBR_Mode("PBR MODE", int) = 0 + [Toggle] _Receive_Hair_Shadow("ReceiveHairShadow", Float) = 0 + [ToggleUI] _HairBlendingTarget("HairBlendingTarget", Float) = 0 + + + [HideInInspector] _utsTechnique("Technique", int) = 0 //DWF [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1 @@ -267,7 +285,6 @@ Shader "HDRP/Toon" _StencilNo("Stencil No", Float) = 1 _StencilOpPass("Stencil Operation", Float) = 0 _StencilOpFail("Stencil Operation", Float) = 0 - [Enum(Off, 0, ON, 1)] _TransparentEnabled("Transparent Mode", int) = 0 // DoubleShadeWithFeather // 0:_IS_CLIPPING_OFF 1:_IS_CLIPPING_MODE 2:_IS_CLIPPING_TRANSMODE @@ -275,7 +292,6 @@ Shader "HDRP/Toon" // 0:_IS_TRANSCLIPPING_OFF 1:_IS_TRANSCLIPPING_ON [Enum(Off, 0, ON, 1, TRANSMODE, 2)] _ClippingMode("CliippingMode", int) = 0 - [Enum(Off, 0, FRONT, 1, BACK, 2)] _CullMode("Cull Mode", int) = 2 //OFF/FRONT/BACK [Enum(Off, 0, ONT, 1)] _ZWriteMode("ZWrite Mode", int) = 1 //OFF/ON [Enum(Off, 0, ONT, 1)] _ZOverDrawMode("ZOver Draw Mode", Float) = 0 //OFF/ON _SPRDefaultUnlitColorMask("SPRDefaultUnlit Path Color Mask", int) = 15 @@ -321,7 +337,6 @@ Shader "HDRP/Toon" // Hair Shadow [Toggle(_)] _Cast_Hair_Shadow("CastHairShadow", Float) = 0 - [Toggle] _Receive_Hair_Shadow("ReceiveHairShadow", Float) = 0 _ShadowBias("ShadowBias", Range(0.0, 5.0)) = 0.0 @@ -333,7 +348,6 @@ Shader "HDRP/Toon" _EyeParallaxAmount("EyeParallaxAmount", Float) = 0.1 // Eyebrow Seethrough - [Toggle(_)] _HairBlendingTarget("HairBlendingTarget", Float) = 0 _HairBlendingFactor("EyeBrowBlendingFactor", Float) = 0.5 //v.2.0.6 diff --git a/package.json b/package.json index 49d19c9..00fbd27 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "url": "https://git.personalnas.com/Misaki/com.misaki.hdrp-toon.git" }, "dependencies": { - "com.unity.render-pipelines.high-definition": "17.0.0" + "com.unity.render-pipelines.high-definition": "17.0.0", + "com.misaki.shader-gui": "1.0.0" } } \ No newline at end of file