Skip to content

Commit a5d23f0

Browse files
H3idi-XH3idi-X
authored
Task/1134 point light hi cut filter (unity3d-jp#122)
* Added a Scene ToonShader_PrulalPointLights [skip ci] * Improved Legacy Point Light Hi cut filter. * * Fixed: Point Light High Cut Filter side effects. * renamed above to Point Light High Light Filter. * renamed Stencil No. to Stencil Number. * Replaced Some `RimLight` to `Rim Light`.
1 parent 0445615 commit a5d23f0

13 files changed

+2070
-26
lines changed

‎Toonshader_ProjectLegacy/Assets/Scenes/ToonShader_PluralPointLights.unity

Lines changed: 1946 additions & 0 deletions
Large diffs are not rendered by default.

‎Toonshader_ProjectLegacy/Assets/Scenes/ToonShader_PluralPointLights.unity.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Toonshader_ProjectLegacy/Assets/UnityChan/Materials/CellTouch_ToonShader_Face_Firefly.mat

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: CellTouch_ToonShader_Face_Firefly
1111
m_Shader: {fileID: 4800000, guid: 9baf30ce95c751649b14d96da3a4b4d5, type: 3}
12-
m_ShaderKeywords: _EMISSIVE_SIMPLE _OUTLINE_NML
12+
m_ShaderKeywords: _EMISSIVE_SIMPLE _IS_ANGELRING_OFF _IS_CLIPPING_OFF _IS_OUTLINE_CLIPPING_NO
13+
_OUTLINE_NML
1314
m_LightmapFlags: 5
1415
m_EnableInstancingVariants: 0
1516
m_DoubleSidedGI: 0
1617
m_CustomRenderQueue: -1
17-
stringTagMap: {}
18+
stringTagMap:
19+
IgnoreProjection: False
20+
RenderType: Opaque
1821
disabledShaderPasses: []
1922
m_SavedProperties:
2023
serializedVersion: 3
@@ -27,6 +30,10 @@ Material:
2730
m_Texture: {fileID: 0}
2831
m_Scale: {x: 1, y: 1}
2932
m_Offset: {x: 0, y: 0}
33+
- _AngelRing_Sampler:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
3037
- _BakedNormal:
3138
m_Texture: {fileID: 0}
3239
m_Scale: {x: 1, y: 1}
@@ -35,6 +42,10 @@ Material:
3542
m_Texture: {fileID: 0}
3643
m_Scale: {x: 1, y: 1}
3744
m_Offset: {x: 0, y: 0}
45+
- _ClippingMask:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
3849
- _Emissive_Tex:
3950
m_Texture: {fileID: 0}
4051
m_Scale: {x: 1, y: 1}
@@ -87,44 +98,60 @@ Material:
8798
m_Texture: {fileID: 0}
8899
m_Scale: {x: 1, y: 1}
89100
m_Offset: {x: 0, y: 0}
101+
- _ShadingGradeMap:
102+
m_Texture: {fileID: 0}
103+
m_Scale: {x: 1, y: 1}
104+
m_Offset: {x: 0, y: 0}
90105
m_Floats:
91106
- _1st2nd_Shades_Feather: 0.0001
92107
- _1st_ShadeColor_Feather: 0.0001
93-
- _1st_ShadeColor_Step: 0.631
108+
- _1st_ShadeColor_Step: 0.5
94109
- _2nd_ShadeColor_Feather: 0.0001
95110
- _2nd_ShadeColor_Step: 0
111+
- _ARSampler_AlphaOn: 0
112+
- _AR_OffsetU: 0
113+
- _AR_OffsetV: 0.3
96114
- _Add_Antipodean_RimLight: 0
115+
- _AngelRing: 0
97116
- _Ap_RimLight_FeatherOff: 0
98117
- _Ap_RimLight_Power: 0.1
99-
- _BaseColor_Step: 0.631
118+
- _AutoRenderQueue: 1
119+
- _BaseColor_Step: 0.5
100120
- _BaseShade_Feather: 0.0001
101121
- _Base_Speed: 0
102122
- _BlurLevelMatcap: 0
123+
- _BlurLevelSGM: 0
103124
- _BumpScale: 1
104125
- _BumpScaleMatcap: 1
105126
- _CameraRolling_Stabilizer: 0
127+
- _ClippingMode: 0
128+
- _Clipping_Level: 0
106129
- _ColorShift_Speed: 0
107130
- _CullMode: 2
108131
- _EMISSIVE: 0
109132
- _Farthest_Distance: 10
110133
- _GI_Intensity: 0
111134
- _HighColor_Power: 0
135+
- _Inverse_Clipping: 0
112136
- _Inverse_MatcapMask: 0
113137
- _Inverse_Z_Axis_BLD: 0
138+
- _IsBaseMapAlphaAsClippingMask: 0
114139
- _Is_BLD: 0
115140
- _Is_BakedNormal: 0
116141
- _Is_BlendAddToHiColor: 1
117142
- _Is_BlendAddToMatCap: 1
118143
- _Is_BlendBaseColor: 0
119144
- _Is_ColorShift: 0
120-
- _Is_Filter_HiCutPointLightColor: 0
145+
- _Is_Filter_HiCutPointLightColor: 1
121146
- _Is_Filter_LightColor: 0
122147
- _Is_LightColor_1st_Shade: 1
123148
- _Is_LightColor_2nd_Shade: 1
149+
- _Is_LightColor_AR: 1
124150
- _Is_LightColor_Ap_RimLight: 1
125151
- _Is_LightColor_Base: 1
126152
- _Is_LightColor_HighColor: 1
127153
- _Is_LightColor_MatCap: 1
154+
- _Is_LightColor_Outline: 1
128155
- _Is_LightColor_RimLight: 1
129156
- _Is_NormalMapForMatCap: 0
130157
- _Is_NormalMapToBase: 0
@@ -153,28 +180,45 @@ Material:
153180
- _Rotate_EmissiveUV: 0
154181
- _Rotate_MatCapUV: 0
155182
- _Rotate_NormalMapForMatCapUV: 0
183+
- _SPRDefaultUnlitColorMask: 15
184+
- _SRPDefaultUnlitColMode: 1
156185
- _Scroll_EmissiveU: 0
157186
- _Scroll_EmissiveV: 0
158187
- _Set_SystemShadowsToBase: 1
159188
- _ShadeColor_Step: 0
160-
- _StepOffset: 0.207
189+
- _StencilComp: 0
190+
- _StencilMode: 0
191+
- _StencilNo: 1
192+
- _StencilOpFail: 0
193+
- _StencilOpPass: 0
194+
- _StepOffset: -0.5
195+
- _TransparentEnabled: 0
161196
- _TweakHighColorOnShadow: 0
162197
- _TweakMatCapOnShadow: 0
163198
- _Tweak_HighColorMaskLevel: 0
164199
- _Tweak_LightDirection_MaskLevel: 0
165200
- _Tweak_MatCapUV: 0
166201
- _Tweak_MatcapMaskLevel: 0
167202
- _Tweak_RimLightMaskLevel: 0
203+
- _Tweak_ShadingGradeMapLevel: 0
168204
- _Tweak_SystemShadowsLevel: 0
205+
- _Tweak_transparency: 0
169206
- _Unlit_Intensity: 1
170207
- _Use_1stAs2nd: 1
171208
- _Use_BaseAs1st: 0
209+
- _ZOverDrawMode: 0
210+
- _ZWriteMode: 1
211+
- _isUnityToonshader: 1
172212
- _simpleUI: 0
173213
- _utsTechnique: 0
174214
- _utsVersion: 2.075
215+
- _utsVersionX: 0
216+
- _utsVersionY: 7
217+
- _utsVersionZ: 0
175218
m_Colors:
176219
- _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
177220
- _2nd_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
221+
- _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
178222
- _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1}
179223
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
180224
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎Toonshader_ProjectLegacy/Assets/UnityChan/Materials/CellTouch_ToonShader_Main_Firefly.mat

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ Material:
2727
m_Texture: {fileID: 0}
2828
m_Scale: {x: 1, y: 1}
2929
m_Offset: {x: 0, y: 0}
30+
- _AngelRing_Sampler:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
3034
- _BakedNormal:
3135
m_Texture: {fileID: 0}
3236
m_Scale: {x: 1, y: 1}
@@ -35,6 +39,10 @@ Material:
3539
m_Texture: {fileID: 0}
3640
m_Scale: {x: 1, y: 1}
3741
m_Offset: {x: 0, y: 0}
42+
- _ClippingMask:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
3846
- _Emissive_Tex:
3947
m_Texture: {fileID: 0}
4048
m_Scale: {x: 1, y: 1}
@@ -87,30 +95,44 @@ Material:
8795
m_Texture: {fileID: 0}
8896
m_Scale: {x: 1, y: 1}
8997
m_Offset: {x: 0, y: 0}
98+
- _ShadingGradeMap:
99+
m_Texture: {fileID: 0}
100+
m_Scale: {x: 1, y: 1}
101+
m_Offset: {x: 0, y: 0}
90102
m_Floats:
91103
- _1st2nd_Shades_Feather: 0.0001
92104
- _1st_ShadeColor_Feather: 0.0001
93105
- _1st_ShadeColor_Step: 0.703
94106
- _2nd_ShadeColor_Feather: 0.0001
95107
- _2nd_ShadeColor_Step: 0
108+
- _ARSampler_AlphaOn: 0
109+
- _AR_OffsetU: 0
110+
- _AR_OffsetV: 0.3
96111
- _Add_Antipodean_RimLight: 0
112+
- _AngelRing: 0
97113
- _Ap_RimLight_FeatherOff: 0
98114
- _Ap_RimLight_Power: 0.1
115+
- _AutoRenderQueue: 1
99116
- _BaseColor_Step: 0.703
100117
- _BaseShade_Feather: 0.0001
101118
- _Base_Speed: 0
102119
- _BlurLevelMatcap: 0
120+
- _BlurLevelSGM: 0
103121
- _BumpScale: 1
104122
- _BumpScaleMatcap: 1
105123
- _CameraRolling_Stabilizer: 0
124+
- _ClippingMode: 0
125+
- _Clipping_Level: 0
106126
- _ColorShift_Speed: 0
107127
- _CullMode: 2
108128
- _EMISSIVE: 0
109129
- _Farthest_Distance: 10
110130
- _GI_Intensity: 0
111131
- _HighColor_Power: 0
132+
- _Inverse_Clipping: 0
112133
- _Inverse_MatcapMask: 0
113134
- _Inverse_Z_Axis_BLD: 0
135+
- _IsBaseMapAlphaAsClippingMask: 0
114136
- _Is_BLD: 0
115137
- _Is_BakedNormal: 0
116138
- _Is_BlendAddToHiColor: 1
@@ -121,10 +143,12 @@ Material:
121143
- _Is_Filter_LightColor: 0
122144
- _Is_LightColor_1st_Shade: 1
123145
- _Is_LightColor_2nd_Shade: 1
146+
- _Is_LightColor_AR: 1
124147
- _Is_LightColor_Ap_RimLight: 1
125148
- _Is_LightColor_Base: 1
126149
- _Is_LightColor_HighColor: 1
127150
- _Is_LightColor_MatCap: 1
151+
- _Is_LightColor_Outline: 1
128152
- _Is_LightColor_RimLight: 1
129153
- _Is_NormalMapForMatCap: 0
130154
- _Is_NormalMapToBase: 0
@@ -153,28 +177,48 @@ Material:
153177
- _Rotate_EmissiveUV: 0
154178
- _Rotate_MatCapUV: 0
155179
- _Rotate_NormalMapForMatCapUV: 0
180+
- _SPRDefaultUnlitColorMask: 15
181+
- _SRPDefaultUnlitColMode: 1
156182
- _Scroll_EmissiveU: 0
157183
- _Scroll_EmissiveV: 0
158184
- _Set_SystemShadowsToBase: 1
159185
- _ShadeColor_Step: 0
186+
- _StencilComp: 8
187+
- _StencilMode: 0
188+
- _StencilNo: 1
189+
- _StencilOpFail: 0
190+
- _StencilOpPass: 0
160191
- _StepOffset: 0.106
192+
- _TessEdgeLength: 5
193+
- _TessExtrusionAmount: 0
194+
- _TessPhongStrength: 0.5
195+
- _TransparentEnabled: 0
161196
- _TweakHighColorOnShadow: 0
162197
- _TweakMatCapOnShadow: 0
163198
- _Tweak_HighColorMaskLevel: 0
164199
- _Tweak_LightDirection_MaskLevel: 0
165200
- _Tweak_MatCapUV: 0
166201
- _Tweak_MatcapMaskLevel: 0
167202
- _Tweak_RimLightMaskLevel: 0
203+
- _Tweak_ShadingGradeMapLevel: 0
168204
- _Tweak_SystemShadowsLevel: 0.05
205+
- _Tweak_transparency: 0
169206
- _Unlit_Intensity: 1
170207
- _Use_1stAs2nd: 1
171208
- _Use_BaseAs1st: 0
209+
- _ZOverDrawMode: 0
210+
- _ZWriteMode: 1
211+
- _isUnityToonshader: 1
172212
- _simpleUI: 0
173213
- _utsTechnique: 0
174214
- _utsVersion: 2.075
215+
- _utsVersionX: 0
216+
- _utsVersionY: 7
217+
- _utsVersionZ: 0
175218
m_Colors:
176219
- _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
177220
- _2nd_ShadeColor: {r: 0.85294116, g: 0.82158303, b: 0.82158303, a: 1}
221+
- _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
178222
- _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1}
179223
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
180224
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎Toonshader_ProjectLegacy/Assets/UnityChan/Materials/ToonShader_Eyebrow_StencilMask.mat

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ Material:
124124
m_Offset: {x: 0, y: 0}
125125
m_Floats:
126126
- _1st2nd_Shades_Feather: 0.0001
127-
- _1st_ShadeColor_Feather: 0.08
128-
- _1st_ShadeColor_Step: 0.507
127+
- _1st_ShadeColor_Feather: 0.074
128+
- _1st_ShadeColor_Step: 0.5
129129
- _2nd_ShadeColor_Feather: 0.0001
130130
- _2nd_ShadeColor_Step: 0
131131
- _ARSampler_AlphaOn: 0
@@ -136,8 +136,8 @@ Material:
136136
- _Ap_RimLight_FeatherOff: 0
137137
- _Ap_RimLight_Power: 0.1
138138
- _AutoRenderQueue: 1
139-
- _BaseColor_Step: 0.507
140-
- _BaseShade_Feather: 0.08
139+
- _BaseColor_Step: 0.5
140+
- _BaseShade_Feather: 0.074
141141
- _Base_Speed: 0
142142
- _BlurLevelMatcap: 0
143143
- _BlurLevelSGM: 0
@@ -212,7 +212,7 @@ Material:
212212
- _StencilNo: 1
213213
- _StencilOpFail: 0
214214
- _StencilOpPass: 0
215-
- _StepOffset: 0
215+
- _StepOffset: -0.5
216216
- _TransparentEnabled: 0
217217
- _TweakHighColorOnShadow: 0
218218
- _TweakMatCapOnShadow: 0
@@ -234,8 +234,8 @@ Material:
234234
- _utsTechnique: 0
235235
- _utsVersion: 2.075
236236
- _utsVersionX: 0
237-
- _utsVersionY: 0
238-
- _utsVersionZ: 2
237+
- _utsVersionY: 7
238+
- _utsVersionZ: 0
239239
m_Colors:
240240
- _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
241241
- _2nd_ShadeColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

