diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset index b6bd97a9212..e4537e82890 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/DeferredRenderer.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: DeferredRenderer m_EditorClassIdentifier: debugShaders: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset index bd82fa01769..a4e7b67d147 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ForwardRenderer.asset @@ -9,9 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: ForwardRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -26,8 +29,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -44,4 +51,7 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 1 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset index 521c95cd980..a94fffa3d43 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/UniversalRPAsset.asset @@ -34,6 +34,7 @@ MonoBehaviour: m_RequireOpaqueTexture: 1 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 + m_StoreActionsOptimization: 0 m_SupportsHDR: 1 m_MSAA: 4 m_RenderScale: 1 @@ -58,9 +59,12 @@ MonoBehaviour: m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 1 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 + m_SupportsLightLayers: 0 m_DebugLevel: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 @@ -72,4 +76,5 @@ MonoBehaviour: m_MaxPixelLights: 4 m_ShadowAtlasResolution: 2048 m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 m_ShadowCascades: 3 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader new file mode 100644 index 00000000000..ad838590b15 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader @@ -0,0 +1,97 @@ +Shader "Universal Render Pipeline/Test/Zero Variant Color Texture Alpha Only" +{ + Properties + { + [MainTexture] _BaseMap("Texture", 2D) = "white" {} + [MainColor] _BaseColor("Color", Color) = (1, 1, 1, 1) + _Cutoff("AlphaCutout", Range(0.0, 1.0)) = 0.0 + + // BlendMode + _Surface("__surface", Float) = 0.0 + _Blend("__mode", Float) = 0.0 + _Cull("__cull", Float) = 2.0 + [HideInInspector] _AlphaClip("__clip", Float) = 1.0 + [HideInInspector] _BlendOp("__blendop", Float) = 0.0 + [HideInInspector] _SrcBlend("__src", Float) = 1.0 + [HideInInspector] _DstBlend("__dst", Float) = 0.0 + [HideInInspector] _ZWrite("__zw", Float) = 1.0 + + // Editmode props + _QueueOffset("Queue offset", Float) = 0.0 + } + + HLSLINCLUDE + #include "Packages/com.unity.render-pipelines.universal/Shaders/UnlitInput.hlsl" + #pragma target 2.0 + + struct Attributes + { + float4 positionOS : POSITION; + float2 uv : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + Varyings Vert(Attributes input) + { + Varyings output = (Varyings)0; + + UNITY_SETUP_INSTANCE_ID(input); + UNITY_TRANSFER_INSTANCE_ID(input, output); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); + + output.positionCS = vertexInput.positionCS; + output.uv = TRANSFORM_TEX(input.uv, _BaseMap); + return output; + } + + half4 Frag(Varyings input) : SV_Target + { + UNITY_SETUP_INSTANCE_ID(input); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + + half2 uv = input.uv; + half4 texColor = SAMPLE_TEXTURE2D(_BaseMap, sampler_BaseMap, uv); + half3 color = texColor.rgb * _BaseColor.rgb; + half alpha = texColor.a * _BaseColor.a; + clip(alpha - _Cutoff); + half4 finalColor = half4(color, alpha); + return finalColor; + } + + ENDHLSL + + SubShader + { + Tags {"RenderType" = "Opaque" "IgnoreProjector" = "True" "RenderPipeline" = "UniversalPipeline" "ShaderModel"="2.0"} + LOD 100 + + Blend [_SrcBlend][_DstBlend] + ZWrite [_ZWrite] + Cull [_Cull] + + Pass + { + Name "ZeroVariantColorTexAlphaOnly" + + HLSLPROGRAM + #pragma vertex Vert + #pragma fragment Frag + ENDHLSL + } + } + + FallBack "Hidden/Universal Render Pipeline/FallbackError" + CustomEditor "UnityEditor.Rendering.Universal.ShaderGUI.UnlitShader" +} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader.meta new file mode 100644 index 00000000000..4ab84183423 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/ZeroVariantColorTextureAlphaOnly.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fa7f99fc1d21347f7bf6e7dc00f76a51 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders.png index 62263069496..e126d5e366e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:120a173804a0341543a97efa32f04bec5ee3494cada0495e30c138402807e98d -size 361264 +oid sha256:d386b4a2a24a0738faeb0172ea6178c7ca04095f11b0373486ed28d7a5ae6342 +size 355322 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..cba254087dd --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1364f9089ba1baf11a6078c479e195bdbb96d5d7d3bc211048e7c165d108c204 +size 289646 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..56bb2a46c25 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: cf3102d256748443d8a2d69cab5d2f22 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_deferred.png index 62263069496..e126d5e366e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:120a173804a0341543a97efa32f04bec5ee3494cada0495e30c138402807e98d -size 361264 +oid sha256:d386b4a2a24a0738faeb0172ea6178c7ca04095f11b0373486ed28d7a5ae6342 +size 355322 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png index 945bf90de18..9348d6d0b24 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:260496657e52488413000e80876859fe234fe3fb877c3035d2a72f5aec2b1a4c -size 367206 +oid sha256:f81757698a337a2c029cf3089f6b558636616efeab5ca34ead791805595e07a0 +size 360396 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..affd7b149fa --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:377c28a6bf5eaa969933c200c64adc698ed6669c246e862cbb9472225ee94960 +size 293038 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..d89efe6db6e --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: fcb4ed7b09193456cb82720455f04352 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_deferred.png index 36591a380e2..e126d5e366e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37d01d8a05a25a4c19fbe51e9ad411bc2bcb00fc3e5fee813e9e8c107a89a7fc -size 362011 +oid sha256:d386b4a2a24a0738faeb0172ea6178c7ca04095f11b0373486ed28d7a5ae6342 +size 355322 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders.png index f71b6b95e31..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcc782eed759a7ff7c9a440189280d4428cc5ec504010b5f4d9e1ba3af0cdab -size 350899 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..c8088e323ad --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: f5d6eea8fac1d475ebbf70e8d61996ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_deferred.png index d70b584f020..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c0ae2386c13179161a8d01f54c68bfad33cdf7ea5d351299afd1f1b62ec21e -size 351033 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders.png index 62953dd74c0..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b92472a3d014fc75ca84b1d6d5141484bda28d8f7d1118431f2a1a1821572b0a -size 363696 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..20b852ee3f9 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 9967bc207a12d48a09243ebdafde7010 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png index 19f58db116d..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9064e6d71cc170e179ab6bcf7f79a8d0132241bf2df45b9a81d0ca8e742ffb77 -size 363473 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders.png index 62953dd74c0..aa04a9da9d0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b92472a3d014fc75ca84b1d6d5141484bda28d8f7d1118431f2a1a1821572b0a -size 363696 +oid sha256:47cba98de1a7042480d18a9eda1ef5635edbe4e3634aa4621fa46849c74d2b84 +size 362474 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..745daf21a14 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4759e5b700b3f2723040a82ad362b10c58125bf040201b392758de323390154 +size 296966 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..88f61f6ede3 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 45d11fe0565474023bacbebca5284785 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png index c37008c4649..2b2406d8957 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ecbdb3f6635d1343aa797f7548aaac954ebf14dd7a9c13cb3d137b6a28d6a5 -size 364237 +oid sha256:428aa1d04d9978f98269f46de6409e6004f2353cbf117c48300db4e48e0dfcc1 +size 362984 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders.png index 4abc6faf91a..cfcea85c4b5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf1a72bc9852e9d21dce2a510142d87798c3a4ff25ba9d553336f51777f96394 -size 374714 +oid sha256:cd3b2a057dc9bcc3899d4ee320bd80cb364d7a3d5b3ed0b47b6dfd05d1c1eaf0 +size 373195 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..006cd9cf105 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d7afacc517a38334f35d19da8a36b593b571ba7008173ceb4969791aace22b7 +size 308408 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..bf4aa9c2e0c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 6d38bd007b991464a9c7127f936d1cf2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_deferred.png index 4abc6faf91a..6be3368819b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf1a72bc9852e9d21dce2a510142d87798c3a4ff25ba9d553336f51777f96394 -size 374714 +oid sha256:3e273f7b375b6b49bf22538ef589902c0202d6ed14d968be59e889a63d067aea +size 373422 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png.meta index df0749b74c6..33830c8ff77 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,7 +39,7 @@ TextureImporter: wrapU: 0 wrapV: 0 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -68,7 +69,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders.png index 028744ad7ff..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..b4143d4ec8b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 9d0f92b5c5ffa4c368b11f53880704a9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_deferred.png index 028744ad7ff..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders.png index 028744ad7ff..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..8a58c673356 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 85d908c37cedb4a13b1ff2fa1c3393a2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_deferred.png index 028744ad7ff..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders.png index 028744ad7ff..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..1e1715f4574 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 6887a7b7fb4534cf391940750a93d7b6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_deferred.png index 028744ad7ff..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders.png index 62953dd74c0..26d9bfba98c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b92472a3d014fc75ca84b1d6d5141484bda28d8f7d1118431f2a1a1821572b0a -size 363696 +oid sha256:abfa0bd581ffbf73a4fdc8d8c9ce419e205c0de9b91b56176a3e6f2ef1fbae9f +size 372502 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..1508841633d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d74651d162f94539e90643960c5d4f3e41c2b975795d2a4384978598c6d4de +size 306542 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..fa3f78a1e10 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 97153c59aaed74c30a3b975f7d0427e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png index 55ab9f95d52..0373d282dca 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fdba005f395c984ad366423f87d9622b63df80391974a6aaa1dbabd2da9455a -size 363734 +oid sha256:830ab79e9df5b52652745b8d995e81c5f478d0400c395f7bc5acf6da3f8c1b3e +size 372739 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders.png index 028744ad7ff..33567aa9571 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:54035e7cb84b6eb7c1e4d9e9d05c0d7c9187bf198146670d0f4d22c474ec622b +size 373128 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..db1490e3b17 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ced0b0166db46d28720dd0b647f8246c9cff36c4504a5059cd22acf635243227 +size 306683 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..ee5f728687d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 70a53ad69572140dca79fbfa59b1729e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_deferred.png index 028744ad7ff..3fe19da595d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:6d0f9954ffab4c3a59886b1fac3d4ec285dabffcba405b3e5882d2c257e2dd47 +size 373425 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders.png index 028744ad7ff..33567aa9571 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:54035e7cb84b6eb7c1e4d9e9d05c0d7c9187bf198146670d0f4d22c474ec622b +size 373128 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..db1490e3b17 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ced0b0166db46d28720dd0b647f8246c9cff36c4504a5059cd22acf635243227 +size 306683 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..75c5f34f9ec --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: c38493ec860774f518dd86611dfbc914 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_deferred.png index 028744ad7ff..3fe19da595d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cc9f3eae7cd0ffc84d6be2be37dd6ad65692cb9fcd8fa9046d9c2d1783886ea -size 374094 +oid sha256:6d0f9954ffab4c3a59886b1fac3d4ec285dabffcba405b3e5882d2c257e2dd47 +size 373425 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders.png index 62953dd74c0..aa04a9da9d0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b92472a3d014fc75ca84b1d6d5141484bda28d8f7d1118431f2a1a1821572b0a -size 363696 +oid sha256:47cba98de1a7042480d18a9eda1ef5635edbe4e3634aa4621fa46849c74d2b84 +size 362474 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png new file mode 100644 index 00000000000..745daf21a14 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4759e5b700b3f2723040a82ad362b10c58125bf040201b392758de323390154 +size 296966 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta new file mode 100644 index 00000000000..71ea8e5075c --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_RT.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 15843454b20f04992ac878bc49e06170 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png index c37008c4649..2b2406d8957 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/035_Shader_TerrainShaders_deferred.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0ecbdb3f6635d1343aa797f7548aaac954ebf14dd7a9c13cb3d137b6a28d6a5 -size 364237 +oid sha256:428aa1d04d9978f98269f46de6409e6004f2353cbf117c48300db4e48e0dfcc1 +size 362984 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat new file mode 100644 index 00000000000..10c529e5d23 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6275321330345205954 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ErrorBackplane + m_Shader: {fileID: 4800000, guid: fa7f99fc1d21347f7bf6e7dc00f76a51, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + 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_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendA: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PreserveSpecular: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendA: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat.meta new file mode 100644 index 00000000000..a478ac3ecfd --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/ErrorBackplane.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6cd6aedaf320435c91633f1fb147d58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture new file mode 100644 index 00000000000..3b3ae969f62 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TerrainRT + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 92 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture.meta new file mode 100644 index 00000000000..9aea56b1ce1 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRT.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0654fa27bfd6498ca790e138ab90c16 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat new file mode 100644 index 00000000000..3ca015dd8dd --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-179381495631947307 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TerrainRTMaterial + m_Shader: {fileID: 4800000, guid: fa7f99fc1d21347f7bf6e7dc00f76a51, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 8400000, guid: a0654fa27bfd6498ca790e138ab90c16, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: a0654fa27bfd6498ca790e138ab90c16, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + 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_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 1 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendA: 10 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PreserveSpecular: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _SampleGI: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _SrcBlendA: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat.meta new file mode 100644 index 00000000000..ce099a02196 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/TerrainRTMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0da684b5370aa45629eb118c78cf2ac5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity new file mode 100644 index 00000000000..a50e202c34d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity @@ -0,0 +1,938 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.14995676, g: 0.16868494, b: 0.17473541, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000002, guid: 7932049343d2440b5906dd159645b31c, + type: 2} + m_LightingSettings: {fileID: 1787523002} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &218303291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 218303295} + - component: {fileID: 218303294} + - component: {fileID: 218303293} + - component: {fileID: 218303292} + m_Layer: 0 + m_Name: RTPlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &218303292 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218303291} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &218303293 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218303291} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0da684b5370aa45629eb118c78cf2ac5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &218303294 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218303291} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &218303295 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218303291} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: -9.65, y: 2.93, z: -11} + m_LocalScale: {x: 1.6, y: 1, z: 0.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} +--- !u!1 &730573705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 730573707} + - component: {fileID: 730573706} + m_Layer: 0 + m_Name: Resolution setter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &730573706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730573705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b7a791aa4ee448a7a269341301b2063, type: 3} + m_Name: + m_EditorClassIdentifier: + customResolutionSettings: {fileID: 11400000, guid: 8dcce3608cb704185b3d9e120ecfddd3, + type: 2} +--- !u!4 &730573707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730573705} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &745712510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745712513} + - component: {fileID: 745712512} + - component: {fileID: 745712511} + m_Layer: 0 + m_Name: Terrain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!154 &745712511 +TerrainCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745712510} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 15600000, guid: 314a80b2b890a47b298a7e557e06ba81, type: 2} + m_EnableTreeColliders: 1 +--- !u!218 &745712512 +Terrain: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745712510} + m_Enabled: 1 + serializedVersion: 6 + m_TerrainData: {fileID: 15600000, guid: 314a80b2b890a47b298a7e557e06ba81, type: 2} + m_TreeDistance: 2000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_ShadowCastingMode: 2 + m_DrawHeightmap: 1 + m_DrawInstanced: 1 + m_DrawTreesAndFoliage: 1 + m_StaticShadowCaster: 0 + m_ReflectionProbeUsage: 3 + m_MaterialTemplate: {fileID: 2100000, guid: cb8e173bc45d94b97a9d40464cf26218, type: 2} + m_BakeLightProbesForTrees: 1 + m_PreserveTreePrototypeLayers: 0 + m_DeringLightProbesForTrees: 1 + m_ScaleInLightmap: 0.0512 + m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + m_GroupingID: 0 + m_RenderingLayerMask: 1 + m_AllowAutoConnect: 0 +--- !u!4 &745712513 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745712510} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &838262085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838262087} + - component: {fileID: 838262086} + - component: {fileID: 838262088} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &838262086 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838262085} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.7060414, b: 0.334, a: 1} + m_Intensity: 4 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.802082 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 5 +--- !u!4 &838262087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838262085} + m_LocalRotation: {x: 0.020243749, y: 0.7230179, z: -0.02120609, w: 0.690207} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 3.36, y: 92.66, z: 0} +--- !u!114 &838262088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838262085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!1 &864123423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 864123427} + - component: {fileID: 864123426} + - component: {fileID: 864123425} + - component: {fileID: 864123424} + m_Layer: 0 + m_Name: ErrorBackPlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &864123424 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864123423} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &864123425 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864123423} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e6cd6aedaf320435c91633f1fb147d58, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &864123426 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864123423} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &864123427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864123423} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: -9.7, y: 2.93, z: -11} + m_LocalScale: {x: 2, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} +--- !u!1 &892219859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 892219861} + - component: {fileID: 892219860} + m_Layer: 0 + m_Name: Light Probe Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!220 &892219860 +LightProbeGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892219859} + m_Enabled: 1 + m_SourcePositions: + - {x: 5.2388563, y: 2.6768246, z: 4.4777656} + - {x: 5.2388563, y: 2.6768246, z: -0.092954636} + - {x: 5.2388563, y: 0.67682457, z: 4.4777656} + - {x: 5.2388563, y: 0.67682457, z: -0.092954636} + - {x: -0.14775085, y: 2.6768246, z: 4.4777656} + - {x: -0.14775085, y: 2.4164584, z: 1.6219276} + - {x: -0.14775085, y: 0.67682457, z: 4.4777656} + - {x: -0.14775085, y: 0.67682457, z: -0.092954636} + - {x: -5.6201262, y: 2.6768246, z: 4.4777656} + - {x: -5.6201262, y: 2.6768246, z: -0.092954636} + - {x: -5.6201262, y: 0.67682457, z: 4.4777656} + - {x: -5.6201262, y: 0.67682457, z: -0.092954636} + - {x: 1.4600544, y: 4.195774, z: 1.5944017} + - {x: 1.4600544, y: 2.1957743, z: 1.5944017} + - {x: -0.14775085, y: 2.6768246, z: -4.7355137} + - {x: -0.14775085, y: 0.67682457, z: -4.7355137} + - {x: -5.6201262, y: 2.6768246, z: -4.7355137} + - {x: -5.6201262, y: 0.67682457, z: -4.7355137} + - {x: 5.2388563, y: 2.6768246, z: -4.7355137} + - {x: 5.2388563, y: 0.67682457, z: -4.7355137} + - {x: -1.7744184, y: 4.1885567, z: 1.5944017} + - {x: -1.7744184, y: 2.188557, z: 1.5944017} + - {x: 1.4600544, y: 4.195774, z: -2.0023122} + - {x: 1.4600544, y: 2.1957743, z: -2.0023122} + - {x: -0.14775085, y: 2.4164584, z: -1.9747862} + - {x: -1.7744184, y: 4.1885567, z: -2.0023122} + - {x: -1.7744184, y: 2.188557, z: -2.0023122} + m_Dering: 0 +--- !u!4 &892219861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892219859} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1368807765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368807770} + - component: {fileID: 1368807769} + - component: {fileID: 1368807768} + - component: {fileID: 1368807771} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1368807768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368807765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 640 + TargetHeight: 360 + PerPixelCorrectnessThreshold: 0.005 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 + AverageCorrectnessThreshold: 0.001 + IncorrectPixelsThreshold: 0.0000038146973 + UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 + WaitFrames: 5 + XRCompatible: 0 + CheckMemoryAllocation: 1 +--- !u!20 &1368807769 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368807765} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 50 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1368807770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368807765} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 2.93, z: -11} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &1368807771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368807765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!850595691 &1787523002 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + serializedVersion: 3 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 0 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + 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: 500 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 1 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 +--- !u!1 &1916929541 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1916929544} + - component: {fileID: 1916929543} + - component: {fileID: 1916929542} + m_Layer: 0 + m_Name: Main Camera RT + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1916929542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916929541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!20 &1916929543 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916929541} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.6462264, g: 0.8022481, b: 1, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 50 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: a0654fa27bfd6498ca790e138ab90c16, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1916929544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916929541} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.93, z: -11} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity.meta new file mode 100644 index 00000000000..57f0cec2903 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders_RT.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f04023880f698465dab01fc276e5541c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset index b7431fa9a8d..75e7ab25c92 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthNormalsRenderer.asset @@ -9,9 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: DepthNormalsRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: - {fileID: 7456660863052077093} m_RendererFeatureMap: 25d8c6408c617b67 @@ -26,8 +29,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -44,7 +51,10 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 1 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 --- !u!114 &7456660863052077093 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset index a45a42461c6..dc1dd9dbe56 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/DepthRenderer.asset @@ -9,9 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: DepthRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: - {fileID: 1912622647174990926} m_RendererFeatureMap: 4e8c3b022a008b1a @@ -26,8 +29,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -44,7 +51,10 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 0 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 --- !u!114 &1912622647174990926 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset index c80c20a9c0d..eaf3c00939b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DeferredRenderer.asset @@ -26,9 +26,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: SSAO_DeferredRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: - {fileID: 3778245575090843755} - {fileID: -638104044694843295} @@ -45,8 +48,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -63,7 +70,10 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 0 m_RenderingMode: 1 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 --- !u!114 &3778245575090843755 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset index 36bb5451db5..8e6945962cb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthNormalRenderer.asset @@ -32,9 +32,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: SSAO_DepthNormalRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: - {fileID: -1872376063803869872} - {fileID: 5568179863035868408} @@ -51,8 +54,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -69,7 +76,10 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 0 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 --- !u!114 &5568179863035868408 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset index d30d946dddd..b8bf67fc2bb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/200_Assets/Renderers/SSAO_DepthRenderer.asset @@ -26,9 +26,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: SSAO_DepthRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: - {fileID: 339116797255187971} - {fileID: -7210456701355759144} @@ -45,8 +48,12 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 370f7a9cc4e362d488af024d371091e8, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: c6e57f5bdbd2a284a86a3097c03884c8, + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_OpaqueLayerMask: serializedVersion: 2 @@ -63,7 +70,10 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 0 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 --- !u!114 &339116797255187971 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferDeferred.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferDeferred.asset index 529bfe8e49b..c573487ea3a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferDeferred.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferDeferred.asset @@ -32,7 +32,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: DBufferDeferred m_EditorClassIdentifier: debugShaders: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferForward.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferForward.asset index da5726e5e97..8cad546f1db 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferForward.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/DBufferForward.asset @@ -32,7 +32,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: DBufferForward m_EditorClassIdentifier: debugShaders: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceDeferred.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceDeferred.asset index 0aa40523d6b..ea7e0145087 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceDeferred.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceDeferred.asset @@ -32,7 +32,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: ScreenSpaceDeferred m_EditorClassIdentifier: debugShaders: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceForward.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceForward.asset index 6d62702f1f2..02ccf6e4fb5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceForward.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/ScreenSpaceForward.asset @@ -32,7 +32,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: ScreenSpaceForward m_EditorClassIdentifier: debugShaders: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset index e845351a316..f84421db028 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 1 - k_AssetPreviousVersion: 1 + k_AssetVersion: 2 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -22,4 +21,7 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 supportRuntimeDebugDisplay: 0 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json index 361f77bd84f..8373dfedacd 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest_Terrain/Packages/manifest.json @@ -1,60 +1,60 @@ { - "disableProjectUpdate": true, - "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.9", - "com.unity.ide.vscode": "1.2.3", - "com.unity.nuget.newtonsoft-json": "2.0.1-preview.1", - "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", - "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", - "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.testing.urp": "file:../../../com.unity.testing.urp", - "com.unity.test-framework": "1.1.18", - "com.unity.test-framework.build": "0.0.1-preview.14", - "com.unity.test-framework.utp-reporter": "1.0.2-preview", - "com.unity.testframework.graphics": "7.8.14-preview", - "com.unity.testing.xr": "file:../../../com.unity.testing.xr", - "com.unity.ugui": "1.0.0", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, - "testables": [ - "com.unity.render-pipelines.core", - "com.unity.render-pipelines.universal", - "com.unity.testframework.graphics", - "com.unity.testing.xr", - "com.unity.testing.urp" - ] + "disableProjectUpdate": true, + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ext.nunit": "1.0.0", + "com.unity.ide.rider": "3.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.4", + "com.unity.nuget.newtonsoft-json": "2.0.1-preview.1", + "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", + "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", + "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.test-framework": "1.1.29", + "com.unity.test-framework.build": "0.0.1-preview.14", + "com.unity.test-framework.utp-reporter": "1.1.0-preview", + "com.unity.testframework.graphics": "7.8.16-preview", + "com.unity.testing.urp": "file:../../../com.unity.testing.urp", + "com.unity.testing.xr": "file:../../../com.unity.testing.xr", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "testables": [ + "com.unity.render-pipelines.core", + "com.unity.render-pipelines.universal", + "com.unity.testframework.graphics", + "com.unity.testing.xr", + "com.unity.testing.urp" + ] } diff --git a/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/EditorBuildSettings.asset index cf9c6c3036b..d77309bf0ae 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/035_Shader_TerrainShaders_deferred.unity guid: fa7b4e9f812398d41bdc005faebd62aa + - enabled: 1 + path: Assets/Scenes/035_Shader_TerrainShaders_RT.unity + guid: f04023880f698465dab01fc276e5541c - enabled: 1 path: Assets/Scenes/038_Shader_TerrainBlend.unity guid: 5578c9d8b0329024d8020e3094f70302 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/GraphicsSettings.asset b/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/GraphicsSettings.asset index a6fe9674835..09278d8fd88 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/GraphicsSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Terrain/ProjectSettings/GraphicsSettings.asset @@ -118,3 +118,6 @@ GraphicsSettings: m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: {} + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: f5b86699a4e003a41936fffd835d4ba9, + type: 2} diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 62113f7dd04..fe7cc2d5623 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - URP global setting for stripping post processing shader variants. - URP global setting for stripping off shader variants. +- Terrain grass shader alpha changed to always write 1 to alpha. Enabled alpha channel write mask. ### Changed - Removed experimental tile deferred code. diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader index 2225c75bf96..4870e7f3206 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader @@ -1,4 +1,4 @@ -// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) +// Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass" { Properties @@ -13,8 +13,6 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass" Tags {"Queue" = "Geometry+200" "RenderType" = "Grass" "IgnoreProjector" = "True" "RenderPipeline" = "UniversalPipeline" "UniversalMaterialType" = "SimpleLit" }//"DisableBatching"="True" Cull Off LOD 200 - AlphaTest Greater [_Cutoff] - ColorMask RGB Pass { diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader index 1fdaf6fb3d8..3a447789a35 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader @@ -1,4 +1,4 @@ -// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) +// Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) Shader "Hidden/TerrainEngine/Details/UniversalPipeline/BillboardWavingDoublePass" { Properties @@ -13,8 +13,6 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/BillboardWavingDoublePass Tags {"Queue" = "Geometry+200" "RenderType" = "GrassBillBoard" "IgnoreProjector" = "True" "RenderPipeline" = "UniversalPipeline" "UniversalMaterialType" = "SimpleLit" }//"DisableBatching"="True" Cull Off LOD 200 - AlphaTest Greater [_Cutoff] - ColorMask RGB Pass { diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl index f4be6707e11..8ecf5cfa9ae 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassPasses.hlsl @@ -217,7 +217,7 @@ half4 LitPassFragmentGrass(GrassVertexOutput input) : SV_Target #else half4 color = UniversalFragmentBlinnPhong(inputData, surfaceData); color.rgb = MixFog(color.rgb, inputData.fogCoord); - return color; + return half4(color.rgb, 1); #endif };