diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 684b3ec8..1cc9e81e 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -26,3 +26,4 @@ ### Notes * TRELLIS: added functionality to specify texture baking optimisation total steps as an argument (`texture_opt_total_steps`), to replace the hardcoded 2500. But this is not tracked in Git (because modified this https://github.com/IgorAherne/trellis-stable-projectorz/releases/tag/latest) +* Custom Shader Variant Collection to include glTF-pbrMetallicRoughness shader in build diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index f1407ca9..785b6794 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ab55f63f6e08277d728144e389597009723cfe416181f05f7388bb56f032ee0 -size 68553549 +oid sha256:bbe052996af9fc5aedc6cdb3d837bde651dfa4e285e4b473a2adc3bc642c3ef9 +size 68553734 diff --git a/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants b/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants new file mode 100644 index 00000000..6397e215 --- /dev/null +++ b/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!200 &20000000 +ShaderVariantCollection: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: glTFPbrMetallicRoughness + m_Shaders: + - first: {fileID: -6465566751694194690, guid: b9d29dfa1474148e792ac720cbd45122, + type: 3} + second: + variants: [] diff --git a/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants.meta b/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants.meta new file mode 100644 index 00000000..6390ba84 --- /dev/null +++ b/Assets/_PROJECT/glTFPbrMetallicRoughness.shadervariants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b852f2aeb9fb71a4aaab9e2d500dc3dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 20000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 8b5b84a3..c93ca80a 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:784630e80244c6cd589b3593317380f91e35e6ce272c49298418bda59f9dcb85 -size 3678 +oid sha256:163b47f567f7f00c00bf4ff36a67645fd06e202fbcfdb078b4e9869627096220 +size 3747