‎com.unity.toonshader/CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
* Shader version properties in all the render pipeline shaders.
55
* Updated installation.md.
66
* Replaced toggle buttons Off/Active UI to Unity standard toggle.
7-
* Renamed Basic Shader Settings to Shader Setting.
8-
* Replaced some toggle buttons, such as Emissive UV Coord, Specular Mode, to dropdown menus
7+
* Renamed `Basic Shader Settings` to `Shader Setting`.
8+
* Renamed `Point Light High Cut Filter` to `Point Light Hight Light Filter`.
9+
* Replaced some toggle buttons, such as `Emissive UV Coord`, `Specular Mode`, to dropdown menus
910
* Made everything in the inspector hidden when disabled to be shown but grayed out.
1011
* Replaced folder header to use Unity standard style in the inspector window.
1112
* Replaced `【DX11 Phong Tessellation Settings】` to `Legacy Pipeline: Phong Tessellation Settings` as it works on Mac.
1213
* Replaced term, `Technique` to `Mode`.
1314
* Replaced term, `Contribution` to `Effectiveness`.
1415
* Replaced term, `High Color` to `High Light`.
15-
* Replaced "Settings for PointLights in ForwardAdd Pass" to "Point Light Settings".
16+
* Replaced `Settings for PointLights in ForwardAdd Pass` to `Point Light Settings`.
17+
* Replaced `Stencil No.` to `Stencil Number`.
1618
* Removed Game Recommendation window and changed the default values of shader variables.* The titles of the items in the Inspector window, which were not always consistent, such as "Setup" and "Settings," are now consistent with "Settings.* Renamed Shader GUI class and mede them integrated before integrate all the render pipeline shaders. All the render pipeline shaders use one Custom Editor class.
1719
* Removed 【】in the Inspector window.
1820
### Added:
@@ -25,6 +27,7 @@
2527
* Removed Japanese and English manual link buttons.
2628
### Fixed:
2729
* Undo/Redo was not working on some itemes in the inspector window.
30+
* `Point Light High Cut Filter` Side Effects.
2831

