Skip to content

Commit

Permalink
UTS v2.0.6 Releaseにアップデート
Browse files Browse the repository at this point in the history
  • Loading branch information
tomori_aki committed Mar 7, 2019
1 parent a851e1c commit db9f7f9
Show file tree
Hide file tree
Showing 6 changed files with 230 additions and 60 deletions.
25 changes: 19 additions & 6 deletions .../Assets/Toon/Shader/EmissiveScroll/ToonColor_DoubleShadeWithFeather_EmissiveScroll.shader
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
//Unitychan Toon Shader ver.2.0
//v.2.0.5
//v.2.0.6
//[email protected]
//https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project
//(C)Unity Technologies Japan/UCL
Shader "UnityChanToonShader/EmissiveScroll/NoOutline/ToonColor_DoubleShadeWithFeather" {
Properties {
[HideInInspector] _simpleUI ("SimpleUI", Int ) = 0
[HideInInspector] _utsVersion ("Version", Float ) = 2.06
[HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
[Enum(OFF,0,FRONT,1,BACK,2)] _CullMode("Cull Mode", int) = 2 //OFF/FRONT/BACK
_MainTex ("BaseMap", 2D) = "white" {}
_BaseColor ("BaseColor", Color) = (1,1,1,1)
Expand All @@ -24,14 +27,20 @@ Shader "UnityChanToonShader/EmissiveScroll/NoOutline/ToonColor_DoubleShadeWithFe
_2nd_ShadeColor ("2nd_ShadeColor", Color) = (1,1,1,1)
[MaterialToggle] _Is_LightColor_2nd_Shade ("Is_LightColor_2nd_Shade", Float ) = 1
_NormalMap ("NormalMap", 2D) = "bump" {}
_BumpScale ("Normal Scale", Range(0, 1)) = 1
[MaterialToggle] _Is_NormalMapToBase ("Is_NormalMapToBase", Float ) = 0
//v.2.0.4.4
[MaterialToggle] _Set_SystemShadowsToBase ("Set_SystemShadowsToBase", Float ) = 1
_Tweak_SystemShadowsLevel ("Tweak_SystemShadowsLevel", Range(-0.5, 0.5)) = 0
//v.2.0.6
_BaseColor_Step ("BaseColor_Step", Range(0, 1)) = 0.5
_BaseShade_Feather ("Base/Shade_Feather", Range(0.0001, 1)) = 0.0001
_ShadeColor_Step ("ShadeColor_Step", Range(0, 1)) = 0
_1st2nd_Shades_Feather ("1st/2nd_Shades_Feather", Range(0.0001, 1)) = 0.0001
[HideInInspector] _1st_ShadeColor_Step ("1st_ShadeColor_Step", Range(0, 1)) = 0.5
[HideInInspector] _1st_ShadeColor_Feather ("1st_ShadeColor_Feather", Range(0.0001, 1)) = 0.0001
[HideInInspector] _2nd_ShadeColor_Step ("2nd_ShadeColor_Step", Range(0, 1)) = 0
[HideInInspector] _2nd_ShadeColor_Feather ("2nd_ShadeColor_Feather", Range(0.0001, 1)) = 0.0001
//v.2.0.5
_StepOffset ("Step_Offset (ForwardAdd Only)", Range(-0.5, 0.5)) = 0
[MaterialToggle] _Is_Filter_HiCutPointLightColor ("PointLights HiCut_Filter (ForwardAdd Only)", Float ) = 1
Expand Down Expand Up @@ -73,22 +82,27 @@ Shader "UnityChanToonShader/EmissiveScroll/NoOutline/ToonColor_DoubleShadeWithFe
//ここまで.
[MaterialToggle] _MatCap ("MatCap", Float ) = 0
_MatCap_Sampler ("MatCap_Sampler", 2D) = "black" {}
//v.2.0.6
_BlurLevelMatcap ("Blur Level of MatCap_Sampler", Range(0, 10)) = 0
_MatCapColor ("MatCapColor", Color) = (1,1,1,1)
[MaterialToggle] _Is_LightColor_MatCap ("Is_LightColor_MatCap", Float ) = 1
[MaterialToggle] _Is_BlendAddToMatCap ("Is_BlendAddToMatCap", Float ) = 1
_Tweak_MatCapUV ("Tweak_MatCapUV", Range(-0.5, 0.5)) = 0
_Rotate_MatCapUV ("Rotate_MatCapUV", Range(-1, 1)) = 0
//v.2.0.6
[MaterialToggle] _CameraRolling_Stabilizer ("Activate CameraRolling_Stabilizer", Float ) = 0
[MaterialToggle] _Is_NormalMapForMatCap ("Is_NormalMapForMatCap", Float ) = 0
_NormalMapForMatCap ("NormalMapForMatCap", 2D) = "bump" {}
_BumpScaleMatcap ("Scale for NormalMapforMatCap", Range(0, 1)) = 1
_Rotate_NormalMapForMatCapUV ("Rotate_NormalMapForMatCapUV", Range(-1, 1)) = 0
[MaterialToggle] _Is_UseTweakMatCapOnShadow ("Is_UseTweakMatCapOnShadow", Float ) = 0
_TweakMatCapOnShadow ("TweakMatCapOnShadow", Range(0, 1)) = 0
//MatcapMask
_Set_MatcapMask ("Set_MatcapMask", 2D) = "white" {}
_Tweak_MatcapMaskLevel ("Tweak_MatcapMaskLevel", Range(-1, 1)) = 0
[MaterialToggle] _Inverse_MatcapMask ("Inverse_MatcapMask", Float ) = 0
//v.2.0.5
[MaterialToggle] _Is_Ortho ("Orthographic Projection for MatCap", Float ) = 0
//
[MaterialToggle] _Is_Ortho ("Orthographic Projection for MatCap", Float ) = 0
//v.2.0.4 Emissive
_Emissive_Tex ("Emissive_Tex", 2D) = "white" {}
[HDR]_Emissive_Color ("Emissive_Color", Color) = (0,0,0,1)
Expand All @@ -104,11 +118,9 @@ Shader "UnityChanToonShader/EmissiveScroll/NoOutline/ToonColor_DoubleShadeWithFe
//GI
_GI_Intensity ("GI_Intensity", Range(0, 1)) = 0
//For VR Chat under No effective light objects
_Unlit_Intensity ("Unlit_Intensity", Range(0.001, 2)) = 1
_Unlit_Intensity ("Unlit_Intensity", Range(0.001, 4)) = 1
//v.2.0.5
[MaterialToggle] _Is_Filter_LightColor ("VRChat : SceneLights HiCut_Filter", Float ) = 0
//This advanced option compensates the color of point lights when SceneLights HiCut_Filter is checked.
[HideInInspector] _ColorBoost (" *Advanced Option : Compensation Boost", Range(1, 5)) = 1
//Built-in Light Direction
[MaterialToggle] _Is_BLD ("Advanced : Activate Built-in Light Direction", Float ) = 0
_Offset_X_Axis_BLD (" Offset X-Axis (Built-in Light Direction)", Range(-1, 1)) = -0.05
Expand All @@ -125,4 +137,5 @@ Shader "UnityChanToonShader/EmissiveScroll/NoOutline/ToonColor_DoubleShadeWithFe
UsePass "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather/SHADOWCASTER"
}
FallBack "Legacy Shaders/VertexLit"
CustomEditor "UnityChan.UTS2EmissiveScrollGUI"
}
29 changes: 21 additions & 8 deletions ...croll/Assets/Toon/Shader/EmissiveScroll/Toon_DoubleShadeWithFeather_EmissiveScroll.shader
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
//Unitychan Toon Shader ver.2.0
//v.2.0.5
//v.2.0.6
//[email protected]
//https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project
//(C)Unity Technologies Japan/UCL
Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
Properties {
[HideInInspector] _simpleUI ("SimpleUI", Int ) = 0
[HideInInspector] _utsVersion ("Version", Float ) = 2.06
[HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
[Enum(OFF,0,FRONT,1,BACK,2)] _CullMode("Cull Mode", int) = 2 //OFF/FRONT/BACK
_MainTex ("BaseMap", 2D) = "white" {}
_BaseColor ("BaseColor", Color) = (1,1,1,1)
Expand All @@ -24,14 +27,20 @@ Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
_2nd_ShadeColor ("2nd_ShadeColor", Color) = (1,1,1,1)
[MaterialToggle] _Is_LightColor_2nd_Shade ("Is_LightColor_2nd_Shade", Float ) = 1
_NormalMap ("NormalMap", 2D) = "bump" {}
_BumpScale ("Normal Scale", Range(0, 1)) = 1
[MaterialToggle] _Is_NormalMapToBase ("Is_NormalMapToBase", Float ) = 0
//v.2.0.4.4
[MaterialToggle] _Set_SystemShadowsToBase ("Set_SystemShadowsToBase", Float ) = 1
_Tweak_SystemShadowsLevel ("Tweak_SystemShadowsLevel", Range(-0.5, 0.5)) = 0
//v.2.0.6
_BaseColor_Step ("BaseColor_Step", Range(0, 1)) = 0.5
_BaseShade_Feather ("Base/Shade_Feather", Range(0.0001, 1)) = 0.0001
_ShadeColor_Step ("ShadeColor_Step", Range(0, 1)) = 0
_1st2nd_Shades_Feather ("1st/2nd_Shades_Feather", Range(0.0001, 1)) = 0.0001
[HideInInspector] _1st_ShadeColor_Step ("1st_ShadeColor_Step", Range(0, 1)) = 0.5
[HideInInspector] _1st_ShadeColor_Feather ("1st_ShadeColor_Feather", Range(0.0001, 1)) = 0.0001
[HideInInspector] _2nd_ShadeColor_Step ("2nd_ShadeColor_Step", Range(0, 1)) = 0
[HideInInspector] _2nd_ShadeColor_Feather ("2nd_ShadeColor_Feather", Range(0.0001, 1)) = 0.0001
//v.2.0.5
_StepOffset ("Step_Offset (ForwardAdd Only)", Range(-0.5, 0.5)) = 0
[MaterialToggle] _Is_Filter_HiCutPointLightColor ("PointLights HiCut_Filter (ForwardAdd Only)", Float ) = 1
Expand Down Expand Up @@ -73,22 +82,27 @@ Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
//ここまで.
[MaterialToggle] _MatCap ("MatCap", Float ) = 0
_MatCap_Sampler ("MatCap_Sampler", 2D) = "black" {}
//v.2.0.6
_BlurLevelMatcap ("Blur Level of MatCap_Sampler", Range(0, 10)) = 0
_MatCapColor ("MatCapColor", Color) = (1,1,1,1)
[MaterialToggle] _Is_LightColor_MatCap ("Is_LightColor_MatCap", Float ) = 1
[MaterialToggle] _Is_BlendAddToMatCap ("Is_BlendAddToMatCap", Float ) = 1
_Tweak_MatCapUV ("Tweak_MatCapUV", Range(-0.5, 0.5)) = 0
_Rotate_MatCapUV ("Rotate_MatCapUV", Range(-1, 1)) = 0
//v.2.0.6
[MaterialToggle] _CameraRolling_Stabilizer ("Activate CameraRolling_Stabilizer", Float ) = 0
[MaterialToggle] _Is_NormalMapForMatCap ("Is_NormalMapForMatCap", Float ) = 0
_NormalMapForMatCap ("NormalMapForMatCap", 2D) = "bump" {}
_BumpScaleMatcap ("Scale for NormalMapforMatCap", Range(0, 1)) = 1
_Rotate_NormalMapForMatCapUV ("Rotate_NormalMapForMatCapUV", Range(-1, 1)) = 0
[MaterialToggle] _Is_UseTweakMatCapOnShadow ("Is_UseTweakMatCapOnShadow", Float ) = 0
_TweakMatCapOnShadow ("TweakMatCapOnShadow", Range(0, 1)) = 0
//MatcapMask
_Set_MatcapMask ("Set_MatcapMask", 2D) = "white" {}
_Tweak_MatcapMaskLevel ("Tweak_MatcapMaskLevel", Range(-1, 1)) = 0
[MaterialToggle] _Inverse_MatcapMask ("Inverse_MatcapMask", Float ) = 0
//v.2.0.5
[MaterialToggle] _Is_Ortho ("Orthographic Projection for MatCap", Float ) = 0
//
[MaterialToggle] _Is_Ortho ("Orthographic Projection for MatCap", Float ) = 0
//v.2.0.4 Emissive
_Emissive_Tex ("Emissive_Tex", 2D) = "white" {}
[HDR]_Emissive_Color ("Emissive_Color", Color) = (0,0,0,1)
Expand All @@ -103,8 +117,8 @@ Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
_EmissiveScroll_Interval ("EmissiveScroll_Interval", Float ) = 20
//Outline
[KeywordEnum(NML,POS)] _OUTLINE("OUTLINE MODE", Float) = 0
_Outline_Width ("Outline_Width", Float ) = 1
_Farthest_Distance ("Farthest_Distance", Float ) = 10
_Outline_Width ("Outline_Width", Float ) = 0
_Farthest_Distance ("Farthest_Distance", Float ) = 100
_Nearest_Distance ("Nearest_Distance", Float ) = 0.5
_Outline_Sampler ("Outline_Sampler", 2D) = "white" {}
_Outline_Color ("Outline_Color", Color) = (0.5,0.5,0.5,1)
Expand All @@ -120,11 +134,9 @@ Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
//GI Intensity
_GI_Intensity ("GI_Intensity", Range(0, 1)) = 0
//For VR Chat under No effective light objects
_Unlit_Intensity ("Unlit_Intensity", Range(0.001, 2)) = 1
_Unlit_Intensity ("Unlit_Intensity", Range(0.001, 4)) = 1
//v.2.0.5
[MaterialToggle] _Is_Filter_LightColor ("VRChat : SceneLights HiCut_Filter", Float ) = 0
//This advanced option compensates the color of point lights when SceneLights HiCut_Filter is checked.
[HideInInspector] _ColorBoost (" *Advanced Option : Compensation Boost", Range(1, 5)) = 1
//Built-in Light Direction
[MaterialToggle] _Is_BLD ("Advanced : Activate Built-in Light Direction", Float ) = 0
_Offset_X_Axis_BLD (" Offset X-Axis (Built-in Light Direction)", Range(-1, 1)) = -0.05
Expand Down Expand Up @@ -243,4 +255,5 @@ Shader "UnityChanToonShader/EmissiveScroll/Toon_DoubleShadeWithFeather" {
//ToonCoreEnd
}
FallBack "Legacy Shaders/VertexLit"
CustomEditor "UnityChan.UTS2EmissiveScrollGUI"
}
Loading

0 comments on commit db9f7f9

Please sign in to comment.