Skip to content

Commit 3f3d4ff

Browse files
kannan-xiao4kannan-xiao4
authored
feat: Update package template for 3.1.0-exp.2 (#646)
* update version and dependencies * update unity 2020 * update samplescene on hdrp template * update unity and renderstreaming package version * remove local packages * update sample scene on rtx * fix doc * only run 2020.3 on yamato * update changelog change package version 3.1.0-exp.2
1 parent 76b1c7d commit 3f3d4ff

File tree

106 files changed

+2360
-762
lines changed

Some content is hidden

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

106 files changed

+2360
-762
lines changed

‎.yamato/upm-ci-template.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
{% for project in template_projects %}
66

77
{% for editor in editors %}
8+
{% if editor.version == "2020.3" -%}
9+
810
prepack_{{ project.name }}_{{ editor.version }}:
911
name: Pre-Pack {{ project.packagename }} {{ editor.version }} - Primed Artifacts
1012
agent:
@@ -97,14 +99,15 @@ trigger_template_test_{{ project.name }}_{{ editor.version }}:
9799
- .yamato/upm-ci-template.yml#test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.version }}
98100
{% endfor %}
99101
{% else -%}
100-
{% for param in platform.test_params %}
101102
{% if project.name != "renderstreaming-rtx" %}
103+
{% for param in platform.test_params %}
102104
- .yamato/upm-ci-template.yml#test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.version }}
103-
{% endif %}
104105
{% endfor %}
106+
{% endif %}
105107
{% endif -%}
106108
{% endfor %}
107109

110+
{% endif -%}
108111
{% endfor %}
109112

110113
publish_{{ project.name }}:
@@ -130,8 +133,10 @@ publish_{{ project.name }}:
130133
- "upm-ci~/templates/*.tgz"
131134
dependencies:
132135
{% for editor in editors %}
136+
{% if editor.version == "2020.3" %}
133137
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
134138
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
139+
{% endif %}
135140
{% endfor %}
136141

137142
publish_dryrun_{{ project.name }}:
@@ -157,7 +162,10 @@ publish_dryrun_{{ project.name }}:
157162
- "upm-ci~/templates/*.tgz"
158163
dependencies:
159164
{% for editor in editors %}
165+
{% if editor.version == "2020.3" %}
160166
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
161167
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
168+
{% endif %}
162169
{% endfor %}
170+
163171
{% endfor %}

‎com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 11
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -22,18 +22,19 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: ConstructionLight_Mat
2424
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
25-
m_ShaderKeywords: _MASKMAP _NORMALMAP_TANGENT_SPACE
25+
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 0
2828
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2000
29+
m_CustomRenderQueue: 2225
3030
stringTagMap: {}
3131
disabledShaderPasses:
3232
- DistortionVectors
3333
- MOTIONVECTORS
3434
- TransparentDepthPrepass
3535
- TransparentDepthPostpass
3636
- TransparentBackface
37+
- RayTracingPrepass
3738
m_SavedProperties:
3839
serializedVersion: 3
3940
m_TexEnvs:
@@ -153,6 +154,18 @@ Material:
153154
m_Texture: {fileID: 0}
154155
m_Scale: {x: 1, y: 1}
155156
m_Offset: {x: 0, y: 0}
157+
- unity_Lightmaps:
158+
m_Texture: {fileID: 0}
159+
m_Scale: {x: 1, y: 1}
160+
m_Offset: {x: 0, y: 0}
161+
- unity_LightmapsInd:
162+
m_Texture: {fileID: 0}
163+
m_Scale: {x: 1, y: 1}
164+
m_Offset: {x: 0, y: 0}
165+
- unity_ShadowMasks:
166+
m_Texture: {fileID: 0}
167+
m_Scale: {x: 1, y: 1}
168+
m_Offset: {x: 0, y: 0}
156169
m_Floats:
157170
- _AORemapMax: 1
158171
- _AORemapMin: 0
@@ -166,6 +179,8 @@ Material:
166179
- _AlphaCutoffShadow: 0.5
167180
- _AlphaDstBlend: 0
168181
- _AlphaSrcBlend: 1
182+
- _AlphaToMask: 0
183+
- _AlphaToMaskInspectorValue: 0
169184
- _Anisotropy: 0
170185
- _BlendMode: 0
171186
- _BumpScale: 1
@@ -233,18 +248,23 @@ Material:
233248
- _LinkDetailsWithBase: 1
234249
- _MaterialID: 1
235250
- _Metallic: 0
251+
- _MetallicRemapMax: 0
252+
- _MetallicRemapMin: 0
236253
- _Mode: 0
237254
- _NormalMapSpace: 0
238255
- _NormalScale: 1
239256
- _OcclusionStrength: 1
257+
- _OpaqueCullMode: 2
240258
- _PPDLodThreshold: 5
241259
- _PPDMaxSamples: 15
242260
- _PPDMinSamples: 5
243261
- _PPDPrimitiveLength: 1
244262
- _PPDPrimitiveWidth: 1
245263
- _Parallax: 0.02
246264
- _PreRefractionPass: 0
265+
- _RayTracing: 0
247266
- _ReceivesSSR: 1
267+
- _ReceivesSSRTransparent: 0
248268
- _RefractionMode: 0
249269
- _RefractionModel: 0
250270
- _SSRefractionProjectionModel: 0
@@ -314,3 +334,4 @@ Material:
314334
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
315335
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
316336
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
337+
m_BuildTextureStacks: []

‎com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: DryWallPainted_Mat
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
12-
m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
12+
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: 2225
1717
stringTagMap: {}
1818
disabledShaderPasses:
1919
- DistortionVectors
2020
- MOTIONVECTORS
2121
- TransparentDepthPrepass
2222
- TransparentDepthPostpass
2323
- TransparentBackface
24+
- RayTracingPrepass
2425
m_SavedProperties:
2526
serializedVersion: 3
2627
m_TexEnvs:
@@ -140,6 +141,18 @@ Material:
140141
m_Texture: {fileID: 0}
141142
m_Scale: {x: 1, y: 1}
142143
m_Offset: {x: 0, y: 0}
144+
- unity_Lightmaps:
145+
m_Texture: {fileID: 0}
146+
m_Scale: {x: 1, y: 1}
147+
m_Offset: {x: 0, y: 0}
148+
- unity_LightmapsInd:
149+
m_Texture: {fileID: 0}
150+
m_Scale: {x: 1, y: 1}
151+
m_Offset: {x: 0, y: 0}
152+
- unity_ShadowMasks:
153+
m_Texture: {fileID: 0}
154+
m_Scale: {x: 1, y: 1}
155+
m_Offset: {x: 0, y: 0}
143156
m_Floats:
144157
- _AORemapMax: 1
145158
- _AORemapMin: 0
@@ -153,6 +166,8 @@ Material:
153166
- _AlphaCutoffShadow: 0.5
154167
- _AlphaDstBlend: 0
155168
- _AlphaSrcBlend: 1
169+
- _AlphaToMask: 0
170+
- _AlphaToMaskInspectorValue: 0
156171
- _Anisotropy: 0
157172
- _BlendMode: 0
158173
- _BumpScale: 1
@@ -220,18 +235,23 @@ Material:
220235
- _LinkDetailsWithBase: 1
221236
- _MaterialID: 1
222237
- _Metallic: 0
238+
- _MetallicRemapMax: 0
239+
- _MetallicRemapMin: 0
223240
- _Mode: 0
224241
- _NormalMapSpace: 0
225242
- _NormalScale: 1
226243
- _OcclusionStrength: 1
244+
- _OpaqueCullMode: 2
227245
- _PPDLodThreshold: 5
228246
- _PPDMaxSamples: 15
229247
- _PPDMinSamples: 5
230248
- _PPDPrimitiveLength: 1
231249
- _PPDPrimitiveWidth: 1
232250
- _Parallax: 0.02
233251
- _PreRefractionPass: 0
252+
- _RayTracing: 0
234253
- _ReceivesSSR: 1
254+
- _ReceivesSSRTransparent: 0
235255
- _RefractionMode: 0
236256
- _RefractionModel: 0
237257
- _SSRefractionProjectionModel: 0
@@ -301,6 +321,7 @@ Material:
301321
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
302322
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
303323
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
324+
m_BuildTextureStacks: []
304325
--- !u!114 &7137036306022785269
305326
MonoBehaviour:
306327
m_ObjectHideFlags: 11
@@ -313,4 +334,4 @@ MonoBehaviour:
313334
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
314335
m_Name:
315336
m_EditorClassIdentifier:
316-
version: 2
337+
version: 11

‎com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWall_Mat.mat‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: DryWall_Mat
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
12-
m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
12+
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: 2225
1717
stringTagMap: {}
1818
disabledShaderPasses:
1919
- DistortionVectors
2020
- MOTIONVECTORS
2121
- TransparentDepthPrepass
2222
- TransparentDepthPostpass
2323
- TransparentBackface
24+
- RayTracingPrepass
2425
m_SavedProperties:
2526
serializedVersion: 3
2627
m_TexEnvs:
@@ -140,6 +141,18 @@ Material:
140141
m_Texture: {fileID: 0}
141142
m_Scale: {x: 1, y: 1}
142143
m_Offset: {x: 0, y: 0}
144+
- unity_Lightmaps:
145+
m_Texture: {fileID: 0}
146+
m_Scale: {x: 1, y: 1}
147+
m_Offset: {x: 0, y: 0}
148+
- unity_LightmapsInd:
149+
m_Texture: {fileID: 0}
150+
m_Scale: {x: 1, y: 1}
151+
m_Offset: {x: 0, y: 0}
152+
- unity_ShadowMasks:
153+
m_Texture: {fileID: 0}
154+
m_Scale: {x: 1, y: 1}
155+
m_Offset: {x: 0, y: 0}
143156
m_Floats:
144157
- _AORemapMax: 1
145158
- _AORemapMin: 0
@@ -153,6 +166,8 @@ Material:
153166
- _AlphaCutoffShadow: 0.5
154167
- _AlphaDstBlend: 0
155168
- _AlphaSrcBlend: 1
169+
- _AlphaToMask: 0
170+
- _AlphaToMaskInspectorValue: 0
156171
- _Anisotropy: 0
157172
- _BlendMode: 0
158173
- _BumpScale: 1
@@ -220,18 +235,23 @@ Material:
220235
- _LinkDetailsWithBase: 1
221236
- _MaterialID: 1
222237
- _Metallic: 0
238+
- _MetallicRemapMax: 0
239+
- _MetallicRemapMin: 0
223240
- _Mode: 0
224241
- _NormalMapSpace: 0
225242
- _NormalScale: 1
226243
- _OcclusionStrength: 1
244+
- _OpaqueCullMode: 2
227245
- _PPDLodThreshold: 5
228246
- _PPDMaxSamples: 15
229247
- _PPDMinSamples: 5
230248
- _PPDPrimitiveLength: 1
231249
- _PPDPrimitiveWidth: 1
232250
- _Parallax: 0.02
233251
- _PreRefractionPass: 0
252+
- _RayTracing: 0
234253
- _ReceivesSSR: 1
254+
- _ReceivesSSRTransparent: 0
235255
- _RefractionMode: 0
236256
- _RefractionModel: 0
237257
- _SSRefractionProjectionModel: 0
@@ -301,6 +321,7 @@ Material:
301321
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
302322
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
303323
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
324+
m_BuildTextureStacks: []
304325
--- !u!114 &8450638375946223581
305326
MonoBehaviour:
306327
m_ObjectHideFlags: 11
@@ -313,4 +334,4 @@ MonoBehaviour:
313334
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
314335
m_Name:
315336
m_EditorClassIdentifier:
316-
version: 2
337+
version: 11

0 commit comments

Comments
 (0)