Skip to content

Commit 39ab812

Browse files
committed
Fixed: wrong path to shader GUI in the tesselation shader.
1 parent a27e6e6 commit 39ab812

File tree

16 files changed

+956
-68
lines changed

16 files changed

+956
-68
lines changed

TestProjects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/Baked Normal/Cube_HardEdge.mat

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Cube_HardEdge
1111
m_Shader: {fileID: 4800000, guid: 31dfbecc7cb879847aa8626f0d30ec43, 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: 4
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
@@ -51,14 +54,26 @@ Material:
5154
m_Texture: {fileID: 0}
5255
m_Scale: {x: 1, y: 1}
5356
m_Offset: {x: 0, y: 0}
57+
- _HighColor_TexSynthesized:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
5461
- _MainTex:
5562
m_Texture: {fileID: 0}
5663
m_Scale: {x: 1, y: 1}
5764
m_Offset: {x: 0, y: 0}
65+
- _MainTexSynthesized:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
5869
- _MatCap_Sampler:
5970
m_Texture: {fileID: 0}
6071
m_Scale: {x: 1, y: 1}
6172
m_Offset: {x: 0, y: 0}
73+
- _MatCap_SamplerSynthesized:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
6277
- _NormalMap:
6378
m_Texture: {fileID: 0}
6479
m_Scale: {x: 1, y: 1}
@@ -75,6 +90,10 @@ Material:
7590
m_Texture: {fileID: 0}
7691
m_Scale: {x: 1, y: 1}
7792
m_Offset: {x: 0, y: 0}
93+
- _Outline_SamplerSynthesized:
94+
m_Texture: {fileID: 0}
95+
m_Scale: {x: 1, y: 1}
96+
m_Offset: {x: 0, y: 0}
7897
- _Set_1st_ShadePosition:
7998
m_Texture: {fileID: 0}
8099
m_Scale: {x: 1, y: 1}
@@ -99,6 +118,10 @@ Material:
99118
m_Texture: {fileID: 0}
100119
m_Scale: {x: 1, y: 1}
101120
m_Offset: {x: 0, y: 0}
121+
- _ShadowControlSynthesized:
122+
m_Texture: {fileID: 0}
123+
m_Scale: {x: 1, y: 1}
124+
m_Offset: {x: 0, y: 0}
102125
m_Floats:
103126
- _1st2nd_Shades_Feather: 0.332
104127
- _1st_ShadeColor_Feather: 0.304
@@ -183,7 +206,7 @@ Material:
183206
- _Scroll_EmissiveV: 0
184207
- _Set_SystemShadowsToBase: 1
185208
- _ShadeColor_Step: 0.907
186-
- _StencilComp: 8
209+
- _StencilComp: 0
187210
- _StencilMode: 0
188211
- _StencilNo: 1
189212
- _StencilOpFail: 0
@@ -214,7 +237,7 @@ Material:
214237
- _utsVersion: 2.075
215238
- _utsVersionX: 0
216239
- _utsVersionY: 0
217-
- _utsVersionZ: 1
240+
- _utsVersionZ: 2
218241
m_Colors:
219242
- _1st_ShadeColor: {r: 0.7488292, g: 0.97794116, b: 0.6759299, a: 1}
220243
- _2nd_ShadeColor: {r: 0, g: 0.6985294, b: 0.17824532, a: 1}

TestProjects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/MatCapMask/MatCapMask.mat

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: MatCapMask
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+
_MatCap _OUTLINE_NML
1314
m_LightmapFlags: 4
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}
@@ -43,14 +54,26 @@ Material:
4354
m_Texture: {fileID: 0}
4455
m_Scale: {x: 1, y: 1}
4556
m_Offset: {x: 0, y: 0}
57+
- _HighColor_TexSynthesized:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
4661
- _MainTex:
4762
m_Texture: {fileID: 0}
4863
m_Scale: {x: 1, y: 1}
4964
m_Offset: {x: 0, y: 0}
65+
- _MainTexSynthesized:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
5069
- _MatCap_Sampler:
5170
m_Texture: {fileID: 2800000, guid: 6889a59d4b2b4a9085bffc7bac188d03, type: 3}
5271
m_Scale: {x: 1, y: 1}
5372
m_Offset: {x: 0, y: 0}
73+
- _MatCap_SamplerSynthesized:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
5477
- _NormalMap:
5578
m_Texture: {fileID: 0}
5679
m_Scale: {x: 1, y: 1}
@@ -67,6 +90,10 @@ Material:
6790
m_Texture: {fileID: 0}
6891
m_Scale: {x: 1, y: 1}
6992
m_Offset: {x: 0, y: 0}
93+
- _Outline_SamplerSynthesized:
94+
m_Texture: {fileID: 0}
95+
m_Scale: {x: 1, y: 1}
96+
m_Offset: {x: 0, y: 0}
7097
- _Set_1st_ShadePosition:
7198
m_Texture: {fileID: 0}
7299
m_Scale: {x: 1, y: 1}
@@ -87,30 +114,48 @@ Material:
87114
m_Texture: {fileID: 0}
88115
m_Scale: {x: 1, y: 1}
89116
m_Offset: {x: 0, y: 0}
117+
- _ShadingGradeMap:
118+
m_Texture: {fileID: 0}
119+
m_Scale: {x: 1, y: 1}
120+
m_Offset: {x: 0, y: 0}
121+
- _ShadowControlSynthesized:
122+
m_Texture: {fileID: 0}
123+
m_Scale: {x: 1, y: 1}
124+
m_Offset: {x: 0, y: 0}
90125
m_Floats:
91126
- _1st2nd_Shades_Feather: 0.0001
92127
- _1st_ShadeColor_Feather: 0.0001
93128
- _1st_ShadeColor_Step: 0.8
94129
- _2nd_ShadeColor_Feather: 0.0001
95130
- _2nd_ShadeColor_Step: 0.56
131+
- _ARSampler_AlphaOn: 0
132+
- _AR_OffsetU: 0
133+
- _AR_OffsetV: 0.3
96134
- _Add_Antipodean_RimLight: 1
135+
- _AngelRing: 0
97136
- _Ap_RimLight_FeatherOff: 0
98137
- _Ap_RimLight_Power: 0.86
138+
- _AutoRenderQueue: 1
99139
- _BaseColor_Step: 0.8
100140
- _BaseShade_Feather: 0.0001
101141
- _Base_Speed: 0
102142
- _BlurLevelMatcap: 0
143+
- _BlurLevelSGM: 0
103144
- _BumpScale: 1
104145
- _BumpScaleMatcap: 1
105146
- _CameraRolling_Stabilizer: 1
147+
- _ClippingMode: 0
148+
- _Clipping_Level: 0
106149
- _ColorShift_Speed: 0
107150
- _CullMode: 2
108151
- _EMISSIVE: 0
109152
- _Farthest_Distance: 10
110153
- _GI_Intensity: 0
111154
- _HighColor_Power: 0.677
155+
- _Inverse_Clipping: 0
112156
- _Inverse_MatcapMask: 0
113157
- _Inverse_Z_Axis_BLD: 1
158+
- _IsBaseMapAlphaAsClippingMask: 0
114159
- _Is_BLD: 0
115160
- _Is_BakedNormal: 0
116161
- _Is_BlendAddToHiColor: 0
@@ -121,10 +166,12 @@ Material:
121166
- _Is_Filter_LightColor: 0
122167
- _Is_LightColor_1st_Shade: 1
123168
- _Is_LightColor_2nd_Shade: 1
169+
- _Is_LightColor_AR: 1
124170
- _Is_LightColor_Ap_RimLight: 1
125171
- _Is_LightColor_Base: 1
126172
- _Is_LightColor_HighColor: 1
127173
- _Is_LightColor_MatCap: 1
174+
- _Is_LightColor_Outline: 1
128175
- _Is_LightColor_RimLight: 1
129176
- _Is_NormalMapForMatCap: 0
130177
- _Is_NormalMapToBase: 0
@@ -153,28 +200,45 @@ Material:
153200
- _Rotate_EmissiveUV: 0
154201
- _Rotate_MatCapUV: 0
155202
- _Rotate_NormalMapForMatCapUV: 0
203+
- _SPRDefaultUnlitColorMask: 15
204+
- _SRPDefaultUnlitColMode: 1
156205
- _Scroll_EmissiveU: 0
157206
- _Scroll_EmissiveV: 0
158207
- _Set_SystemShadowsToBase: 0
159208
- _ShadeColor_Step: 0.56
209+
- _StencilComp: 0
210+
- _StencilMode: 0
211+
- _StencilNo: 1
212+
- _StencilOpFail: 0
213+
- _StencilOpPass: 0
160214
- _StepOffset: 0
215+
- _TransparentEnabled: 0
161216
- _TweakHighColorOnShadow: 0
162217
- _TweakMatCapOnShadow: 0
163218
- _Tweak_HighColorMaskLevel: 0
164219
- _Tweak_LightDirection_MaskLevel: 0
165220
- _Tweak_MatCapUV: -0.019
166221
- _Tweak_MatcapMaskLevel: 1
167222
- _Tweak_RimLightMaskLevel: 0
223+
- _Tweak_ShadingGradeMapLevel: 0
168224
- _Tweak_SystemShadowsLevel: 0
225+
- _Tweak_transparency: 0
169226
- _Unlit_Intensity: 1
170227
- _Use_1stAs2nd: 0
171228
- _Use_BaseAs1st: 0
229+
- _ZOverDrawMode: 0
230+
- _ZWriteMode: 1
231+
- _isUnityToonshader: 1
172232
- _simpleUI: 0
173233
- _utsTechnique: 0
174234
- _utsVersion: 2.075
235+
- _utsVersionX: 0
236+
- _utsVersionY: 0
237+
- _utsVersionZ: 2
175238
m_Colors:
176239
- _1st_ShadeColor: {r: 0.50735295, g: 0.50735295, b: 0.50735295, a: 1}
177240
- _2nd_ShadeColor: {r: 0.3455882, g: 0.3455882, b: 0.3455882, a: 1}
241+
- _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
178242
- _Ap_RimLightColor: {r: 0.10899655, g: 0.55742764, b: 0.8235294, a: 1}
179243
- _BaseColor: {r: 0.71323526, g: 0.71323526, b: 0.71323526, a: 1}
180244
- _Color: {r: 0.71323526, g: 0.71323526, b: 0.71323526, a: 1}

0 commit comments

Comments
 (0)