Fixed: wrong path to shader GUI in the tesselation shader.

Unity-Technologies · Mar 26, 2021 · 39ab812 · 39ab812
1 parent a27e6e6
commit 39ab812
Show file tree

Hide file tree

Showing 16 changed files with 956 additions and 68 deletions.
diff --git a/...rojects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/Baked Normal/Cube_HardEdge.mat b/...rojects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/Baked Normal/Cube_HardEdge.mat
@@ -9,12 +9,15 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: Cube_HardEdge
  m_Shader: {fileID: 4800000, guid: 31dfbecc7cb879847aa8626f0d30ec43, type: 3}
- m_ShaderKeywords: _ _EMISSIVE_SIMPLE _OUTLINE_NML
+ m_ShaderKeywords: _ _EMISSIVE_SIMPLE _IS_ANGELRING_OFF _IS_CLIPPING_OFF _IS_OUTLINE_CLIPPING_NO
+ _OUTLINE_NML
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
- stringTagMap: {}
+ stringTagMap:
+ IgnoreProjection: False
+ RenderType: Opaque
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -51,14 +54,26 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _HighColor_TexSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _MainTex:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MainTexSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _MatCap_Sampler:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MatCap_SamplerSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _NormalMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -75,6 +90,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _Outline_SamplerSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _Set_1st_ShadePosition:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -99,6 +118,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _ShadowControlSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  m_Floats:
  - _1st2nd_Shades_Feather: 0.332
  - _1st_ShadeColor_Feather: 0.304
@@ -183,7 +206,7 @@ Material:
  - _Scroll_EmissiveV: 0
  - _Set_SystemShadowsToBase: 1
  - _ShadeColor_Step: 0.907
- - _StencilComp: 8
+ - _StencilComp: 0
  - _StencilMode: 0
  - _StencilNo: 1
  - _StencilOpFail: 0
@@ -214,7 +237,7 @@ Material:
  - _utsVersion: 2.075
  - _utsVersionX: 0
  - _utsVersionY: 0
- - _utsVersionZ: 1
+ - _utsVersionZ: 2
  m_Colors:
  - _1st_ShadeColor: {r: 0.7488292, g: 0.97794116, b: 0.6759299, a: 1}
  - _2nd_ShadeColor: {r: 0, g: 0.6985294, b: 0.17824532, a: 1}

diff --git a/TestProjects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/MatCapMask/MatCapMask.mat b/TestProjects/LegacyUTS_GraphicsTest/Assets/Scenes/Sample Scenes/MatCapMask/MatCapMask.mat
@@ -9,12 +9,15 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: MatCapMask
  m_Shader: {fileID: 4800000, guid: 9baf30ce95c751649b14d96da3a4b4d5, type: 3}
