diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bb0447b87..fd243d3bcb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,7 @@ jobs: fastlanelane: ${{ steps.version.outputs.fastlanelane}} uid: ${{ steps.github.outputs.uid }} gid: ${{ steps.github.outputs.gid }} + flavors: ${{ steps.flavors.outputs.flavors }} steps: - name: Checkout repository uses: actions/checkout@v4 @@ -155,14 +156,28 @@ jobs: fi echo "uid=$(id -u)" >> $GITHUB_OUTPUT echo "gid=$(id -g)" >> $GITHUB_OUTPUT + + - name: Determine whether to build Development builds or not + id: flavors + run: | + set -x + if [[ $(git log --format=%B ${{ github.event.pull_request.head.sha }} -1) == *'[CI BUILD DEV]'* ]] + then + echo 'flavors=[{"development": true, "title": "Development"}, {"development": false}]' >> $GITHUB_OUTPUT + + else + echo 'flavors=[{"development": false}]' >> $GITHUB_OUTPUT + fi + build: - name: ${{ matrix.name }} + name: ${{ matrix.name }} ${{ matrix.flavors.title }} needs: configuration runs-on: ubuntu-latest strategy: fail-fast: false matrix: - # We don't use an actual matrix because there's more exceptions than actual cases! + flavors: ${{ fromJson(needs.configuration.outputs.flavors) }} + name: [Windows OpenXR, Windows Pimax, Windows Rift, Linux, MacOS, Android OpenXR, Oculus Quest (1), Oculus Quest (2+), Android Pico, Android Pico (CN), iOS Zapbox] # These will all be overwritten, but because we have the flavors matrix as well, we can't just add configurations via include; they'll overwrite each other. This way ensures that we get each one include: - name: Windows OpenXR targetPlatform: StandaloneWindows64 @@ -275,7 +290,7 @@ jobs: lfs: true # We don't use LFS, but it adds no time, and leave it here in case we do at some point later - name: Install Pimax unity package - if: matrix.name == 'Windows Pimax' + if: startsWith(matrix.name, 'Windows Pimax') run: | # version 0.6.3 # Same as above, but adapted to work for Pimax instead. @@ -401,6 +416,11 @@ jobs: run: | echo "stamp=-btb-stamp ${{needs.configuration.outputs.stamp}}" >> $GITHUB_ENV + - name: Enable Development Mode + if: ${{ matrix.flavors.development == true }} + run: | + echo "btbbopts=-btb-bopt Development" >> $GITHUB_ENV + - name: Update version env: VERSION: ${{ needs.configuration.outputs.version}} @@ -445,7 +465,7 @@ jobs: allowDirtyBuild: true # Because of the OVR Update, the build tree might be dirty unityVersion: ${{ env.UNITY_VERSION }} targetPlatform: ${{ matrix.targetPlatform }} - customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ matrix.extraoptions }} + customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ env.btbbopts }} ${{ matrix.extraoptions }} versioning: Custom androidVersionCode: "${{ needs.configuration.outputs.androidVersionCode }}${{ matrix.versionSuffix }}" version: ${{ needs.configuration.outputs.version }} @@ -485,7 +505,7 @@ jobs: allowDirtyBuild: true # Because of the OVR Update, the build tree might be dirty unityVersion: ${{ env.UNITY_VERSION }} targetPlatform: ${{ matrix.targetPlatform }} - customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ matrix.extraoptions }} + customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ env.btbbopts }} ${{ matrix.extraoptions }} versioning: Custom androidVersionCode: "${{ needs.configuration.outputs.androidVersionCode }}${{ matrix.versionSuffix }}" version: ${{ needs.configuration.outputs.version }} @@ -512,7 +532,7 @@ jobs: - name: Upload build/ uses: actions/upload-artifact@v4 with: - name: ${{ matrix.name }} + name: ${{ matrix.name }} ${{ matrix.flavors.title }} path: | build/${{ matrix.vrsdk }} !build/Pico/*.symbols.zip diff --git a/Assets/Resources/UnityGLTF Shader Variants.shadervariants b/Assets/Resources/UnityGLTF Shader Variants.shadervariants new file mode 100644 index 0000000000..9a2f293bcd --- /dev/null +++ b/Assets/Resources/UnityGLTF Shader Variants.shadervariants @@ -0,0 +1,373 @@ +%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: UnityGLTF Shader Variants + m_Shaders: + - first: {fileID: -6465566751694194690, guid: 59541e6caf586ca4f96ccf48a4813a51, + type: 3} + second: + variants: + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _TEXTURE_TRANSFORM_ON + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _VERTEX_COLORS_ON + passType: 4 + - keywords: SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_DEPTH _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _VERTEX_COLORS_ON + passType: 8 + - keywords: _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _VERTEX_COLORS_ON + passType: 13 + - first: {fileID: -6465566751694194690, guid: 478ce3626be7a5f4ea58d6b13f05a2e4, + type: 3} + second: + variants: + - keywords: DIRECTIONAL INSTANCING_ON LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL INSTANCING_ON LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _CLEARCOAT_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _IRIDESCENCE_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _SPECULAR_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _SPECULAR_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ADDITIONAL_LIGHTS_VERTEX + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_ALPHATEST_ON + _BUILTIN_AlphaClip _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_ALPHATEST_ON + _BUILTIN_AlphaClip _CLEARCOAT_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_ALPHATEST_ON + _BUILTIN_AlphaClip _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_ALPHATEST_ON + _BUILTIN_AlphaClip _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_ALPHATEST_ON + _BUILTIN_AlphaClip _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _BUILTIN_SURFACE_TYPE_TRANSPARENT + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _CLEARCOAT_ON + _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _CLEARCOAT_ON + _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _CLEARCOAT_ON + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _CLEARCOAT_ON + _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _IRIDESCENCE_ON + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _IRIDESCENCE_ON + _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _SPECULAR_ON + _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _SPECULAR_ON + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _SPECULAR_ON + _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _TEXTURE_TRANSFORM_ON + _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _VERTEX_COLORS_ON + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ADDITIONAL_LIGHTS_VERTEX _VERTEX_COLORS_ON + _VOLUME_TRANSMISSION_ON + passType: 4 + - keywords: SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _CLEARCOAT_ON + _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _CLEARCOAT_ON + _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _TEXTURE_TRANSFORM_ON + _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _VERTEX_COLORS_ON + _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _BUILTIN_SURFACE_TYPE_TRANSPARENT _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _CLEARCOAT_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _CLEARCOAT_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _IRIDESCENCE_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _IRIDESCENCE_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _SPECULAR_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _SPECULAR_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _SPECULAR_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: SHADOWS_DEPTH _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _VERTEX_COLORS_ON + passType: 8 + - keywords: SHADOWS_DEPTH _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 8 + - keywords: _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON + _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _CLEARCOAT_ON _VERTEX_COLORS_ON + _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _TEXTURE_TRANSFORM_ON + _VERTEX_COLORS_ON + passType: 13 + - keywords: _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _VERTEX_COLORS_ON + passType: 13 + - keywords: _BUILTIN_ALPHATEST_ON _BUILTIN_AlphaClip _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _BUILTIN_SURFACE_TYPE_TRANSPARENT _VERTEX_COLORS_ON + passType: 13 + - keywords: _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _CLEARCOAT_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _CLEARCOAT_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _CLEARCOAT_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _IRIDESCENCE_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _IRIDESCENCE_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _SPECULAR_ON _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _SPECULAR_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _SPECULAR_ON _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - keywords: _TEXTURE_TRANSFORM_ON _VERTEX_COLORS_ON + passType: 13 + - keywords: _VERTEX_COLORS_ON + passType: 13 + - keywords: _VERTEX_COLORS_ON _VOLUME_TRANSMISSION_ON + passType: 13 + - first: {fileID: 4800000, guid: 9836e4430eb58204086d7d1440e16a4f, type: 3} + second: + variants: + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _METALLICGLOSSMAP _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _METALLICGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _METALLICGLOSSMAP + _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _METALLICGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _NORMALMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _METALLICGLOSSMAP + _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _METALLICGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _METALLICGLOSSMAP _NORMALMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _METALLICGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _METALLICGLOSSMAP + _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _METALLICGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _METALLICGLOSSMAP _NORMALMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _METALLICGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _EMISSION _METALLICGLOSSMAP _NORMALMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _EMISSION _METALLICGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _EMISSION _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _METALLICGLOSSMAP _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _METALLICGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _VERTEX_COLORS + passType: 4 + - keywords: SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHABLEND_ON + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHABLEND_ON _METALLICGLOSSMAP + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHATEST_ON + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHATEST_ON _METALLICGLOSSMAP + passType: 8 + - keywords: SHADOWS_DEPTH _METALLICGLOSSMAP + passType: 8 + - first: {fileID: 4800000, guid: 0ffe2976cdefd434c8fcd886ffa69322, type: 3} + second: + variants: + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _NORMALMAP _SPECGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _SPECGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _EMISSION + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _NORMALMAP + _SPECGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _NORMALMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _ALPHATEST_ON _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _NORMALMAP _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _NORMALMAP _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _SPECGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _NORMALMAP _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _EMISSION _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _NORMALMAP _SPECGLOSSMAP + _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _SPECGLOSSMAP _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _ALPHABLEND_ON _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _EMISSION _VERTEX_COLORS + passType: 4 + - keywords: DIRECTIONAL LIGHTPROBE_SH _NORMALMAP _VERTEX_COLORS + passType: 4 + - keywords: SHADOWS_DEPTH + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHABLEND_ON + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHABLEND_ON _SPECGLOSSMAP + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHATEST_ON + passType: 8 + - keywords: SHADOWS_DEPTH _ALPHATEST_ON _SPECGLOSSMAP + passType: 8 + - keywords: SHADOWS_DEPTH _SPECGLOSSMAP + passType: 8 diff --git a/Assets/Resources/UnityGLTF Shader Variants.shadervariants.meta b/Assets/Resources/UnityGLTF Shader Variants.shadervariants.meta new file mode 100644 index 0000000000..7374127758 --- /dev/null +++ b/Assets/Resources/UnityGLTF Shader Variants.shadervariants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50c1871ff497bb148bbc360a37a4e46d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/VrSdk.cs b/Assets/Scripts/VrSdk.cs index 4bae5df9fa..faa874e792 100644 --- a/Assets/Scripts/VrSdk.cs +++ b/Assets/Scripts/VrSdk.cs @@ -230,9 +230,6 @@ void Awake() var unused = msg.Data.AgeCategory; }); } -#if PASSTHROUGH_SUPPORTED - OVRManager.eyeFovPremultipliedAlphaModeEnabled = false; -#endif #endif // OCULUS_SUPPORTED