Skip to content

Commit d1c8995

Browse files
committed
upgrade materials
1 parent 98f1c38 commit d1c8995

69 files changed

Lines changed: 9603 additions & 204 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Blue_Clipping.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_MODE
1817
- _IS_OUTLINE_CLIPPING_YES
1918
- _OUTLINE_NML
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 5
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -206,7 +206,8 @@ Material:
206206
m_Texture: {fileID: 0}
207207
m_Scale: {x: 1, y: 1}
208208
m_Offset: {x: 0, y: 0}
209-
m_Ints: []
209+
m_Ints:
210+
- _ToonMaterialVersion: 0
210211
m_Floats:
211212
- _1st2nd_Shades_Feather: 0.0001
212213
- _1st_ShadeColor_Feather: 0.1
@@ -473,6 +474,7 @@ Material:
473474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
474475
- _HighColor: {r: 0.14987022, g: 0.9264706, b: 0.21949644, a: 1}
475476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 1782.8878, g: 1, b: 6.498019, a: 6.498019}
476478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
477479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
478480
- _MatCapColor: {r: 0.74264705, g: 1, b: 0.9254564, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Flesh_Trans.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_TRANSMODE
1817
- _IS_OUTLINE_CLIPPING_YES
1918
- _OUTLINE_NML
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 5
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -206,7 +206,8 @@ Material:
206206
m_Texture: {fileID: 0}
207207
m_Scale: {x: 1, y: 1}
208208
m_Offset: {x: 0, y: 0}
209-
m_Ints: []
209+
m_Ints:
210+
- _ToonMaterialVersion: 0
210211
m_Floats:
211212
- _1st2nd_Shades_Feather: 0.238
212213
- _1st_ShadeColor_Feather: 0.067
@@ -473,6 +474,7 @@ Material:
473474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
474475
- _HighColor: {r: 0.6691177, g: 0.5646104, b: 0.12791955, a: 1}
475476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 64, g: 0.96875, b: 4.2870936, a: 6.498019}
476478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
477479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
478480
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Plane.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_OUTLINE_CLIPPING_NO
1817
- _IS_TRANSCLIPPING_OFF
1918
- _OUTLINE_NML
2019
- _SHADINGGRADEMAP
21-
m_InvalidKeywords: []
20+
m_InvalidKeywords:
21+
- _IS_ANGELRING_OFF
2222
m_LightmapFlags: 5
2323
m_EnableInstancingVariants: 0
2424
m_DoubleSidedGI: 0
@@ -187,7 +187,8 @@ Material:
187187
m_Texture: {fileID: 0}
188188
m_Scale: {x: 1, y: 1}
189189
m_Offset: {x: 0, y: 0}
190-
m_Ints: []
190+
m_Ints:
191+
- _ToonMaterialVersion: 0
191192
m_Floats:
192193
- _1st2nd_Shades_Feather: 0.0001
193194
- _1st_ShadeColor_Feather: 0.0001
@@ -454,6 +455,7 @@ Material:
454455
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
455456
- _HighColor: {r: 0.60294116, g: 1, b: 0.63853955, a: 1}
456457
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
458+
- _HighlightRimlightMath: {r: 1024, g: 0.99999, b: 6.498019, a: 6.498019}
457459
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
458460
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
459461
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Quad_TransStencilOut.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_TRANSMODE
1817
- _IS_OUTLINE_CLIPPING_YES
1918
- _OUTLINE_NML
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 1
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -207,7 +207,8 @@ Material:
207207
m_Texture: {fileID: 0}
208208
m_Scale: {x: 1, y: 1}
209209
m_Offset: {x: 0, y: 0}
210-
m_Ints: []
210+
m_Ints:
211+
- _ToonMaterialVersion: 0
211212
m_Floats:
212213
- _1st2nd_Shades_Feather: 0.0001
213214
- _1st_ShadeColor_Feather: 0.0001
@@ -474,6 +475,7 @@ Material:
474475
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
475476
- _HighColor: {r: 1, g: 1, b: 1, a: 1}
476477
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
478+
- _HighlightRimlightMath: {r: 2048, g: 1, b: 6.498019, a: 6.498019}
477479
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
478480
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
479481
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Red.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_OFF
1817
- _IS_OUTLINE_CLIPPING_NO
1918
- _OUTLINE_NML
2019
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
- _MatCap
2222
m_LightmapFlags: 5
2323
m_EnableInstancingVariants: 0
@@ -207,7 +207,8 @@ Material:
207207
m_Texture: {fileID: 0}
208208
m_Scale: {x: 1, y: 1}
209209
m_Offset: {x: 0, y: 0}
210-
m_Ints: []
210+
m_Ints:
211+
- _ToonMaterialVersion: 0
211212
m_Floats:
212213
- _1st2nd_Shades_Feather: 0.0001
213214
- _1st_ShadeColor_Feather: 0.284
@@ -474,6 +475,7 @@ Material:
474475
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
475476
- _HighColor: {r: 0.9044118, g: 0.6982591, b: 0.83901155, a: 1}
476477
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
478+
- _HighlightRimlightMath: {r: 64, g: 0.96875, b: 6.498019, a: 6.498019}
477479
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
478480
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
479481
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/Red_Clipping.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_MODE
1817
- _IS_OUTLINE_CLIPPING_YES
1918
- _OUTLINE_NML
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 5
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -206,7 +206,8 @@ Material:
206206
m_Texture: {fileID: 0}
207207
m_Scale: {x: 1, y: 1}
208208
m_Offset: {x: 0, y: 0}
209-
m_Ints: []
209+
m_Ints:
210+
- _ToonMaterialVersion: 0
210211
m_Floats:
211212
- _1st2nd_Shades_Feather: 0.0001
212213
- _1st_ShadeColor_Feather: 0.1
@@ -473,6 +474,7 @@ Material:
473474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
474475
- _HighColor: {r: 0.14901961, g: 0.9254902, b: 0.21568628, a: 1}
475476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 64, g: 0.96875, b: 6.498019, a: 6.498019}
476478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
477479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
478480
- _MatCapColor: {r: 1, g: 0.64705884, b: 0.9026369, a: 1}

TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/BallsAndPlanes2D/ShadingGradeMap.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_TRANSCLIPPING_OFF
1817
- _OUTLINE_NML
1918
- _SHADINGGRADEMAP
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 5
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -206,7 +206,8 @@ Material:
206206
m_Texture: {fileID: 0}
207207
m_Scale: {x: 1, y: 1}
208208
m_Offset: {x: 0, y: 0}
209-
m_Ints: []
209+
m_Ints:
210+
- _ToonMaterialVersion: 0
210211
m_Floats:
211212
- _1st2nd_Shades_Feather: 0.0001
212213
- _1st_ShadeColor_Feather: 0.0001
@@ -473,6 +474,7 @@ Material:
473474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
474475
- _HighColor: {r: 0.7647059, g: 0.93184584, b: 1, a: 1}
475476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 25.812538, g: 0.89996624, b: 7.315721, a: 6.498019}
476478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
477479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
478480
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

com.unity.toon-scenes/URP/BallsAndPlanesSSS/Blue_Clipping.mat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ Material:
474474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
475475
- _HighColor: {r: 0.14987022, g: 0.9264706, b: 0.21949644, a: 1}
476476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 1782.8878, g: 1, b: 6.498019, a: 6.498019}
477478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
478479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
479480
- _MatCapColor: {r: 0.74264705, g: 1, b: 0.9254564, a: 1}

com.unity.toon-scenes/URP/BallsAndPlanesSSS/Flesh_Trans.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_CLIPPING_TRANSMODE
1817
- _IS_OUTLINE_CLIPPING_YES
1918
- _OUTLINE_NML
20-
m_InvalidKeywords: []
19+
m_InvalidKeywords:
20+
- _IS_ANGELRING_OFF
2121
m_LightmapFlags: 5
2222
m_EnableInstancingVariants: 0
2323
m_DoubleSidedGI: 0
@@ -206,7 +206,8 @@ Material:
206206
m_Texture: {fileID: 0}
207207
m_Scale: {x: 1, y: 1}
208208
m_Offset: {x: 0, y: 0}
209-
m_Ints: []
209+
m_Ints:
210+
- _ToonMaterialVersion: 0
210211
m_Floats:
211212
- _1st2nd_Shades_Feather: 0.238
212213
- _1st_ShadeColor_Feather: 0.067
@@ -473,6 +474,7 @@ Material:
473474
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
474475
- _HighColor: {r: 0.6691177, g: 0.5646104, b: 0.12791955, a: 1}
475476
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
477+
- _HighlightRimlightMath: {r: 64, g: 0.96875, b: 4.2870936, a: 6.498019}
476478
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
477479
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
478480
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

com.unity.toon-scenes/URP/BallsAndPlanesSSS/Plane.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ Material:
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
1515
- _EMISSIVE_SIMPLE
16-
- _IS_ANGELRING_OFF
1716
- _IS_OUTLINE_CLIPPING_NO
1817
- _IS_TRANSCLIPPING_OFF
1918
- _OUTLINE_NML
2019
- _SHADINGGRADEMAP
21-
m_InvalidKeywords: []
20+
m_InvalidKeywords:
21+
- _IS_ANGELRING_OFF
2222
m_LightmapFlags: 5
2323
m_EnableInstancingVariants: 0
2424
m_DoubleSidedGI: 0
@@ -187,7 +187,8 @@ Material:
187187
m_Texture: {fileID: 0}
188188
m_Scale: {x: 1, y: 1}
189189
m_Offset: {x: 0, y: 0}
190-
m_Ints: []
190+
m_Ints:
191+
- _ToonMaterialVersion: 0
191192
m_Floats:
192193
- _1st2nd_Shades_Feather: 0.0001
193194
- _1st_ShadeColor_Feather: 0.0001
@@ -454,6 +455,7 @@ Material:
454455
- _FirstShadeMaskColor: {r: 0, g: 1, b: 1, a: 1}
455456
- _HighColor: {r: 0.60294116, g: 1, b: 0.63853955, a: 1}
456457
- _HighlightMaskColor: {r: 1, g: 1, b: 0, a: 1}
458+
- _HighlightRimlightMath: {r: 1024, g: 0.99999, b: 6.498019, a: 6.498019}
457459
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
458460
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
459461
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}

0 commit comments

Comments
 (0)