- m_ShaderKeywords: _EMISSIVE_SIMPLE _OUTLINE_NML
+ m_ShaderKeywords: _EMISSIVE_SIMPLE _IS_ANGELRING_OFF _IS_CLIPPING_OFF _IS_OUTLINE_CLIPPING_NO
+ _MatCap _OUTLINE_NML
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
- stringTagMap: {}
+ stringTagMap:
+ IgnoreProjection: False
+ RenderType: Opaque
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -27,6 +30,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _AngelRing_Sampler:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BakedNormal:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -35,6 +42,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _ClippingMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _Emissive_Tex:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -43,14 +54,26 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _HighColor_TexSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _MainTex:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MainTexSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _MatCap_Sampler:
  m_Texture: {fileID: 2800000, guid: 6889a59d4b2b4a9085bffc7bac188d03, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MatCap_SamplerSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _NormalMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -67,6 +90,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _Outline_SamplerSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _Set_1st_ShadePosition:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -87,30 +114,48 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _ShadingGradeMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ShadowControlSynthesized:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  m_Floats:
  - _1st2nd_Shades_Feather: 0.0001
  - _1st_ShadeColor_Feather: 0.0001
  - _1st_ShadeColor_Step: 0.8
  - _2nd_ShadeColor_Feather: 0.0001
  - _2nd_ShadeColor_Step: 0.56
+ - _ARSampler_AlphaOn: 0
+ - _AR_OffsetU: 0
+ - _AR_OffsetV: 0.3
  - _Add_Antipodean_RimLight: 1
+ - _AngelRing: 0
  - _Ap_RimLight_FeatherOff: 0
  - _Ap_RimLight_Power: 0.86
+ - _AutoRenderQueue: 1
  - _BaseColor_Step: 0.8
  - _BaseShade_Feather: 0.0001
  - _Base_Speed: 0
  - _BlurLevelMatcap: 0
+ - _BlurLevelSGM: 0
  - _BumpScale: 1
  - _BumpScaleMatcap: 1
  - _CameraRolling_Stabilizer: 1
+ - _ClippingMode: 0
+ - _Clipping_Level: 0
  - _ColorShift_Speed: 0
  - _CullMode: 2
  - _EMISSIVE: 0
  - _Farthest_Distance: 10
  - _GI_Intensity: 0
  - _HighColor_Power: 0.677
+ - _Inverse_Clipping: 0
  - _Inverse_MatcapMask: 0
  - _Inverse_Z_Axis_BLD: 1
+ - _IsBaseMapAlphaAsClippingMask: 0
  - _Is_BLD: 0
  - _Is_BakedNormal: 0
  - _Is_BlendAddToHiColor: 0
@@ -121,10 +166,12 @@ Material:
  - _Is_Filter_LightColor: 0
  - _Is_LightColor_1st_Shade: 1
  - _Is_LightColor_2nd_Shade: 1
+ - _Is_LightColor_AR: 1
  - _Is_LightColor_Ap_RimLight: 1
  - _Is_LightColor_Base: 1
  - _Is_LightColor_HighColor: 1
  - _Is_LightColor_MatCap: 1
+ - _Is_LightColor_Outline: 1
  - _Is_LightColor_RimLight: 1
  - _Is_NormalMapForMatCap: 0
  - _Is_NormalMapToBase: 0
@@ -153,28 +200,45 @@ Material:
  - _Rotate_EmissiveUV: 0
  - _Rotate_MatCapUV: 0
  - _Rotate_NormalMapForMatCapUV: 0
+ - _SPRDefaultUnlitColorMask: 15
+ - _SRPDefaultUnlitColMode: 1
  - _Scroll_EmissiveU: 0
  - _Scroll_EmissiveV: 0
  - _Set_SystemShadowsToBase: 0
  - _ShadeColor_Step: 0.56
+ - _StencilComp: 0
+ - _StencilMode: 0
+ - _StencilNo: 1
+ - _StencilOpFail: 0
+ - _StencilOpPass: 0
  - _StepOffset: 0
+ - _TransparentEnabled: 0
  - _TweakHighColorOnShadow: 0
  - _TweakMatCapOnShadow: 0
  - _Tweak_HighColorMaskLevel: 0
  - _Tweak_LightDirection_MaskLevel: 0
  - _Tweak_MatCapUV: -0.019
  - _Tweak_MatcapMaskLevel: 1
  - _Tweak_RimLightMaskLevel: 0
+ - _Tweak_ShadingGradeMapLevel: 0
  - _Tweak_SystemShadowsLevel: 0
+ - _Tweak_transparency: 0
  - _Unlit_Intensity: 1
  - _Use_1stAs2nd: 0
  - _Use_BaseAs1st: 0
+ - _ZOverDrawMode: 0
+ - _ZWriteMode: 1
+ - _isUnityToonshader: 1
  - _simpleUI: 0
  - _utsTechnique: 0
  - _utsVersion: 2.075
+ - _utsVersionX: 0
+ - _utsVersionY: 0
+ - _utsVersionZ: 2
  m_Colors:
  - _1st_ShadeColor: {r: 0.50735295, g: 0.50735295, b: 0.50735295, a: 1}
  - _2nd_ShadeColor: {r: 0.3455882, g: 0.3455882, b: 0.3455882, a: 1}
+ - _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
  - _Ap_RimLightColor: {r: 0.10899655, g: 0.55742764, b: 0.8235294, a: 1}
  - _BaseColor: {r: 0.71323526, g: 0.71323526, b: 0.71323526, a: 1}
  - _Color: {r: 0.71323526, g: 0.71323526, b: 0.71323526, a: 1}