2932
## [0.6.1-preview] - 2022-02-24
3033
### Fixed:

‎com.unity.toonshader/Editor/UTS3GUI.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ private static class Styles
972972
public static GUIContent normalMapText = new GUIContent("Normal Map", "Normal Map : Texture(bump)");
973973
public static GUIContent highColorText = new GUIContent("High Light", "High Light : Texture(sRGB) × Color(RGB) Default:Black");
974974
public static GUIContent highColorMaskText = new GUIContent("High Light Mask", "High Light Mask : Texture(linear)");
975-
public static GUIContent rimLightMaskText = new GUIContent("Rim Light Mask", "RimLight Mask : Texture(linear)");
975+
public static GUIContent rimLightMaskText = new GUIContent("Rim Light Mask", "Rim Light Mask : Texture(linear)");
976976
public static GUIContent matCapSamplerText = new GUIContent("MatCap Sampler", "MatCap Sampler : Texture(sRGB) × Color(RGB) Default:White");
977977
public static GUIContent matCapMaskText = new GUIContent("MatCap Mask", "MatCap Mask : Texture(linear)");
978978
public static GUIContent angelRingText = new GUIContent("Angel Ring", "AngelRing : Texture(sRGB) × Color(RGB) Default:Black");
@@ -1523,7 +1523,7 @@ void GUI_StencilMode(Material material)
15231523

