From 2380f9984252644c3c445792508e004990ce45c5 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 08:34:02 +0900 Subject: [PATCH 1/9] update version and dependencies --- .../package.json | 8 +- .../Packages/manifest.json | 14 +-- .../Packages/packages-lock.json | 89 ++++++++++++------- 3 files changed, 66 insertions(+), 45 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json index dec670935..7192e63d4 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.renderstreaming-hd", "displayName": "Render Streaming HDRP", - "version": "3.0.0-preview", + "version": "3.1.0-exp.1", "type": "template", - "unity": "2019.4", + "unity": "2020.3", "description": "This is HDRP sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.", "dependencies": { - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.render-pipelines.high-definition": "7.5.3" + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.render-pipelines.high-definition": "10.8.1" } } \ No newline at end of file diff --git a/com.unity.template.renderstreaming-hd/Packages/manifest.json b/com.unity.template.renderstreaming-hd/Packages/manifest.json index ce4323a27..8ff5e6608 100644 --- a/com.unity.template.renderstreaming-hd/Packages/manifest.json +++ b/com.unity.template.renderstreaming-hd/Packages/manifest.json @@ -2,13 +2,13 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.code-analysis": "0.1.2-preview", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.3", - "com.unity.render-pipelines.high-definition": "7.5.3", - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.test-framework": "1.1.22", - "com.unity.textmeshpro": "2.1.1", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.14", + "com.unity.ide.vscode": "1.2.5", + "com.unity.render-pipelines.high-definition": "10.8.1", + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.test-framework": "1.1.31", + "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json index b1d3919e9..12fcf813e 100644 --- a/com.unity.template.renderstreaming-hd/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-hd/Packages/packages-lock.json @@ -12,13 +12,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.code-analysis": { - "version": "0.1.2-preview", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 2, @@ -34,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -42,70 +35,85 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.14", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.0", + "version": "1.0.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition": { - "version": "7.5.3", + "version": "10.8.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.video": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.render-pipelines.core": "7.5.3", - "com.unity.shadergraph": "7.5.3", - "com.unity.visualeffectgraph": "7.5.3", - "com.unity.render-pipelines.high-definition-config": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1", + "com.unity.shadergraph": "10.8.1", + "com.unity.visualeffectgraph": "10.8.1", + "com.unity.render-pipelines.high-definition-config": "10.8.1" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition-config": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1" }, "url": "https://packages.unity.com" }, "com.unity.renderstreaming": { - "version": "3.0.1-preview", + "version": "3.1.0-exp.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.webrtc": "2.3.3-preview", - "com.unity.inputsystem": "1.0.0" + "com.unity.webrtc": "2.4.0-exp.4", + "com.unity.inputsystem": "1.0.2" }, "url": "https://packages.unity.com" }, + "com.unity.searcher": { + "version": "4.3.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.shadergraph": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1", + "com.unity.searcher": "4.3.2" }, "url": "https://packages.unity.com" }, @@ -114,12 +122,12 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.render-pipelines.high-definition": "7.5.3" + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.render-pipelines.high-definition": "10.8.1" } }, "com.unity.test-framework": { - "version": "1.1.22", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -130,7 +138,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -148,16 +156,17 @@ } }, "com.unity.visualeffectgraph": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.shadergraph": "7.5.3" + "com.unity.shadergraph": "10.8.1", + "com.unity.render-pipelines.core": "10.8.1" }, "url": "https://packages.unity.com" }, "com.unity.webrtc": { - "version": "2.3.3-preview", + "version": "2.4.0-exp.4", "depth": 1, "source": "registry", "dependencies": { @@ -299,6 +308,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } From 4469682a516190c899e8f3b80036af96f7e2460a Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 08:34:23 +0900 Subject: [PATCH 2/9] update unity 2020 --- .../Materials/ConstructionLight_Mat.mat | 27 +++++++++++++-- .../Materials/DryWallPainted_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/DryWall_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/Ground_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/Hammer_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/HardHat_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/Jigsaw_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/LightBulb_Mat.mat | 31 ++++++++++++++--- .../ExampleAssets/Materials/Liquid_Mat.mat | 33 +++++++++++++++---- .../Materials/Metal_Blue_Simple_Mat.mat | 27 +++++++++++++-- .../Materials/Metal_Simple_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/OBS_Mat.mat | 27 +++++++++++++-- .../Materials/PaintBrush_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/PaintCan_mat.mat | 27 +++++++++++++-- .../Materials/PaintLabel_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Black_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Gray_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Ridges_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Rough_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Transparent.mat | 33 +++++++++++++++---- .../Materials/Plastic_White_Mat.mat | 27 +++++++++++++-- .../Materials/Plastic_Yellow_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/Strap_Mat.mat | 27 +++++++++++++-- .../ExampleAssets/Materials/Stud_Mat.mat | 27 +++++++++++++-- .../ProjectSettings/EditorSettings.asset | 15 ++++++--- .../ProjectSettings/HDRPProjectSettings.asset | 6 +--- .../ProjectSettings/ProjectVersion.txt | 4 +-- .../ProjectSettings/VFXManager.asset | 2 ++ .../UserSettings/EditorUserSettings.asset | 7 +++- 29 files changed, 605 insertions(+), 93 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat index 9a476e2b8..3698812b5 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ConstructionLight_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat index ba1a06e2d..e9dc67fd8 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DryWallPainted_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7137036306022785269 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWall_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWall_Mat.mat index 8c7fc264a..708cc335e 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWall_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/DryWall_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DryWall_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8450638375946223581 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Ground_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Ground_Mat.mat index 566c5a41e..76865411f 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Ground_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Ground_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ground_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1154503808523032885 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Hammer_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Hammer_Mat.mat index e07ed5893..ba53931d4 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Hammer_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Hammer_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hammer_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &93942427365883542 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/HardHat_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/HardHat_Mat.mat index 99cfcbaec..692403ad4 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/HardHat_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/HardHat_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HardHat_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat index 5788384b8..457d0c095 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Jigsaw_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/LightBulb_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/LightBulb_Mat.mat index f65659f38..201753f54 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/LightBulb_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/LightBulb_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: LightBulb_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -304,8 +324,8 @@ Material: - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 47.64706, g: 46.27451, b: 40.19608, a: 50} - - _EmissiveColorLDR: {r: 0.9529412, g: 0.9254902, b: 0.8039216, a: 1} + - _EmissiveColor: {r: 47.64706, g: 46.274513, b: 40.19608, a: 50} + - _EmissiveColorLDR: {r: 0.97902244, g: 0.96650547, b: 0.9082924, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Liquid_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Liquid_Mat.mat index a61847b91..82feea673 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Liquid_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Liquid_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,8 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Liquid_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT - _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE + _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -36,6 +36,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +156,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -168,6 +181,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -235,10 +250,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 3 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -246,7 +264,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -262,10 +282,10 @@ Material: - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 0 - - _StencilRefDepth: 8 + - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 + - _StencilRefGBuffer: 2 + - _StencilRefMV: 32 - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskDistortionVec: 4 @@ -316,3 +336,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat index 0ddac24da..c4db27158 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Metal_Blue_Simple_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat index 0bf981688..0e40eb169 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Metal_Simple_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8496890094149968257 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/OBS_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/OBS_Mat.mat index ed1e2f78e..e3c79bfe0 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/OBS_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/OBS_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: OBS_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &2017276512533925070 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat index 732355cb0..a8c4570be 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintBrush_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8682768489136243231 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintCan_mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintCan_mat.mat index f5f85322c..13a2c55f4 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintCan_mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintCan_mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintCan_mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8668296113096930888 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat index a8443c8fd..8ed8c7cae 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintLabel_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &60754188544290749 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat index a71c25612..b6d50c46b 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Black_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat index 234413cfd..ea00e3be5 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Gray_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat index 5851c8bb2..0cf676ba0 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Ridges_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4982445787388300931 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat index f42449891..e45041b0f 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Rough_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5466683018482078251 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Transparent.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Transparent.mat index 4d3343bcf..418d89d9c 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Transparent.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Transparent.mat @@ -9,8 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Transparent m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT - _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE + _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -23,6 +23,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -142,6 +143,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -155,6 +168,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -222,10 +237,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 3 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -233,7 +251,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -249,10 +269,10 @@ Material: - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 0 - - _StencilRefDepth: 8 + - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 + - _StencilRefGBuffer: 2 + - _StencilRefMV: 32 - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskDistortionVec: 4 @@ -303,6 +323,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3929228168255513022 MonoBehaviour: m_ObjectHideFlags: 11 @@ -315,4 +336,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat index 2d3bc37f3..1e823abf2 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_White_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat index d6d890707..a6b58a869 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Yellow_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5365207681789430224 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Strap_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Strap_Mat.mat index b1228fdc1..b4845ebd2 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Strap_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Strap_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Strap_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Stud_Mat.mat b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Stud_Mat.mat index 047ca127d..92a62a757 100644 --- a/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Stud_Mat.mat +++ b/com.unity.template.renderstreaming-hd/Assets/ExampleAssets/Materials/Stud_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stud_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/EditorSettings.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/EditorSettings.asset index c31b04be8..9866e56c1 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/EditorSettings.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/EditorSettings.asset @@ -3,8 +3,7 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Visible Meta Files + serializedVersion: 11 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 @@ -18,18 +17,24 @@ EditorSettings: m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 + m_CachingShaderPreprocessor: 1 + m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 1 m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 m_UseLegacyProbeSampleCount: 1 + m_SerializeInlineMappingsOnOneLine: 0 + m_DisableCookiesInLightmapper: 0 m_AssetPipelineMode: 1 m_CacheServerMode: 0 m_CacheServerEndpoint: m_CacheServerNamespacePrefix: default m_CacheServerEnableDownload: 1 m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/HDRPProjectSettings.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/HDRPProjectSettings.asset index 2f70154b9..078c26f89 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/HDRPProjectSettings.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/HDRPProjectSettings.asset @@ -13,14 +13,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - m_DefaultScenePrefabSaved: {fileID: 5823510469358171751, guid: 405b6ef943b2f784aab57cea789e7697, - type: 3} - m_DefaultDXRScenePrefabSaved: {fileID: 4798200196228829883, guid: f93c9eb7b4c6c75499f2d7f958dbe8b4, - type: 3} m_ProjectSettingFolderPath: HDRPDefaultResources m_WizardPopupAtStart: 0 m_WizardPopupAlreadyShownOnce: 0 m_WizardActiveTab: 0 m_WizardNeedRestartAfterChangingToDX12: 0 m_WizardNeedToRunFixAllAgainAfterDomainReload: 0 - m_LastMaterialVersion: 2 + m_LastMaterialVersion: 11 diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt index e8a0ab94d..ffab026f2 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.20f1 -m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa) +m_EditorVersion: 2020.3.27f1 +m_EditorVersionWithRevision: 2020.3.27f1 (e759542391ea) diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/VFXManager.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/VFXManager.asset index 578256772..4e57831d6 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/VFXManager.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/VFXManager.asset @@ -10,3 +10,5 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 + m_CompiledVersion: 2 + m_RuntimeVersion: 12 diff --git a/com.unity.template.renderstreaming-hd/UserSettings/EditorUserSettings.asset b/com.unity.template.renderstreaming-hd/UserSettings/EditorUserSettings.asset index 4681d1d2c..35b557d09 100644 --- a/com.unity.template.renderstreaming-hd/UserSettings/EditorUserSettings.asset +++ b/com.unity.template.renderstreaming-hd/UserSettings/EditorUserSettings.asset @@ -5,6 +5,9 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c4c111b07142f3f2b233e2867083debf42d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 @@ -15,5 +18,7 @@ EditorUserSettings: m_SemanticMergeMode: 2 m_VCShowFailedCheckout: 1 m_VCOverwriteFailedCheckoutAssets: 1 - m_VCOverlayIcons: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 0 From 76a25f8994685453c4394b8717c3ef8b9b918c26 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:13:34 +0900 Subject: [PATCH 3/9] update samplescene on hdrp template --- .../Assets/Readme.asset | 8 +- .../Assets/Scenes/samplescene.unity | 150 +++++++++++++++--- .../Scenes/samplesceneSettings.lighting | 63 ++++++++ .../Scenes/samplesceneSettings.lighting.meta | 8 + .../SampleScenePostProcessingSettings.asset | 92 ++++++++++- .../SampleSceneSkyandFogSettings.asset | 75 +++++++-- .../ProjectSettings/ProjectSettings.asset | 128 ++++++++------- .../UnityConnectSettings.asset | 17 +- 8 files changed, 444 insertions(+), 97 deletions(-) create mode 100644 com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting create mode 100644 com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting.meta diff --git a/com.unity.template.renderstreaming-hd/Assets/Readme.asset b/com.unity.template.renderstreaming-hd/Assets/Readme.asset index fbffdb1ce..b7ed070b6 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Readme.asset +++ b/com.unity.template.renderstreaming-hd/Assets/Readme.asset @@ -30,21 +30,21 @@ MonoBehaviour: - heading: text: To read more about Unity RenderStreaming please refer to the manual page. linkText: Unity Render Streaming (English) - url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.0 + url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.1 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: Unity Render Streaming (Japanese) - url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.0 + url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.1 - heading: WebRTC Package text: The Unity WebRTC package implements Unity Render Streaming technology and provides C# WebRTC API for you to build WebRTC applications inside Unity. To read more about it please refer to the manual page linkText: WebRTC Package (English) - url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.3 + url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.4 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: WebRTC Package (Japanese) - url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.3 + url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.4 - heading: text: This project uses the Package Manager to bring you the latest features Unity has to offer. Open the Package Manager from Windows > Package Manager diff --git a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity index 765f799bc..cb4c67101 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity +++ b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplescene.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 2035111234} - m_IndirectSpecularColor: {r: 131.19772, g: 162.48279, b: 214.93106, a: 1} + m_IndirectSpecularColor: {r: 131.18066, g: 162.51404, b: 215.03296, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 56e85d5dc4d99b24f9b01a6f086bd74d, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 65984cb31b8495545bc0d80954a811e5, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -225,6 +228,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -234,6 +242,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 1 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -242,6 +251,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -252,6 +262,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -376,6 +389,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -470,6 +484,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -533,7 +548,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168218571} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100739} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100753} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -732,6 +747,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -745,6 +764,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -840,6 +862,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -950,6 +974,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -974,6 +999,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &168218576 MeshFilter: m_ObjectHideFlags: 2 @@ -1072,7 +1098,7 @@ PrefabInstance: - target: {fileID: 114600619644317088, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_Version - value: 10 + value: 11 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} @@ -1318,6 +1344,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1394,6 +1421,7 @@ MonoBehaviour: text: {fileID: 91174157} canvasGroup: {fileID: 918770242} pointer: {fileID: 754093947} + noticeTouchControl: {fileID: 0} transitionCurve: serializedVersion: 2 m_Curve: @@ -1457,6 +1485,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &754844282 Canvas: m_ObjectHideFlags: 0 @@ -1545,6 +1574,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1633,6 +1663,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1705,7 +1736,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037846703} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870191} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.68701947} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -1904,6 +1935,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -1917,6 +1952,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2012,6 +2050,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -2122,6 +2162,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2146,6 +2187,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1037846708 MeshFilter: m_ObjectHideFlags: 2 @@ -2234,6 +2276,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2377,6 +2420,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2386,6 +2434,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2394,6 +2443,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -2404,6 +2454,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2488,7 +2541,7 @@ MonoBehaviour: m_GameObject: {fileID: 1297650280} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3379f8b7ab35724b965e26351c2004e, type: 3} + m_Script: {fileID: 11500000, guid: 64875cfea3598b9419edac2dbbce0413, type: 3} m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} @@ -2557,6 +2610,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2572,6 +2626,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2587,6 +2642,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1394380100} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -2940,16 +2996,36 @@ MonoBehaviour: m_GameObject: {fileID: 1696008234} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!114 &1696008236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3009,7 +3085,7 @@ MonoBehaviour: m_GameObject: {fileID: 1875731191} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3379f8b7ab35724b965e26351c2004e, type: 3} + m_Script: {fileID: 11500000, guid: 64875cfea3598b9419edac2dbbce0413, type: 3} m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} @@ -3035,6 +3111,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -3050,6 +3127,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -3065,6 +3143,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1394380100} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -3146,6 +3225,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -3155,6 +3239,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -3163,6 +3248,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -3173,6 +3259,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3314,6 +3403,7 @@ MonoBehaviour: text: {fileID: 94261775} canvasGroup: {fileID: 814567004} pointer: {fileID: 1277182497} + noticeTouchControl: {fileID: 0} transitionCurve: serializedVersion: 2 m_Curve: @@ -3377,6 +3467,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1992312015 Canvas: m_ObjectHideFlags: 0 @@ -3496,6 +3587,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -3524,7 +3616,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -3536,10 +3628,12 @@ MonoBehaviour: m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3554,6 +3648,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3572,6 +3669,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3602,8 +3700,13 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -3653,7 +3756,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059789766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.510078, y: 1.196, z: 1.1760391} + m_LocalPosition: {x: 2.5100794, y: 1.196, z: 1.1760398} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -3852,6 +3955,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -3865,6 +3972,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -3960,6 +4070,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -4070,6 +4182,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4094,6 +4207,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2059789771 MeshFilter: m_ObjectHideFlags: 2 diff --git a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting new file mode 100644 index 000000000..75ba9924e --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: samplesceneSettings + serializedVersion: 3 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 16 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 0 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 300 + m_PVREnvironmentSampleCount: 300 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 2 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 2 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting.meta b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting.meta new file mode 100644 index 000000000..8d770f2c3 --- /dev/null +++ b/com.unity.template.renderstreaming-hd/Assets/Scenes/samplesceneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65984cb31b8495545bc0d80954a811e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-hd/Assets/Settings/SampleScenePostProcessingSettings.asset b/com.unity.template.renderstreaming-hd/Assets/Settings/SampleScenePostProcessingSettings.asset index e5bb59d3e..1338cd2b7 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Settings/SampleScenePostProcessingSettings.asset +++ b/com.unity.template.renderstreaming-hd/Assets/Settings/SampleScenePostProcessingSettings.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: active: 1 m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 spectralLut: m_OverrideState: 0 m_Value: {fileID: 0} @@ -22,9 +25,9 @@ MonoBehaviour: m_Value: 0.05 min: 0 max: 1 - maxSamples: + m_MaxSamples: m_OverrideState: 0 - m_Value: 8 + m_Value: 6 min: 3 max: 24 --- !u!114 &11400000 @@ -129,6 +132,58 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + limitMinCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -12 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 18 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + limitMaxCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -8 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 22 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 adaptationMode: m_OverrideState: 0 m_Value: 1 @@ -140,6 +195,39 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 1 min: 0.001 + weightTextureMask: + m_OverrideState: 0 + m_Value: {fileID: 0} + histogramPercentages: + m_OverrideState: 0 + m_Value: {x: 40, y: 90} + min: 0 + max: 100 + histogramUseCurveRemapping: + m_OverrideState: 0 + m_Value: 0 + targetMidGray: + m_OverrideState: 0 + m_Value: 0 + centerAroundExposureTarget: + m_OverrideState: 0 + m_Value: 0 + proceduralCenter: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + proceduralRadii: + m_OverrideState: 0 + m_Value: {x: 0.3, y: 0.3} + maskMinIntensity: + m_OverrideState: 0 + m_Value: -30 + maskMaxIntensity: + m_OverrideState: 0 + m_Value: 30 + proceduralSoftness: + m_OverrideState: 0 + m_Value: 0.5 + min: 0 --- !u!114 &8711377374188185572 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/com.unity.template.renderstreaming-hd/Assets/Settings/SampleSceneSkyandFogSettings.asset b/com.unity.template.renderstreaming-hd/Assets/Settings/SampleSceneSkyandFogSettings.asset index 69706978c..2d05dffea 100644 --- a/com.unity.template.renderstreaming-hd/Assets/Settings/SampleSceneSkyandFogSettings.asset +++ b/com.unity.template.renderstreaming-hd/Assets/Settings/SampleSceneSkyandFogSettings.asset @@ -52,6 +52,27 @@ MonoBehaviour: hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 54a3a0570aebe8949bec4966f1376581, type: 3} + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + scrollSpeed: + m_OverrideState: 0 + m_Value: 2 + min: 0 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -154,6 +175,9 @@ MonoBehaviour: m_EditorClassIdentifier: active: 1 m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -195,12 +219,6 @@ MonoBehaviour: maximumHeight: m_OverrideState: 0 m_Value: 50 - albedo: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 250 @@ -208,11 +226,12 @@ MonoBehaviour: enableVolumetricFog: m_OverrideState: 1 m_Value: 1 - anisotropy: - m_OverrideState: 1 - m_Value: 0.6 - min: -1 - max: 1 + albedo: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 @@ -222,11 +241,45 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 64 min: 0.1 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 1 + m_Value: 0.6 + min: -1 + max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 min: 0 max: 1 + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + min: 6.25 + max: 50 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + min: 1 + max: 512 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + min: 0 + max: 1 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + min: 0 + max: 1 + directionalLightsOnly: + m_OverrideState: 0 + m_Value: 0 filter: m_OverrideState: 0 m_Value: 0 diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectSettings.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectSettings.asset index 029f99ee5..777ee5559 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectSettings.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: c71a6e77368cc6048998f34f4bbe2b86 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 0 androidUseSwappy: 0 androidBlitType: 1 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -103,6 +111,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -110,8 +119,15 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -127,31 +143,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -162,8 +153,13 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Standalone: com.DefaultCompany.TemplateHD + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -180,32 +176,16 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -233,8 +213,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -242,6 +222,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -251,10 +232,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 3af42c8365426634f9c7aed1f0e829fa templatePackageId: com.unity.template.hd@1.0.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' @@ -271,6 +261,10 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] @@ -321,6 +315,9 @@ PlayerSettings: - m_BuildTarget: WindowsStandaloneSupport m_APIs: 02000000 m_Automatic: 1 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -340,6 +337,7 @@ PlayerSettings: - m_BuildTarget: Windows Store Apps m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -349,12 +347,15 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -372,6 +373,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -387,6 +389,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -402,6 +405,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -417,6 +421,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -479,6 +484,9 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -505,6 +513,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -530,6 +539,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -546,6 +556,9 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -565,9 +578,10 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: 4: UNITY_POST_PROCESSING_STACK_V2 @@ -584,15 +598,21 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -642,6 +662,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -649,10 +670,8 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -667,11 +686,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 2 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 1 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + virtualTexturingSupportEnabled: 0 diff --git a/com.unity.template.renderstreaming-hd/ProjectSettings/UnityConnectSettings.asset b/com.unity.template.renderstreaming-hd/ProjectSettings/UnityConnectSettings.asset index f327fe148..50463a787 100644 --- a/com.unity.template.renderstreaming-hd/ProjectSettings/UnityConnectSettings.asset +++ b/com.unity.template.renderstreaming-hd/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,26 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + serializedVersion: 1 + m_Enabled: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 1 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From cb72659072d35f3ddaf0d87dbb14fef0c07e2d4a Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:18:49 +0900 Subject: [PATCH 4/9] update unity and renderstreaming package version --- .../Materials/ConstructionLight_Mat.mat | 27 +++- .../Materials/DryWallPainted_Mat.mat | 27 +++- .../ExampleAssets/Materials/DryWall_Mat.mat | 27 +++- .../ExampleAssets/Materials/Ground_Mat.mat | 27 +++- .../ExampleAssets/Materials/Hammer_Mat.mat | 27 +++- .../ExampleAssets/Materials/HardHat_Mat.mat | 27 +++- .../ExampleAssets/Materials/Jigsaw_Mat.mat | 27 +++- .../ExampleAssets/Materials/LightBulb_Mat.mat | 31 ++++- .../ExampleAssets/Materials/Liquid_Mat.mat | 33 ++++- .../Materials/Metal_Blue_Simple_Mat.mat | 27 +++- .../Materials/Metal_Simple_Mat.mat | 27 +++- .../ExampleAssets/Materials/OBS_Mat.mat | 27 +++- .../Materials/PaintBrush_Mat.mat | 27 +++- .../ExampleAssets/Materials/PaintCan_mat.mat | 27 +++- .../Materials/PaintLabel_Mat.mat | 27 +++- .../Materials/Plastic_Black_Mat.mat | 27 +++- .../Materials/Plastic_Gray_Mat.mat | 27 +++- .../Materials/Plastic_Ridges_Mat.mat | 27 +++- .../Materials/Plastic_Rough_Mat.mat | 27 +++- .../Materials/Plastic_Transparent.mat | 33 ++++- .../Materials/Plastic_White_Mat.mat | 27 +++- .../Materials/Plastic_Yellow_Mat.mat | 27 +++- .../ExampleAssets/Materials/Strap_Mat.mat | 27 +++- .../ExampleAssets/Materials/Stud_Mat.mat | 27 +++- .../Scenes/samplescene/PlaneMaterial.mat | 26 +++- .../CHANGELOG.md | 34 ++++- .../Runtime/ShaderConfig.cs | 128 ++++++++++++++++-- .../Runtime/ShaderConfig.cs.hlsl | 31 ++++- .../package.json | 12 +- .../package.json | 8 +- .../Packages/manifest.json | 14 +- .../Packages/packages-lock.json | 87 +++++++----- .../ProjectSettings/EditorSettings.asset | 15 +- .../ProjectSettings/HDRPProjectSettings.asset | 6 +- .../ProjectSettings/ProjectSettings.asset | 97 +++++++------ .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/VFXManager.asset | 2 + .../VersionControlSettings.asset | 8 ++ .../UserSettings/EditorUserSettings.asset | 24 ++++ 39 files changed, 949 insertions(+), 211 deletions(-) create mode 100644 com.unity.template.renderstreaming-rtx/ProjectSettings/VersionControlSettings.asset create mode 100644 com.unity.template.renderstreaming-rtx/UserSettings/EditorUserSettings.asset diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat index 9a476e2b8..3698812b5 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ConstructionLight_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat index ba1a06e2d..e9dc67fd8 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DryWallPainted_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &7137036306022785269 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWall_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWall_Mat.mat index 8c7fc264a..708cc335e 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWall_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/DryWall_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DryWall_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8450638375946223581 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Ground_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Ground_Mat.mat index 566c5a41e..76865411f 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Ground_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Ground_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ground_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &1154503808523032885 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Hammer_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Hammer_Mat.mat index e07ed5893..ba53931d4 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Hammer_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Hammer_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hammer_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &93942427365883542 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/HardHat_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/HardHat_Mat.mat index 99cfcbaec..692403ad4 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/HardHat_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/HardHat_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HardHat_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat index 5788384b8..457d0c095 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Jigsaw_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Jigsaw_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/LightBulb_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/LightBulb_Mat.mat index f65659f38..201753f54 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/LightBulb_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/LightBulb_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: LightBulb_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -304,8 +324,8 @@ Material: - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 47.64706, g: 46.27451, b: 40.19608, a: 50} - - _EmissiveColorLDR: {r: 0.9529412, g: 0.9254902, b: 0.8039216, a: 1} + - _EmissiveColor: {r: 47.64706, g: 46.274513, b: 40.19608, a: 50} + - _EmissiveColorLDR: {r: 0.97902244, g: 0.96650547, b: 0.9082924, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Liquid_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Liquid_Mat.mat index a61847b91..82feea673 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Liquid_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Liquid_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,8 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Liquid_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT - _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE + _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -36,6 +36,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +156,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -168,6 +181,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -235,10 +250,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 3 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -246,7 +264,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -262,10 +282,10 @@ Material: - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 0 - - _StencilRefDepth: 8 + - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 + - _StencilRefGBuffer: 2 + - _StencilRefMV: 32 - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskDistortionVec: 4 @@ -316,3 +336,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat index 0ddac24da..c4db27158 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Metal_Blue_Simple_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat index 0bf981688..0e40eb169 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Metal_Simple_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Metal_Simple_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8496890094149968257 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/OBS_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/OBS_Mat.mat index ed1e2f78e..e3c79bfe0 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/OBS_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/OBS_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: OBS_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &2017276512533925070 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat index 732355cb0..a8c4570be 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintBrush_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintBrush_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8682768489136243231 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintCan_mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintCan_mat.mat index f5f85322c..13a2c55f4 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintCan_mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintCan_mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintCan_mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8668296113096930888 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat index a8443c8fd..8ed8c7cae 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/PaintLabel_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PaintLabel_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &60754188544290749 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat index a71c25612..b6d50c46b 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Black_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat index 234413cfd..ea00e3be5 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Gray_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat index 5851c8bb2..0cf676ba0 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Ridges_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Ridges_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &4982445787388300931 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat index f42449891..e45041b0f 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Rough_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Rough_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5466683018482078251 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Transparent.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Transparent.mat index 4d3343bcf..418d89d9c 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Transparent.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Transparent.mat @@ -9,8 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Transparent m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT - _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE + _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -23,6 +23,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -142,6 +143,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -155,6 +168,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -222,10 +237,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 3 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -233,7 +251,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -249,10 +269,10 @@ Material: - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 0 - - _StencilRefDepth: 8 + - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 + - _StencilRefGBuffer: 2 + - _StencilRefMV: 32 - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskDistortionVec: 4 @@ -303,6 +323,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &3929228168255513022 MonoBehaviour: m_ObjectHideFlags: 11 @@ -315,4 +336,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat index 2d3bc37f3..1e823abf2 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_White_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_White_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat index d6d890707..a6b58a869 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Plastic_Yellow_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -21,6 +21,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -140,6 +141,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -153,6 +166,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -220,10 +235,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -231,7 +249,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -301,6 +321,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &5365207681789430224 MonoBehaviour: m_ObjectHideFlags: 11 @@ -313,4 +334,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Strap_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Strap_Mat.mat index b1228fdc1..b4845ebd2 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Strap_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Strap_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Strap_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Stud_Mat.mat b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Stud_Mat.mat index 047ca127d..92a62a757 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Stud_Mat.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/ExampleAssets/Materials/Stud_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,11 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Stud_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -34,6 +34,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + - RayTracingPrepass m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +154,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -166,6 +179,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _BumpScale: 1 @@ -233,10 +248,13 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 + - _MetallicRemapMax: 0 + - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 - _OcclusionStrength: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 @@ -244,7 +262,9 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionMode: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -314,3 +334,4 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene/PlaneMaterial.mat b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene/PlaneMaterial.mat index 1eeba97ae..46eda4452 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene/PlaneMaterial.mat +++ b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene/PlaneMaterial.mat @@ -9,11 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PlaneMaterial m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} - m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE + m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2520 + m_CustomRenderQueue: 2225 stringTagMap: {} disabledShaderPasses: - DistortionVectors @@ -108,6 +108,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -121,6 +133,8 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 @@ -179,14 +193,19 @@ Material: - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 1 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 + - _RayTracing: 0 - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Smoothness: 1 @@ -248,6 +267,7 @@ Material: - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!114 &8190396318146844401 MonoBehaviour: m_ObjectHideFlags: 11 @@ -260,4 +280,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 11 diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md index ab6ec5d78..39e76bb2f 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md @@ -4,37 +4,57 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [7.5.3] - 2021-01-11 +## [10.8.1] - 2021-12-16 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.5.2] - 2020-11-16 +## [10.8.0] - 2021-09-20 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.5.1] - 2020-09-02 +## [10.7.0] - 2021-07-02 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.4.1] - 2020-06-03 +## [10.6.0] - 2021-04-29 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.4.0] - 2020-05-22 +## [10.5.0] - 2021-04-19 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.3.0] - 2020-03-11 +## [10.4.0] - 2021-03-11 Version Updated The version number for this package has increased due to a version update of a related graphics package. -## [7.2.0] - 2020-02-10 +## [10.3.1] - 2021-01-26 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [10.3.0] - 2020-11-16 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [10.2.0] - 2020-10-19 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [10.1.0] - 2020-10-12 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + +## [10.0.0] - 2019-06-10 Version Updated The version number for this package has increased due to a version update of a related graphics package. diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs index ee5bcb77b..e073ccd2a 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs @@ -4,46 +4,146 @@ namespace UnityEngine.Rendering.HighDefinition { + /// + /// Options for the mode HDRP uses to evaluate probe volumes. + /// + /// [GenerateHLSL(PackingRules.Exact)] - public enum HDShadowFilteringQuality + public enum ProbeVolumesEvaluationModes { - Low = 0, - Medium = 1, - High = 2, + /// Disables probe volumes. + Disabled = 0, + /// Evaluates probe volumes in the light loop. + LightLoop = 1, + /// Evaluates probe volumes in the material pass. + MaterialPass = 2, } + /// + /// Options for the method HDRP uses to encode probe volumes. + /// + /// + [GenerateHLSL(PackingRules.Exact)] + public enum ProbeVolumesEncodingModes + { + /// Uses L0 spherical harmonics to encode probe volumes. + SphericalHarmonicsL0 = 0, + /// Uses L1 spherical harmonics to encode probe volumes. + SphericalHarmonicsL1 = 1, + /// Uses L2 spherical harmonics to encode probe volumes. + SphericalHarmonicsL2 = 2 + } + + /// + /// Options for the mode HDRP uses for probe volume bilateral filtering. + /// + /// + [GenerateHLSL(PackingRules.Exact)] + public enum ProbeVolumesBilateralFilteringModes + { + /// Disables bilateral filtering. + Disabled = 0, + /// Bilateral filtering using validity. + Validity = 1, + /// Bilateral filtering using octahedral depth. + OctahedralDepth = 2 + } + + /// + /// Project-wide shader configuration options. + /// + /// This enum will generate the proper shader defines. + /// [GenerateHLSL(PackingRules.Exact)] public enum ShaderOptions { - CameraRelativeRendering = 1, // Rendering sets the origin of the world to the position of the primary (scene view) camera + /// Supports colored shadows in shaders. + ColoredShadow = 1, + /// Uses [camera-relative rendering](../manual/Camera-Relative-Rendering.md) to enhance precision. + CameraRelativeRendering = 1, + /// Uses pre-exposition to enhance color precision. PreExposition = 1, - PrecomputedAtmosphericAttenuation = 0, // Precomputes atmospheric attenuation for the directional light on the CPU, which makes it independent from the fragment's position, which is faster but wrong -#if ENABLE_RAYTRACING - Raytracing = 1, -#else - Raytracing = 0, -#endif + /// Precomputes atmospheric attenuation for the directional light on the CPU. This makes it independent from the fragment's position, which increases performance but reduces accuracy. + PrecomputedAtmosphericAttenuation = 0, + + /// Maximum number of views for XR. #if ENABLE_VR - XrMaxViews = 2, // Used for single-pass rendering (with fast path in vertex shader code when forced to 2) + XrMaxViews = 2, #else XrMaxViews = 1, #endif + + // Warning: Probe Volumes is a highly experimental feature. It is disabled by default for this reason. + // It's functionality is subject to breaking changes and whole sale removal. + // It is not recommended for use outside of for providing feedback. It should not be used in production. + // To enable, set: + // ProbeVolumesEvaluationMode = ProbeVolumesEvaluationModes.MaterialPass + // and inside of the editor run: + // Edit->Render Pipeline->Generate Shader Includes + // Probe Volumes feature must also be enabled inside of your HDRenderPipelineAsset. + // Also uncomment in the HDRP package all ".../Experimental/Probe Volume" menu + + /// The probe volume evaluation mode. + /// + ProbeVolumesEvaluationMode = ProbeVolumesEvaluationModes.Disabled, + /// Probe volume supports additive blending. + ProbeVolumesAdditiveBlending = 1, + /// The probe volume filtering mode. + /// + ProbeVolumesBilateralFilteringMode = ProbeVolumesBilateralFilteringModes.Validity, + /// The probe volume encoding method. + /// /// + ProbeVolumesEncodingMode = ProbeVolumesEncodingModes.SphericalHarmonicsL1, + + /// Support for area lights. AreaLights = 1, - DeferredShadowFiltering = HDShadowFilteringQuality.Medium, + /// Support for barn doors. BarnDoor = 0 }; // Note: #define can't be use in include file in C# so we chose this way to configure both C# and hlsl // Changing a value in this enum Config here require to regenerate the hlsl include and recompile C# and shaders + /// + /// Project-wide shader configuration options. + /// This class reflects the enum. Use it in C# code to check the current configuration. + /// public class ShaderConfig { + // REALLY IMPORTANT! This needs to be the maximum possible XrMaxViews for any supported platform! + // this needs to be constant and not vary like XrMaxViews does as it is used to generate the cbuffer declarations + /// Maximum number of XR views for constant buffer allocation. + public const int k_XRMaxViewsForCBuffer = 2; + + /// Indicates whether to use [camera-relative rendering](../manual/Camera-Relative-Rendering.md) to enhance precision. + /// public static int s_CameraRelativeRendering = (int)ShaderOptions.CameraRelativeRendering; + /// Indicates whether to use pre-exposition to enhance color prevision. + /// public static int s_PreExposition = (int)ShaderOptions.PreExposition; + /// Specifies the maximum number of views to use for XR rendering. + /// public static int s_XrMaxViews = (int)ShaderOptions.XrMaxViews; + /// Indicates whether to precompute atmosphere attenuation for the directional light on the CPU. + /// public static int s_PrecomputedAtmosphericAttenuation = (int)ShaderOptions.PrecomputedAtmosphericAttenuation; + /// Specifies the probe volume evaluation mode. + /// + public static ProbeVolumesEvaluationModes s_ProbeVolumesEvaluationMode = (ProbeVolumesEvaluationModes)ShaderOptions.ProbeVolumesEvaluationMode; + /// Indicates whether probe volumes support additive blending. + /// + public static int s_ProbeVolumesAdditiveBlending = (int)ShaderOptions.ProbeVolumesAdditiveBlending; + /// Specifies the probe volume filtering mode. + /// + public static ProbeVolumesBilateralFilteringModes s_ProbeVolumesBilateralFilteringMode = (ProbeVolumesBilateralFilteringModes)ShaderOptions.ProbeVolumesBilateralFilteringMode; + /// Specifies the probe volume encoding method. + /// + public static ProbeVolumesEncodingModes s_ProbeVolumesEncodingMode = (ProbeVolumesEncodingModes)ShaderOptions.ProbeVolumesEncodingMode; + /// Indicates whether to support area lights. + /// public static int s_AreaLights = (int)ShaderOptions.AreaLights; + /// Indicates whether to support barn doors. + /// public static int s_BarnDoor = (int)ShaderOptions.BarnDoor; - public static HDShadowFilteringQuality s_DeferredShadowFiltering = (HDShadowFilteringQuality)ShaderOptions.DeferredShadowFiltering; } } diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl index 926141ec9..b5deceed4 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl @@ -1,26 +1,43 @@ // -// This file was automatically generated. Please don't edit by hand. +// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead // #ifndef SHADERCONFIG_CS_HLSL #define SHADERCONFIG_CS_HLSL // -// UnityEngine.Rendering.HighDefinition.HDShadowFilteringQuality: static fields +// UnityEngine.Rendering.HighDefinition.ProbeVolumesEvaluationModes: static fields // -#define HDSHADOWFILTERINGQUALITY_LOW (0) -#define HDSHADOWFILTERINGQUALITY_MEDIUM (1) -#define HDSHADOWFILTERINGQUALITY_HIGH (2) +#define PROBEVOLUMESEVALUATIONMODES_DISABLED (0) +#define PROBEVOLUMESEVALUATIONMODES_LIGHT_LOOP (1) +#define PROBEVOLUMESEVALUATIONMODES_MATERIAL_PASS (2) + +// +// UnityEngine.Rendering.HighDefinition.ProbeVolumesEncodingModes: static fields +// +#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L0 (0) +#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L1 (1) +#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L2 (2) + +// +// UnityEngine.Rendering.HighDefinition.ProbeVolumesBilateralFilteringModes: static fields +// +#define PROBEVOLUMESBILATERALFILTERINGMODES_DISABLED (0) +#define PROBEVOLUMESBILATERALFILTERINGMODES_VALIDITY (1) +#define PROBEVOLUMESBILATERALFILTERINGMODES_OCTAHEDRAL_DEPTH (2) // // UnityEngine.Rendering.HighDefinition.ShaderOptions: static fields // +#define SHADEROPTIONS_COLORED_SHADOW (1) #define SHADEROPTIONS_CAMERA_RELATIVE_RENDERING (1) #define SHADEROPTIONS_PRE_EXPOSITION (1) #define SHADEROPTIONS_PRECOMPUTED_ATMOSPHERIC_ATTENUATION (0) -#define SHADEROPTIONS_RAYTRACING (1) #define SHADEROPTIONS_XR_MAX_VIEWS (2) +#define SHADEROPTIONS_PROBE_VOLUMES_EVALUATION_MODE (0) +#define SHADEROPTIONS_PROBE_VOLUMES_ADDITIVE_BLENDING (1) +#define SHADEROPTIONS_PROBE_VOLUMES_BILATERAL_FILTERING_MODE (1) +#define SHADEROPTIONS_PROBE_VOLUMES_ENCODING_MODE (1) #define SHADEROPTIONS_AREA_LIGHTS (1) -#define SHADEROPTIONS_DEFERRED_SHADOW_FILTERING (1) #define SHADEROPTIONS_BARN_DOOR (0) diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json index b93b4324a..25a9b709e 100644 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json @@ -1,19 +1,19 @@ { "name": "com.unity.render-pipelines.high-definition-config", "description": "Configuration files for the High Definition Render Pipeline.", - "version": "7.5.3", - "unity": "2019.4", - "unityRelease": "14f1", + "version": "10.8.1", + "unity": "2020.3", + "unityRelease": "18f1", "displayName": "High Definition RP Config", "dependencies": { - "com.unity.render-pipelines.core": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1" }, "upmCi": { - "footprint": "c1bed0d9d8bbff7c6c36211163fab3fc252a55c6" + "footprint": "adeee56b593689c7e6ec370dbb1ce6ce61ac9109" }, "repository": { "url": "https://github.com/Unity-Technologies/Graphics.git", "type": "git", - "revision": "ac3b5ff88a3e68b57911bd6e66fdf7bbc2090dac" + "revision": "31a193989d1e4e18ec3dced0f45168f8d2552a9a" } } diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json index 8153a0684..3b2d17f29 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.renderstreaming-rtx", "displayName": "Render Streaming Raytracing", - "version": "3.0.0-preview", + "version": "3.1.0-exp.1", "type": "template", - "unity": "2019.4", + "unity": "2020.3", "description": "This is HDRP Raytracing sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.", "dependencies": { - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.render-pipelines.high-definition": "7.5.3" + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.render-pipelines.high-definition": "10.8.1" } } \ No newline at end of file diff --git a/com.unity.template.renderstreaming-rtx/Packages/manifest.json b/com.unity.template.renderstreaming-rtx/Packages/manifest.json index 4072d89de..0ddc3272d 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/manifest.json +++ b/com.unity.template.renderstreaming-rtx/Packages/manifest.json @@ -2,14 +2,14 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.code-analysis": "0.1.2-preview", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.3", - "com.unity.render-pipelines.high-definition": "7.5.3", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.14", + "com.unity.ide.vscode": "1.2.5", + "com.unity.render-pipelines.high-definition": "10.8.1", "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.test-framework": "1.1.22", - "com.unity.textmeshpro": "2.1.1", + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.test-framework": "1.1.31", + "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json index 7f4eb807a..8c5631d0a 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json @@ -12,13 +12,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.code-analysis": { - "version": "0.1.2-preview", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 2, @@ -34,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -42,8 +35,17 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.14", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -51,33 +53,31 @@ }, "com.unity.inputsystem": { "version": "1.0.2", - "depth": 0, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition": { - "version": "7.5.3", + "version": "10.8.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.video": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.render-pipelines.core": "7.5.3", - "com.unity.shadergraph": "7.5.3", - "com.unity.visualeffectgraph": "7.5.3", - "com.unity.render-pipelines.high-definition-config": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1", + "com.unity.shadergraph": "10.8.1", + "com.unity.visualeffectgraph": "10.8.1", + "com.unity.render-pipelines.high-definition-config": "10.8.1" }, "url": "https://packages.unity.com" }, @@ -86,25 +86,33 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.render-pipelines.core": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1" } }, "com.unity.renderstreaming": { - "version": "3.0.1-preview", + "version": "3.1.0-exp.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.webrtc": "2.3.3-preview", - "com.unity.inputsystem": "1.0.0" + "com.unity.webrtc": "2.4.0-exp.4", + "com.unity.inputsystem": "1.0.2" }, "url": "https://packages.unity.com" }, + "com.unity.searcher": { + "version": "4.3.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.shadergraph": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.5.3" + "com.unity.render-pipelines.core": "10.8.1", + "com.unity.searcher": "4.3.2" }, "url": "https://packages.unity.com" }, @@ -113,12 +121,12 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.unity.renderstreaming": "3.0.1-preview", - "com.unity.render-pipelines.high-definition": "7.5.3" + "com.unity.renderstreaming": "3.1.0-exp.2", + "com.unity.render-pipelines.high-definition": "10.8.1" } }, "com.unity.test-framework": { - "version": "1.1.22", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -129,7 +137,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -147,16 +155,17 @@ } }, "com.unity.visualeffectgraph": { - "version": "7.5.3", + "version": "10.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.shadergraph": "7.5.3" + "com.unity.shadergraph": "10.8.1", + "com.unity.render-pipelines.core": "10.8.1" }, "url": "https://packages.unity.com" }, "com.unity.webrtc": { - "version": "2.3.3-preview", + "version": "2.4.0-exp.4", "depth": 1, "source": "registry", "dependencies": { @@ -298,6 +307,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/EditorSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/EditorSettings.asset index c31b04be8..9866e56c1 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/EditorSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/EditorSettings.asset @@ -3,8 +3,7 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Visible Meta Files + serializedVersion: 11 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 @@ -18,18 +17,24 @@ EditorSettings: m_EtcTextureBestCompressor: 4 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 + m_CachingShaderPreprocessor: 1 + m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 1 m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 m_UseLegacyProbeSampleCount: 1 + m_SerializeInlineMappingsOnOneLine: 0 + m_DisableCookiesInLightmapper: 0 m_AssetPipelineMode: 1 m_CacheServerMode: 0 m_CacheServerEndpoint: m_CacheServerNamespacePrefix: default m_CacheServerEnableDownload: 1 m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/HDRPProjectSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/HDRPProjectSettings.asset index 91fdc76be..e9ac99723 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/HDRPProjectSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/HDRPProjectSettings.asset @@ -13,14 +13,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - m_DefaultScenePrefabSaved: {fileID: 5823510469358171751, guid: 102a78fb60263af4bb3d493f9425bf6b, - type: 3} - m_DefaultDXRScenePrefabSaved: {fileID: 4798200196228829883, guid: 0d4db1f7dbd01fc4d8b5b1db421940d4, - type: 3} m_ProjectSettingFolderPath: HDRPDefaultResources m_WizardPopupAtStart: 0 m_WizardPopupAlreadyShownOnce: 0 m_WizardActiveTab: 2 m_WizardNeedRestartAfterChangingToDX12: 0 m_WizardNeedToRunFixAllAgainAfterDomainReload: 0 - m_LastMaterialVersion: 2 + m_LastMaterialVersion: 11 diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset index d1f4d6f66..c7cb5406f 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: c71a6e77368cc6048998f34f4bbe2b86 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 0 androidUseSwappy: 0 androidBlitType: 1 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -117,7 +125,9 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -133,31 +143,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -169,7 +154,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: {} - buildNumber: {} + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -186,10 +175,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -223,8 +212,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -242,10 +231,19 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 3af42c8365426634f9c7aed1f0e829fa templatePackageId: com.unity.template.hd@1.0.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' @@ -262,6 +260,10 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] @@ -312,6 +314,9 @@ PlayerSettings: - m_BuildTarget: WindowsStandaloneSupport m_APIs: 1200000002000000 m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -331,6 +336,7 @@ PlayerSettings: - m_BuildTarget: Windows Store Apps m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -340,12 +346,15 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -363,6 +372,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -378,6 +388,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -393,6 +404,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -408,6 +420,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -470,6 +483,9 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -540,6 +556,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -560,11 +577,12 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: - 1: + 1: ENABLE_RAYTRACING 4: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2 @@ -579,12 +597,17 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -647,10 +670,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -665,11 +685,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 2 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 1 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + virtualTexturingSupportEnabled: 0 diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt index e8a0ab94d..ffab026f2 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.20f1 -m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa) +m_EditorVersion: 2020.3.27f1 +m_EditorVersionWithRevision: 2020.3.27f1 (e759542391ea) diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/VFXManager.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/VFXManager.asset index 578256772..4e57831d6 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/VFXManager.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/VFXManager.asset @@ -10,3 +10,5 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 + m_CompiledVersion: 2 + m_RuntimeVersion: 12 diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/VersionControlSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 000000000..dca288142 --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/com.unity.template.renderstreaming-rtx/UserSettings/EditorUserSettings.asset b/com.unity.template.renderstreaming-rtx/UserSettings/EditorUserSettings.asset new file mode 100644 index 000000000..d43036a6e --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/UserSettings/EditorUserSettings.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c4c111b07142f3f2b233e2867083debf42d + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1 From 6136712932e8be7b32088791d96067bb95f85289 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:28:10 +0900 Subject: [PATCH 5/9] remove local packages --- .../CHANGELOG.md | 72 --------- .../CHANGELOG.md.meta | 7 - .../Documentation~/index.md | 7 - .../LICENSE.md | 5 - .../LICENSE.md.meta | 7 - .../Runtime.meta | 8 - .../Runtime/ShaderConfig.cs | 149 ------------------ .../Runtime/ShaderConfig.cs.hlsl | 44 ------ .../Runtime/ShaderConfig.cs.hlsl.meta | 9 -- .../Runtime/ShaderConfig.cs.meta | 12 -- ...lines.HighDefinition.Config.Runtime.asmdef | 14 -- ....HighDefinition.Config.Runtime.asmdef.meta | 7 - .../Tests.meta | 8 - .../Tests/.tests.json | 3 - .../Tests/Editor.meta | 8 - .../Tests/Editor/ConfigurationTest.cs | 13 -- .../Tests/Editor/ConfigurationTest.cs.meta | 11 -- ...s.HighDefinitionConfig.Editor.Tests.asmdef | 21 --- ...hDefinitionConfig.Editor.Tests.asmdef.meta | 7 - .../package.json | 19 --- .../package.json.meta | 7 - .../Packages/manifest.json | 1 - .../Packages/packages-lock.json | 9 +- 23 files changed, 5 insertions(+), 443 deletions(-) delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Documentation~/index.md delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/.tests.json delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef.meta delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json delete mode 100644 com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json.meta diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md deleted file mode 100644 index 39e76bb2f..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ /dev/null @@ -1,72 +0,0 @@ -# Changelog -All notable changes to this package will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - -## [10.8.1] - 2021-12-16 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.8.0] - 2021-09-20 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.7.0] - 2021-07-02 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.6.0] - 2021-04-29 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.5.0] - 2021-04-19 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.4.0] - 2021-03-11 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.3.1] - 2021-01-26 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.3.0] - 2020-11-16 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.2.0] - 2020-10-19 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.1.0] - 2020-10-12 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [10.0.0] - 2019-06-10 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [7.1.1] - 2019-09-05 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -## [7.0.1] - 2019-07-25 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. - -Started Changelog diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md.meta deleted file mode 100644 index fd1225a69..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0b3f7006c7834664ba28a1fa6b51f9fe -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Documentation~/index.md b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Documentation~/index.md deleted file mode 100644 index 69e0fb71c..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Documentation~/index.md +++ /dev/null @@ -1,7 +0,0 @@ -# High Definition Render Pipeline Configuration Package - -The High Definition Render Pipeline (HDRP) uses this package to control the availability of some of its features. If you want to use this package to configure HDRP, you must link it as a local package. - -* For information on how to set up and use the HDRP Config package, see [HDRP Config](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest/index.html?subfolder=/manual/HDRP-Config-Package.html). -* For documentation on HDRP itself, see [HDRP documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest/index.html). - diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md deleted file mode 100644 index 3d0525092..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md +++ /dev/null @@ -1,5 +0,0 @@ -com.unity.render-pipelines.high-definition-config copyright © 2020 Unity Technologies ApS - -Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). - -Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions. diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md.meta deleted file mode 100644 index ea2acb8a2..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e797817a7447e1f42816cf2c2fa8765d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime.meta deleted file mode 100644 index f39f7b8ba..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5d299198a792a964e9d443aa47506e2c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs deleted file mode 100644 index e073ccd2a..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs +++ /dev/null @@ -1,149 +0,0 @@ -//----------------------------------------------------------------------------- -// Configuration -//----------------------------------------------------------------------------- - -namespace UnityEngine.Rendering.HighDefinition -{ - /// - /// Options for the mode HDRP uses to evaluate probe volumes. - /// - /// - [GenerateHLSL(PackingRules.Exact)] - public enum ProbeVolumesEvaluationModes - { - /// Disables probe volumes. - Disabled = 0, - /// Evaluates probe volumes in the light loop. - LightLoop = 1, - /// Evaluates probe volumes in the material pass. - MaterialPass = 2, - } - - /// - /// Options for the method HDRP uses to encode probe volumes. - /// - /// - [GenerateHLSL(PackingRules.Exact)] - public enum ProbeVolumesEncodingModes - { - /// Uses L0 spherical harmonics to encode probe volumes. - SphericalHarmonicsL0 = 0, - /// Uses L1 spherical harmonics to encode probe volumes. - SphericalHarmonicsL1 = 1, - /// Uses L2 spherical harmonics to encode probe volumes. - SphericalHarmonicsL2 = 2 - } - - /// - /// Options for the mode HDRP uses for probe volume bilateral filtering. - /// - /// - [GenerateHLSL(PackingRules.Exact)] - public enum ProbeVolumesBilateralFilteringModes - { - /// Disables bilateral filtering. - Disabled = 0, - /// Bilateral filtering using validity. - Validity = 1, - /// Bilateral filtering using octahedral depth. - OctahedralDepth = 2 - } - - /// - /// Project-wide shader configuration options. - /// - /// This enum will generate the proper shader defines. - /// - [GenerateHLSL(PackingRules.Exact)] - public enum ShaderOptions - { - /// Supports colored shadows in shaders. - ColoredShadow = 1, - /// Uses [camera-relative rendering](../manual/Camera-Relative-Rendering.md) to enhance precision. - CameraRelativeRendering = 1, - /// Uses pre-exposition to enhance color precision. - PreExposition = 1, - /// Precomputes atmospheric attenuation for the directional light on the CPU. This makes it independent from the fragment's position, which increases performance but reduces accuracy. - PrecomputedAtmosphericAttenuation = 0, - - /// Maximum number of views for XR. -#if ENABLE_VR - XrMaxViews = 2, -#else - XrMaxViews = 1, -#endif - - // Warning: Probe Volumes is a highly experimental feature. It is disabled by default for this reason. - // It's functionality is subject to breaking changes and whole sale removal. - // It is not recommended for use outside of for providing feedback. It should not be used in production. - // To enable, set: - // ProbeVolumesEvaluationMode = ProbeVolumesEvaluationModes.MaterialPass - // and inside of the editor run: - // Edit->Render Pipeline->Generate Shader Includes - // Probe Volumes feature must also be enabled inside of your HDRenderPipelineAsset. - // Also uncomment in the HDRP package all ".../Experimental/Probe Volume" menu - - /// The probe volume evaluation mode. - /// - ProbeVolumesEvaluationMode = ProbeVolumesEvaluationModes.Disabled, - /// Probe volume supports additive blending. - ProbeVolumesAdditiveBlending = 1, - /// The probe volume filtering mode. - /// - ProbeVolumesBilateralFilteringMode = ProbeVolumesBilateralFilteringModes.Validity, - /// The probe volume encoding method. - /// /// - ProbeVolumesEncodingMode = ProbeVolumesEncodingModes.SphericalHarmonicsL1, - - /// Support for area lights. - AreaLights = 1, - - /// Support for barn doors. - BarnDoor = 0 - }; - - // Note: #define can't be use in include file in C# so we chose this way to configure both C# and hlsl - // Changing a value in this enum Config here require to regenerate the hlsl include and recompile C# and shaders - /// - /// Project-wide shader configuration options. - /// This class reflects the enum. Use it in C# code to check the current configuration. - /// - public class ShaderConfig - { - // REALLY IMPORTANT! This needs to be the maximum possible XrMaxViews for any supported platform! - // this needs to be constant and not vary like XrMaxViews does as it is used to generate the cbuffer declarations - /// Maximum number of XR views for constant buffer allocation. - public const int k_XRMaxViewsForCBuffer = 2; - - /// Indicates whether to use [camera-relative rendering](../manual/Camera-Relative-Rendering.md) to enhance precision. - /// - public static int s_CameraRelativeRendering = (int)ShaderOptions.CameraRelativeRendering; - /// Indicates whether to use pre-exposition to enhance color prevision. - /// - public static int s_PreExposition = (int)ShaderOptions.PreExposition; - /// Specifies the maximum number of views to use for XR rendering. - /// - public static int s_XrMaxViews = (int)ShaderOptions.XrMaxViews; - /// Indicates whether to precompute atmosphere attenuation for the directional light on the CPU. - /// - public static int s_PrecomputedAtmosphericAttenuation = (int)ShaderOptions.PrecomputedAtmosphericAttenuation; - /// Specifies the probe volume evaluation mode. - /// - public static ProbeVolumesEvaluationModes s_ProbeVolumesEvaluationMode = (ProbeVolumesEvaluationModes)ShaderOptions.ProbeVolumesEvaluationMode; - /// Indicates whether probe volumes support additive blending. - /// - public static int s_ProbeVolumesAdditiveBlending = (int)ShaderOptions.ProbeVolumesAdditiveBlending; - /// Specifies the probe volume filtering mode. - /// - public static ProbeVolumesBilateralFilteringModes s_ProbeVolumesBilateralFilteringMode = (ProbeVolumesBilateralFilteringModes)ShaderOptions.ProbeVolumesBilateralFilteringMode; - /// Specifies the probe volume encoding method. - /// - public static ProbeVolumesEncodingModes s_ProbeVolumesEncodingMode = (ProbeVolumesEncodingModes)ShaderOptions.ProbeVolumesEncodingMode; - /// Indicates whether to support area lights. - /// - public static int s_AreaLights = (int)ShaderOptions.AreaLights; - /// Indicates whether to support barn doors. - /// - public static int s_BarnDoor = (int)ShaderOptions.BarnDoor; - } -} diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl deleted file mode 100644 index b5deceed4..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl +++ /dev/null @@ -1,44 +0,0 @@ -// -// This file was automatically generated. Please don't edit by hand. Execute Editor command [ Edit / Render Pipeline / Generate Shader Includes ] instead -// - -#ifndef SHADERCONFIG_CS_HLSL -#define SHADERCONFIG_CS_HLSL -// -// UnityEngine.Rendering.HighDefinition.ProbeVolumesEvaluationModes: static fields -// -#define PROBEVOLUMESEVALUATIONMODES_DISABLED (0) -#define PROBEVOLUMESEVALUATIONMODES_LIGHT_LOOP (1) -#define PROBEVOLUMESEVALUATIONMODES_MATERIAL_PASS (2) - -// -// UnityEngine.Rendering.HighDefinition.ProbeVolumesEncodingModes: static fields -// -#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L0 (0) -#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L1 (1) -#define PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L2 (2) - -// -// UnityEngine.Rendering.HighDefinition.ProbeVolumesBilateralFilteringModes: static fields -// -#define PROBEVOLUMESBILATERALFILTERINGMODES_DISABLED (0) -#define PROBEVOLUMESBILATERALFILTERINGMODES_VALIDITY (1) -#define PROBEVOLUMESBILATERALFILTERINGMODES_OCTAHEDRAL_DEPTH (2) - -// -// UnityEngine.Rendering.HighDefinition.ShaderOptions: static fields -// -#define SHADEROPTIONS_COLORED_SHADOW (1) -#define SHADEROPTIONS_CAMERA_RELATIVE_RENDERING (1) -#define SHADEROPTIONS_PRE_EXPOSITION (1) -#define SHADEROPTIONS_PRECOMPUTED_ATMOSPHERIC_ATTENUATION (0) -#define SHADEROPTIONS_XR_MAX_VIEWS (2) -#define SHADEROPTIONS_PROBE_VOLUMES_EVALUATION_MODE (0) -#define SHADEROPTIONS_PROBE_VOLUMES_ADDITIVE_BLENDING (1) -#define SHADEROPTIONS_PROBE_VOLUMES_BILATERAL_FILTERING_MODE (1) -#define SHADEROPTIONS_PROBE_VOLUMES_ENCODING_MODE (1) -#define SHADEROPTIONS_AREA_LIGHTS (1) -#define SHADEROPTIONS_BARN_DOOR (0) - - -#endif diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl.meta deleted file mode 100644 index 639863139..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: bcb8aa9f314d49b4c97aa1f3f3511e7b -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.meta deleted file mode 100644 index e4103cdaf..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 488b9213a64c77540bca3fe167edbe6c -timeCreated: 1475742183 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef deleted file mode 100644 index 6c4dd013f..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Unity.RenderPipelines.HighDefinition.Config.Runtime", - "references": [ - "GUID:df380645f10b7bc4b97d4f5eb6303d95" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [] -} \ No newline at end of file diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef.meta deleted file mode 100644 index 7ab3dfd7d..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/Unity.RenderPipelines.HighDefinition.Config.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a075b55b404a34748ac14ea9b6039911 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests.meta deleted file mode 100644 index b8ceee9e1..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1540e28e550b24d4988ba3ebe600cdcf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/.tests.json b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/.tests.json deleted file mode 100644 index 327abb29e..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/.tests.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "createSeparatePackage": false -} diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor.meta deleted file mode 100644 index afe25c4ec..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 371e84df3ca686146b41f384a7f80ecd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs deleted file mode 100644 index d3ef5fdf2..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs +++ /dev/null @@ -1,13 +0,0 @@ -using NUnit.Framework; -using System.Collections.Generic; -using System.Linq; -using UnityEngine.Rendering; - -namespace UnityEngine.Rendering.HighDefinition.Test -{ - class ConfigurationTest - { - [Test] - public void ValidateConfiguration() {} - } -} diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs.meta deleted file mode 100644 index 3d895ef0e..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/ConfigurationTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ef2aa68b7ea6db343978d6bff1ae0f7c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef deleted file mode 100644 index efffaea95..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests", - "references": [ - "UnityEngine.TestRunner", - "UnityEditor.TestRunner" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [] -} \ No newline at end of file diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef.meta deleted file mode 100644 index fed93b48f..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/Tests/Editor/Unity.RenderPipelines.HighDefinitionConfig.Editor.Tests.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b5e144fbbfa9e24188cdc68fa9a4b3c -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json deleted file mode 100644 index 25a9b709e..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "com.unity.render-pipelines.high-definition-config", - "description": "Configuration files for the High Definition Render Pipeline.", - "version": "10.8.1", - "unity": "2020.3", - "unityRelease": "18f1", - "displayName": "High Definition RP Config", - "dependencies": { - "com.unity.render-pipelines.core": "10.8.1" - }, - "upmCi": { - "footprint": "adeee56b593689c7e6ec370dbb1ce6ce61ac9109" - }, - "repository": { - "url": "https://github.com/Unity-Technologies/Graphics.git", - "type": "git", - "revision": "31a193989d1e4e18ec3dced0f45168f8d2552a9a" - } -} diff --git a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json.meta b/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json.meta deleted file mode 100644 index 21281d76a..000000000 --- a/com.unity.template.renderstreaming-rtx/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: af6e0e6bb9a468845bfb9c9381e3219b -PackageManifestImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Packages/manifest.json b/com.unity.template.renderstreaming-rtx/Packages/manifest.json index 0ddc3272d..8ff5e6608 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/manifest.json +++ b/com.unity.template.renderstreaming-rtx/Packages/manifest.json @@ -6,7 +6,6 @@ "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", "com.unity.render-pipelines.high-definition": "10.8.1", - "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", "com.unity.renderstreaming": "3.1.0-exp.2", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json index 8c5631d0a..e72a1b017 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json +++ b/com.unity.template.renderstreaming-rtx/Packages/packages-lock.json @@ -82,12 +82,13 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.high-definition-config": { - "version": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", - "depth": 0, - "source": "local", + "version": "10.8.1", + "depth": 1, + "source": "registry", "dependencies": { "com.unity.render-pipelines.core": "10.8.1" - } + }, + "url": "https://packages.unity.com" }, "com.unity.renderstreaming": { "version": "3.1.0-exp.2", From bb83e9f96b21e062055c512c367f586baa0ce630 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:28:25 +0900 Subject: [PATCH 6/9] update sample scene on rtx --- .../Assets/Scenes/samplescene.unity | 154 ++++++++++++++++-- .../Scenes/samplesceneSettings.lighting | 63 +++++++ .../Scenes/samplesceneSettings.lighting.meta | 8 + .../SampleScenePostProcessingSettings.asset | 92 ++++++++++- .../SampleSceneSkyandFogSettings.asset | 136 ++++++++++++++-- 5 files changed, 423 insertions(+), 30 deletions(-) create mode 100644 com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting create mode 100644 com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting.meta diff --git a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity index 71b782299..2ad776219 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity +++ b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplescene.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 2035111234} - m_IndirectSpecularColor: {r: 111.97819, g: 143.23413, b: 195.03914, a: 1} + m_IndirectSpecularColor: {r: 131.10217, g: 162.41113, b: 214.89624, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 56e85d5dc4d99b24f9b01a6f086bd74d, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: f0b23a596b117d647a693998ca038b07, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -225,6 +228,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -234,6 +242,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 1 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -242,6 +251,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -252,6 +262,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -391,6 +404,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -439,7 +453,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168218571} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100433} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100438} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -638,6 +652,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -651,6 +669,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -746,6 +767,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -856,6 +879,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -880,6 +904,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &168218576 MeshFilter: m_ObjectHideFlags: 2 @@ -969,6 +994,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1052,7 +1078,7 @@ PrefabInstance: - target: {fileID: 114600619644317088, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} propertyPath: m_Version - value: 10 + value: 11 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96fe51ca2266f2549bb3b93ac7b9eb5b, type: 3} @@ -1300,6 +1326,7 @@ MonoBehaviour: text: {fileID: 1324173305} canvasGroup: {fileID: 1339446596} pointer: {fileID: 217780053} + noticeTouchControl: {fileID: 0} transitionCurve: serializedVersion: 2 m_Curve: @@ -1363,6 +1390,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &700336093 Canvas: m_ObjectHideFlags: 0 @@ -1438,6 +1466,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1514,6 +1543,7 @@ MonoBehaviour: text: {fileID: 91174158} canvasGroup: {fileID: 918770242} pointer: {fileID: 754093947} + noticeTouchControl: {fileID: 0} transitionCurve: serializedVersion: 2 m_Curve: @@ -1577,6 +1607,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &754844282 Canvas: m_ObjectHideFlags: 0 @@ -1665,6 +1696,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1737,7 +1769,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037846703} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870104} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870105} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -1936,6 +1968,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -1949,6 +1985,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2044,6 +2083,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -2154,6 +2195,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2178,6 +2220,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1037846708 MeshFilter: m_ObjectHideFlags: 2 @@ -2367,6 +2410,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2376,6 +2424,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2384,6 +2433,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -2394,6 +2444,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2469,6 +2522,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28e4557ba7cb056499034647b21b6361, type: 3} m_Name: m_EditorClassIdentifier: + audioSource: {fileID: 0} --- !u!114 &1297650286 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2478,7 +2532,7 @@ MonoBehaviour: m_GameObject: {fileID: 1297650280} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3379f8b7ab35724b965e26351c2004e, type: 3} + m_Script: {fileID: 11500000, guid: 64875cfea3598b9419edac2dbbce0413, type: 3} m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} @@ -2547,6 +2601,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2562,6 +2617,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2577,6 +2633,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1394380100} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -2617,7 +2674,7 @@ MonoBehaviour: m_GameObject: {fileID: 1306216641} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3379f8b7ab35724b965e26351c2004e, type: 3} + m_Script: {fileID: 11500000, guid: 64875cfea3598b9419edac2dbbce0413, type: 3} m_Name: m_EditorClassIdentifier: streamingSize: {x: 1280, y: 720} @@ -2694,6 +2751,11 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -2703,6 +2765,7 @@ MonoBehaviour: m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 0 @@ -2711,6 +2774,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + exposureTarget: {fileID: 0} m_RenderingPathCustomFrameSettings: bitDatas: data1: 68906302766941 @@ -2721,6 +2785,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2847,6 +2914,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2862,6 +2930,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2035111233} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -2877,6 +2946,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1394380100} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -2963,6 +3033,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3027,6 +3098,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3412,16 +3484,35 @@ MonoBehaviour: m_GameObject: {fileID: 1696008234} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 --- !u!114 &1696008236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3513,6 +3604,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3537,6 +3629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1715127847 MeshFilter: m_ObjectHideFlags: 0 @@ -3607,6 +3700,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3631,6 +3725,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1742338930 MeshFilter: m_ObjectHideFlags: 0 @@ -3716,6 +3811,7 @@ Light: m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0.53 --- !u!4 &2035111235 @@ -3744,7 +3840,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 10 + m_Version: 11 m_ObsoleteShadowResolutionTier: 2 m_ObsoleteUseShadowQualitySettings: 1 m_ObsoleteCustomShadowResolution: 1024 @@ -3756,10 +3852,12 @@ MonoBehaviour: m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3774,6 +3872,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3792,6 +3893,7 @@ MonoBehaviour: m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 m_EvsmExponent: 15 m_EvsmLightLeakBias: 0 m_EvsmVarianceBias: 0.00001 @@ -3822,8 +3924,13 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 m_ShadowCascadeRatios: - 0.005 - 0.015 @@ -3873,7 +3980,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059789766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.5100431, y: 1.196, z: 1.1760217} + m_LocalPosition: {x: 2.5100436, y: 1.196, z: 1.1760219} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 405591765} @@ -4072,6 +4179,10 @@ MonoBehaviour: captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 resolution: 512 cameraSettings: customRenderingSettings: 0 @@ -4085,6 +4196,9 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4180,6 +4294,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -4290,6 +4406,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4314,6 +4431,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2059789771 MeshFilter: m_ObjectHideFlags: 2 diff --git a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting new file mode 100644 index 000000000..75ba9924e --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: samplesceneSettings + serializedVersion: 3 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 16 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 0 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 300 + m_PVREnvironmentSampleCount: 300 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 2 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 2 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting.meta b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting.meta new file mode 100644 index 000000000..e3608054e --- /dev/null +++ b/com.unity.template.renderstreaming-rtx/Assets/Scenes/samplesceneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0b23a596b117d647a693998ca038b07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleScenePostProcessingSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleScenePostProcessingSettings.asset index e4910ed01..a4b3cdced 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleScenePostProcessingSettings.asset +++ b/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleScenePostProcessingSettings.asset @@ -27,7 +27,7 @@ MonoBehaviour: max: 1 m_MaxSamples: m_OverrideState: 0 - m_Value: 8 + m_Value: 6 min: 3 max: 24 --- !u!114 &11400000 @@ -104,6 +104,11 @@ MonoBehaviour: m_Value: 50 min: 0 max: 50 + minSmoothness: + m_OverrideState: 0 + m_Value: 0.5 + min: 0 + max: 1 --- !u!114 &6640133647794636954 MonoBehaviour: m_ObjectHideFlags: 3 @@ -165,6 +170,58 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + limitMinCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -12 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 18 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + limitMaxCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -8 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 22 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 adaptationMode: m_OverrideState: 0 m_Value: 1 @@ -176,6 +233,39 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 1 min: 0.001 + weightTextureMask: + m_OverrideState: 0 + m_Value: {fileID: 0} + histogramPercentages: + m_OverrideState: 0 + m_Value: {x: 40, y: 90} + min: 0 + max: 100 + histogramUseCurveRemapping: + m_OverrideState: 0 + m_Value: 0 + targetMidGray: + m_OverrideState: 0 + m_Value: 0 + centerAroundExposureTarget: + m_OverrideState: 0 + m_Value: 0 + proceduralCenter: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + proceduralRadii: + m_OverrideState: 0 + m_Value: {x: 0.3, y: 0.3} + maskMinIntensity: + m_OverrideState: 0 + m_Value: -30 + maskMaxIntensity: + m_OverrideState: 0 + m_Value: 30 + proceduralSoftness: + m_OverrideState: 0 + m_Value: 0.5 + min: 0 --- !u!114 &8711377374188185572 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleSceneSkyandFogSettings.asset b/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleSceneSkyandFogSettings.asset index 9ba9208b8..f4274bb43 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleSceneSkyandFogSettings.asset +++ b/com.unity.template.renderstreaming-rtx/Assets/Settings/SampleSceneSkyandFogSettings.asset @@ -33,6 +33,9 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.46608552 min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -49,6 +52,76 @@ MonoBehaviour: hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 54a3a0570aebe8949bec4966f1376581, type: 3} + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + scrollSpeed: + m_OverrideState: 0 + m_Value: 2 + min: 0 + enableBackplate: + m_OverrideState: 0 + m_Value: 0 + backplateType: + m_OverrideState: 0 + m_Value: 0 + groundLevel: + m_OverrideState: 0 + m_Value: 0 + scale: + m_OverrideState: 0 + m_Value: {x: 32, y: 32} + projectionDistance: + m_OverrideState: 0 + m_Value: 16 + min: 0.0000001 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 100 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -102,6 +175,9 @@ MonoBehaviour: m_EditorClassIdentifier: active: 1 m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -114,6 +190,12 @@ MonoBehaviour: hdr: 1 showAlpha: 0 showEyeDropper: 1 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 @@ -137,12 +219,6 @@ MonoBehaviour: maximumHeight: m_OverrideState: 0 m_Value: 50 - albedo: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 250 @@ -150,11 +226,12 @@ MonoBehaviour: enableVolumetricFog: m_OverrideState: 1 m_Value: 1 - anisotropy: - m_OverrideState: 1 - m_Value: 0.6 - min: -1 - max: 1 + albedo: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 @@ -164,8 +241,45 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 64 min: 0.1 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 1 + m_Value: 0.6 + min: -1 + max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 min: 0 max: 1 + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + min: 6.25 + max: 50 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + min: 1 + max: 512 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + min: 0 + max: 1 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + min: 0 + max: 1 + directionalLightsOnly: + m_OverrideState: 0 + m_Value: 0 + filter: + m_OverrideState: 0 + m_Value: 0 From 8e565e2f376222378098d9d7fc1e7518dc7a07d4 Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:35:40 +0900 Subject: [PATCH 7/9] fix doc --- .../Assets/Readme.asset | 8 ++++---- .../ProjectSettings/UnityConnectSettings.asset | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/com.unity.template.renderstreaming-rtx/Assets/Readme.asset b/com.unity.template.renderstreaming-rtx/Assets/Readme.asset index 78ca87509..a65d64875 100644 --- a/com.unity.template.renderstreaming-rtx/Assets/Readme.asset +++ b/com.unity.template.renderstreaming-rtx/Assets/Readme.asset @@ -30,21 +30,21 @@ MonoBehaviour: - heading: text: To read more about Unity RenderStreaming please refer to the manual page. linkText: Unity Render Streaming (English) - url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/index.md + url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.1 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: Unity Render Streaming (Japanese) - url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/jp/index.md + url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.1 - heading: WebRTC Package text: The Unity WebRTC package implements Unity Render Streaming technology and provides C# WebRTC API for you to build WebRTC applications inside Unity. To read more about it please refer to the manual page linkText: WebRTC Package (English) - url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/index.md + url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.4 - heading: text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8" linkText: WebRTC Package (Japanese) - url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/jp/index.md + url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.4 - heading: text: This project uses the Package Manager to bring you the latest features Unity has to offer. Open the Package Manager from Windows > Package Manager diff --git a/com.unity.template.renderstreaming-rtx/ProjectSettings/UnityConnectSettings.asset b/com.unity.template.renderstreaming-rtx/ProjectSettings/UnityConnectSettings.asset index f327fe148..50463a787 100644 --- a/com.unity.template.renderstreaming-rtx/ProjectSettings/UnityConnectSettings.asset +++ b/com.unity.template.renderstreaming-rtx/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,26 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + serializedVersion: 1 + m_Enabled: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 1 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From a9b633f771c5de1ae99e169a352d7c16f1a4c43f Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 09:55:24 +0900 Subject: [PATCH 8/9] only run 2020.3 on yamato --- .yamato/upm-ci-template.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml index 278290885..d6e83f745 100644 --- a/.yamato/upm-ci-template.yml +++ b/.yamato/upm-ci-template.yml @@ -5,6 +5,8 @@ {% for project in template_projects %} {% for editor in editors %} +{% if editor.version == "2020.3" -%} + prepack_{{ project.name }}_{{ editor.version }}: name: Pre-Pack {{ project.packagename }} {{ editor.version }} - Primed Artifacts agent: @@ -97,14 +99,15 @@ trigger_template_test_{{ project.name }}_{{ editor.version }}: - .yamato/upm-ci-template.yml#test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.version }} {% endfor %} {% else -%} - {% for param in platform.test_params %} {% if project.name != "renderstreaming-rtx" %} + {% for param in platform.test_params %} - .yamato/upm-ci-template.yml#test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.version }} - {% endif %} {% endfor %} + {% endif %} {% endif -%} {% endfor %} +{% endif -%} {% endfor %} publish_{{ project.name }}: @@ -130,8 +133,10 @@ publish_{{ project.name }}: - "upm-ci~/templates/*.tgz" dependencies: {% for editor in editors %} + {% if editor.version == "2020.3" %} - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }} + {% endif %} {% endfor %} publish_dryrun_{{ project.name }}: @@ -157,7 +162,10 @@ publish_dryrun_{{ project.name }}: - "upm-ci~/templates/*.tgz" dependencies: {% for editor in editors %} + {% if editor.version == "2020.3" %} - .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }} - .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }} + {% endif %} {% endfor %} + {% endfor %} \ No newline at end of file From c04e7100c830f963fbe49e952a80b34d92a6da0e Mon Sep 17 00:00:00 2001 From: Takashi KANNAN Date: Tue, 15 Feb 2022 14:30:57 +0900 Subject: [PATCH 9/9] update changelog change package version 3.1.0-exp.2 --- .../com.unity.template.renderstreaming-hd/CHANGELOG.md | 8 ++++++++ .../com.unity.template.renderstreaming-hd/package.json | 2 +- .../com.unity.template.renderstreaming-rtx/CHANGELOG.md | 8 ++++++++ .../com.unity.template.renderstreaming-rtx/package.json | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md index ec11ffd8e..19f873a66 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to the render streaming template package will be documented The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.1.0-exp.2] - 2022-02-15 + +### Changed + +- Upgrading Unity version to `2020.3` +- Upgrading RenderStreaming package to `3.1.0-exp.2`. +- Upgrading HDRP package to `10.8.1` + ## [3.0.0] - 2021-03-02 Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from template to package. diff --git a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json index 7192e63d4..024d2e2aa 100644 --- a/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json +++ b/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming-hd/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.template.renderstreaming-hd", "displayName": "Render Streaming HDRP", - "version": "3.1.0-exp.1", + "version": "3.1.0-exp.2", "type": "template", "unity": "2020.3", "description": "This is HDRP sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.", diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md index 4b78b02c0..1e64be727 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to the render streaming template package will be documented The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.1.0-exp.2] - 2022-02-15 + +### Changed + +- Upgrading Unity version to `2020.3` +- Upgrading RenderStreaming package to `3.1.0-exp.2`. +- Upgrading HDRP package to `10.8.1` + ## [3.0.0] - 2021-03-02 Version 3.0.0 has a big change in the package design. This mainly addresses moving scripts from template to package. diff --git a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json index 3b2d17f29..b0b89f8c7 100644 --- a/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json +++ b/com.unity.template.renderstreaming-rtx/Packages/com.unity.template.renderstreaming-rtx/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.template.renderstreaming-rtx", "displayName": "Render Streaming Raytracing", - "version": "3.1.0-exp.1", + "version": "3.1.0-exp.2", "type": "template", "unity": "2020.3", "description": "This is HDRP Raytracing sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.",