15241524

15251525
int _Current_StencilNo = _StencilNo_Setting;
1526-
_Current_StencilNo = (int)EditorGUILayout.IntField("Stencil No.", _Current_StencilNo);
1526+
_Current_StencilNo = (int)EditorGUILayout.IntField("Stencil Number", _Current_StencilNo);
15271527
if (_StencilNo_Setting != _Current_StencilNo)
15281528
{
15291529
material.SetInt(ShaderPropStencilNo, _Current_StencilNo);
@@ -2033,7 +2033,7 @@ void GUI_AdditionalLookdevs(Material material)
20332033
}
20342034
EditorGUILayout.EndHorizontal();
20352035
#else
2036-
GUI_Toggle(material, "Point Light Hi-Cut Filter", ShaderPropIsFilterHiCutPointLightColor, MaterialGetInt(material, ShaderPropIsFilterHiCutPointLightColor) != 0);
2036+
GUI_Toggle(material, "Point Light High Light Filter", ShaderPropIsFilterHiCutPointLightColor, MaterialGetInt(material, ShaderPropIsFilterHiCutPointLightColor) != 0);
20372037
#endif
20382038
EditorGUI.indentLevel--;
20392039
EditorGUILayout.Space();
@@ -2397,7 +2397,7 @@ void GUI_RimLight(Material material)
23972397

23982398
GUILayout.Label(" RimLight Mask", EditorStyles.boldLabel);
23992399
m_MaterialEditor.TexturePropertySingleLine(Styles.rimLightMaskText, set_RimLightMask);
2400-
m_MaterialEditor.RangeProperty(tweak_RimLightMaskLevel, "RimLight Mask Level");
2400+
m_MaterialEditor.RangeProperty(tweak_RimLightMaskLevel, "Rim Light Mask Level");
24012401

24022402
//EditorGUI.indentLevel--;
24032403

0 commit comments

Comments
 (0)