diff --git a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs index 13367b7e2ac..e003810517d 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs @@ -196,7 +196,6 @@ internal void SetVolumeProfile(VolumeProfile p) static Dictionary s_ParameterDrawers; SupportedOnRenderPipelineAttribute m_SupportedOnRenderPipelineAttribute; - Type[] m_LegacyPipelineTypes; static VolumeComponentEditor() { @@ -274,11 +273,6 @@ internal void Init() var volumeComponentType = volumeComponent.GetType(); m_SupportedOnRenderPipelineAttribute = volumeComponentType.GetCustomAttribute(); - -#pragma warning disable CS0618 - var supportedOn = volumeComponentType.GetCustomAttribute(); - m_LegacyPipelineTypes = supportedOn != null ? supportedOn.pipelineTypes : Array.Empty(); -#pragma warning restore CS0618 } internal void DetermineVisibility(Type renderPipelineAssetType, Type renderPipelineType) @@ -295,12 +289,6 @@ internal void DetermineVisibility(Type renderPipelineAssetType, Type renderPipel return; } - if (renderPipelineType != null && m_LegacyPipelineTypes.Length > 0) - { - visible = m_LegacyPipelineTypes.Contains(renderPipelineType); - return; - } - visible = true; } @@ -451,12 +439,12 @@ public virtual GUIContent GetDisplayTitle() var displayInfo = volumeComponentType.GetCustomAttribute(); if (displayInfo != null && !string.IsNullOrWhiteSpace(displayInfo.name)) return EditorGUIUtility.TrTextContent(displayInfo.name, string.Empty); - + #pragma warning disable CS0618 if (!string.IsNullOrWhiteSpace(volumeComponent.displayName)) return EditorGUIUtility.TrTextContent(volumeComponent.displayName, string.Empty); #pragma warning restore CS0618 - + return EditorGUIUtility.TrTextContent(ObjectNames.NicifyVariableName(volumeComponentType.Name) , string.Empty); } diff --git a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs index f7f1082c6dc..6f88e6c5c0d 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs @@ -140,19 +140,19 @@ static VolumeComponent GetVolumeComponentOfTypeOrDefault(this VolumeProfile prof static List GetTypesMissingFromDefaultProfile(VolumeProfile profile) { List missingTypes = new List(); - var volumeComponentTypes = VolumeManager.instance.baseComponentTypeArray; + + var volumeComponentTypes = VolumeManager.instance.isInitialized ? + VolumeManager.instance.baseComponentTypeArray : VolumeManager.instance.LoadBaseTypesByReflection(GraphicsSettings.currentRenderPipelineAssetType); foreach (var type in volumeComponentTypes) { if (profile.components.Find(c => c.GetType() == type) == null) { - if (type.IsDefined(typeof(ObsoleteAttribute), false) || - type.IsDefined(typeof(HideInInspector), false)) + if (type.IsDefined(typeof(ObsoleteAttribute), false)) continue; missingTypes.Add(type); } } - return missingTypes; } @@ -163,13 +163,14 @@ static List GetTypesMissingFromDefaultProfile(VolumeProfile profile) /// VolumeProfile to use. /// An optional VolumeProfile asset containing default values to use for /// any components that are added to . - public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null) + public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null) => TryEnsureAllOverridesForDefaultProfile(profile, defaultValueSource); + internal static bool TryEnsureAllOverridesForDefaultProfile(VolumeProfile profile, VolumeProfile defaultValueSource = null) { // It's possible that the volume profile is assigned to the default asset inside the HDRP package. In // this case it cannot be modified. User is expected to use HDRP Wizard "Fix" to create a local profile. var path = AssetDatabase.GetAssetPath(profile); if (CoreEditorUtils.IsAssetInReadOnlyPackage(path)) - return; + return false; bool changed = false; int numComponentsBefore = profile.components.Count; @@ -241,6 +242,8 @@ public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, Vo VolumeManager.instance.OnVolumeProfileChanged(profile); EditorUtility.SetDirty(profile); } + + return changed; } /// diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs index ee59eda2f7e..77917f95fa7 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs @@ -97,7 +97,7 @@ internal enum TextureUVOriginSelection /// [DebuggerDisplay("Texture ({handle.index})")] [MovedFrom(true, "UnityEngine.Experimental.Rendering.RenderGraphModule", "UnityEngine.Rendering.RenderGraphModule")] - public readonly struct TextureHandle + public readonly struct TextureHandle : IEquatable { private static TextureHandle s_NullHandle = new TextureHandle(); @@ -151,6 +151,52 @@ internal TextureHandle(int handle, bool shared = false, bool builtin = false) /// Resource as a RTHandle. public static implicit operator RTHandle(TextureHandle texture) => texture.IsValid() ? RenderGraphResourceRegistry.current.GetTexture(texture) : null; + /// + /// Determines whether this instance and another specified object have the same underlying resource handle. + /// + /// The texture handle to compare with the current instance. + /// + /// True if both texture handles reference the same underlying resource; otherwise, false. + /// + public bool Equals(TextureHandle other) => handle.Equals(other.handle); + + /// + /// Determines whether the specified object is equal to the current . + /// + /// The object to compare with the current instance. + /// + /// True if the specified object is a and references the same underlying resource; otherwise, false. + /// + public override bool Equals(object obj) => obj is TextureHandle other && Equals(other); + + /// + /// Returns the hash code for this . + /// + /// + /// The hash code of the current . + /// + public override int GetHashCode() => handle.GetHashCode(); + + /// + /// Determines whether two instances reference the same underlying resource. + /// + /// The first texture handle to compare. + /// The second texture handle to compare. + /// + /// True if both handles reference the same underlying resource; otherwise, false. + /// + public static bool operator ==(TextureHandle lhs, TextureHandle rhs) => lhs.handle.Equals(rhs.handle); + + /// + /// Determines whether two instances reference different underlying resources. + /// + /// The first texture handle to compare. + /// The second texture handle to compare. + /// + /// True if the handles reference different underlying resources; otherwise, false. + /// + public static bool operator !=(TextureHandle lhs, TextureHandle rhs) => !lhs.handle.Equals(rhs.handle); + /// /// Return true if the handle is valid. /// diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs index 14f0589f409..27b3a51cc65 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs @@ -123,6 +123,21 @@ public bool Equals(ResourceHandle hdl) { return hdl.m_Value == this.m_Value && hdl.m_Version == this.m_Version && hdl.type == this.type; } + + public static bool operator ==(ResourceHandle lhs, ResourceHandle rhs) => lhs.Equals(rhs); + + public static bool operator !=(ResourceHandle lhs, ResourceHandle rhs) => !lhs.Equals(rhs); + + public override bool Equals(object obj) => obj is ResourceHandle other && Equals(other); + + public override int GetHashCode() + { + var hashCode = HashFNV1A32.Create(); + hashCode.Append(m_Value); + hashCode.Append(m_Version); + hashCode.Append(m_Type); + return hashCode.value; + } } class IRenderGraphResource diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs index 1773e492c4f..f9c60fcdda3 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeComponent.cs @@ -45,7 +45,7 @@ public VolumeComponentMenu(string menu) /// This attribute allows you to add commands to the Add Override popup menu on Volumes, /// while also specifying the render pipeline(s) for which the command will be supported. /// - [Obsolete(@"VolumeComponentMenuForRenderPipelineAttribute is deprecated. Use VolumeComponentMenu with SupportedOnRenderPipeline instead. #from(2023.1)")] + [Obsolete(@"VolumeComponentMenuForRenderPipelineAttribute is deprecated. Use VolumeComponentMenu with SupportedOnRenderPipeline instead. #from(2023.1)", true)] public class VolumeComponentMenuForRenderPipeline : VolumeComponentMenu { /// @@ -126,7 +126,7 @@ public sealed class VolumeComponentDeprecated : Attribute /// /// In the example above, the custom component `ExampleComponent` extends `VolumeComponent` and defines a parameter /// (`intensity`) that can be manipulated within the volume framework. The `ClampedFloatParameter` is a type of - /// that ensures the value remains within a specified range. + /// that ensures the value remains within a specified range. /// /// [Serializable] @@ -164,7 +164,7 @@ public Indent(int relativeAmount = 1) /// The backing storage of . Use this for performance-critical work. /// internal VolumeParameter[] parameterList; - + ReadOnlyCollection m_ParameterReadOnlyCollection; /// @@ -355,7 +355,7 @@ public bool AnyPropertiesIsOverridden() { for (int i = 0; i < parameterList.Length; ++i) { - if (parameterList[i].overrideState) + if (parameterList[i].overrideState) return true; } return false; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs index 1278f15c9c4..14cc98a3ad0 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs @@ -41,6 +41,8 @@ namespace UnityEngine.Rendering /// public sealed partial class VolumeManager { + static readonly ProfilerMarker k_ProfilerMarkerInitialize = new ("VolumeManager.Initialize"); + static readonly ProfilerMarker k_ProfilerMarkerInitializeBaseTypesArray = new ("VolumeManager.InitializeBaseTypesArray"); static readonly ProfilerMarker k_ProfilerMarkerUpdate = new ("VolumeManager.Update"); static readonly ProfilerMarker k_ProfilerMarkerReplaceData = new ("VolumeManager.ReplaceData"); static readonly ProfilerMarker k_ProfilerMarkerEvaluateVolumeDefaultState = new ("VolumeManager.EvaluateVolumeDefaultState"); @@ -78,7 +80,7 @@ public sealed partial class VolumeManager return supportedVolumeComponents; if (baseComponentTypeArray == null) - LoadBaseTypes(currentPipelineAssetType); + InitializeBaseTypesArray(); supportedVolumeComponents = BuildVolumeComponentDisplayList(baseComponentTypeArray); s_SupportedVolumeComponentsForRenderPipeline[currentPipelineAssetType] = supportedVolumeComponents; @@ -133,18 +135,17 @@ public sealed partial class VolumeManager volumes.Add((path, t)); } - return volumes - .OrderBy(i => i.Item1) - .ToList(); + volumes.Sort((a, b) => string.Compare(a.Item1, b.Item1)); + return volumes; } - + Type[] m_BaseComponentTypeArray; /// /// The current list of all available types that derive from . /// - public Type[] baseComponentTypeArray - { + public Type[] baseComponentTypeArray + { get { if (isInitialized) @@ -153,7 +154,7 @@ public Type[] baseComponentTypeArray throw new InvalidOperationException($"{nameof(VolumeManager)}.{nameof(instance)}.{nameof(baseComponentTypeArray)} cannot be called before the {nameof(VolumeManager)} is initialized. (See {nameof(VolumeManager)}.{nameof(instance)}.{nameof(isInitialized)} and {nameof(RenderPipelineManager)} for creation callback)."); } internal set => m_BaseComponentTypeArray = value; // internal only for tests - } + } /// /// Global default profile that provides default values for volume components. VolumeManager applies @@ -247,13 +248,30 @@ internal VolumeManager() /// Quality default volume profile. public void Initialize(VolumeProfile globalDefaultVolumeProfile = null, VolumeProfile qualityDefaultVolumeProfile = null) { + using var profilerScope = k_ProfilerMarkerInitialize.Auto(); Debug.Assert(!isInitialized); Debug.Assert(m_CreatedVolumeStacks.Count == 0); - LoadBaseTypes(GraphicsSettings.currentRenderPipelineAssetType); + InitializeBaseTypesArray(globalDefaultVolumeProfile); + InitializeInternal(globalDefaultVolumeProfile, qualityDefaultVolumeProfile); } + void InitializeBaseTypesArray(VolumeProfile globalDefaultVolumeProfile = null) + { + using var profilerScope = k_ProfilerMarkerInitializeBaseTypesArray.Auto(); +#if UNITY_EDITOR + LoadBaseTypesByReflection(GraphicsSettings.currentRenderPipelineAssetType); +#else + if (globalDefaultVolumeProfile == null) + { + var defaultVolumeProfileSettings = GraphicsSettings.GetRenderPipelineSettings(); + globalDefaultVolumeProfile = defaultVolumeProfileSettings?.defaultVolumeProfile; + } + LoadBaseTypes(globalDefaultVolumeProfile); +#endif + } + //This is called by test where the basetypes are tuned for the purpose of the test. internal void InitializeInternal(VolumeProfile globalDefaultVolumeProfile = null, VolumeProfile qualityDefaultVolumeProfile = null) { @@ -293,6 +311,7 @@ public void Deinitialize() /// The VolumeProfile to use as the global default profile. public void SetGlobalDefaultProfile(VolumeProfile profile) { + LoadBaseTypes(profile); globalDefaultProfile = profile; EvaluateVolumeDefaultState(); } @@ -315,6 +334,10 @@ public void SetCustomDefaultProfiles(List profiles) { var validProfiles = profiles ?? new List(); validProfiles.RemoveAll(x => x == null); + + if (globalDefaultProfile == null && validProfiles.Count > 0) + globalDefaultProfile = validProfiles[0]; + customDefaultProfiles = new ReadOnlyCollection(validProfiles); EvaluateVolumeDefaultState(); } @@ -396,38 +419,44 @@ public void DestroyStack(VolumeStack stack) stack.Dispose(); } - // For now, if a user is having a VolumeComponent with the old attribute for filtering support. - // We are adding it to the supported volume components, but we are showing a warning. - bool IsSupportedByObsoleteVolumeComponentMenuForRenderPipeline(Type t, Type pipelineAssetType) + /// + /// LoadBaseTypes is responsible for loading the list of VolumeComponent types that will be used to build the default state of the VolumeStack. It uses the provided global default profile to determine which component types are relevant for the current render pipeline. + /// This will be called only once at runtime on app boot + /// + /// The global default volume profile to use to build the base component type array. + internal void LoadBaseTypes(VolumeProfile globalDefaultVolumeProfile) { - var legacySupported = false; - -#pragma warning disable CS0618 - var legacyPipelineAttribute = t.GetCustomAttribute(); - if (legacyPipelineAttribute != null) + if (globalDefaultVolumeProfile == null) { - Debug.LogWarning($"{nameof(VolumeComponentMenuForRenderPipeline)} is deprecated, use {nameof(SupportedOnRenderPipelineAttribute)} and {nameof(VolumeComponentMenu)} with {t} instead. #from(2023.1)"); -#if UNITY_EDITOR - var renderPipelineTypeFromAsset = RenderPipelineEditorUtility.GetPipelineTypeFromPipelineAssetType(pipelineAssetType); + m_BaseComponentTypeArray = Array.Empty(); + return; + } - for (int i = 0; i < legacyPipelineAttribute.pipelineTypes.Length; ++i) + using (ListPool.Get(out var list)) + { + var pipelineAssetType = GraphicsSettings.currentRenderPipelineAssetType; + foreach (var comp in globalDefaultVolumeProfile.components) { - if (legacyPipelineAttribute.pipelineTypes[i] == renderPipelineTypeFromAsset) - { - legacySupported = true; - break; - } + if (comp == null) continue; + + var componentType = comp.GetType(); + if (!SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(componentType, pipelineAssetType)) + continue; + + list.Add(componentType); } -#endif - } -#pragma warning restore CS0618 - return legacySupported; + m_BaseComponentTypeArray = list.ToArray(); + } } - // This will be called only once at runtime and on domain reload / pipeline switch in the editor - // as we need to keep track of any compatible component in the project - internal void LoadBaseTypes(Type pipelineAssetType) +#if UNITY_EDITOR + /// + /// This should only be called when we need to load base types without being able to trust default profiles are up to date. This is slow and uses Reflection! + /// Will be called only once at runtime and on domain reload / pipeline switch in the editor as we need to keep track of any compatible component in the project + /// + /// The Pipeline Type used to check if each VolumeComponent is supported. + internal Type[] LoadBaseTypesByReflection(Type pipelineAssetType) { // Grab all the component types we can find that are compatible with current pipeline using (ListPool.Get(out var list)) @@ -437,23 +466,25 @@ internal void LoadBaseTypes(Type pipelineAssetType) if (t.IsAbstract) continue; - var isSupported = SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(t, pipelineAssetType) || - IsSupportedByObsoleteVolumeComponentMenuForRenderPipeline(t, pipelineAssetType); + if (!SupportedOnRenderPipelineAttribute.IsTypeSupportedOnRenderPipeline(t, pipelineAssetType)) + continue; - if (isSupported) - list.Add(t); + list.Add(t); } m_BaseComponentTypeArray = list.ToArray(); } + + return m_BaseComponentTypeArray; } +#endif internal void InitializeVolumeComponents() { if (m_BaseComponentTypeArray == null || m_BaseComponentTypeArray.Length == 0) return; - // Call custom static Init method if present + // Call deprecated static Init method if present var flags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; foreach (var type in m_BaseComponentTypeArray) { @@ -469,7 +500,11 @@ internal void InitializeVolumeComponents() void EvaluateVolumeDefaultState() { if (m_BaseComponentTypeArray == null || m_BaseComponentTypeArray.Length == 0) + { + m_ComponentsDefaultState = Array.Empty(); + m_ParametersDefaultState = Array.Empty(); return; + } using var profilerScope = k_ProfilerMarkerEvaluateVolumeDefaultState.Auto(); @@ -478,7 +513,7 @@ void EvaluateVolumeDefaultState() // Initialize() and the default state can be updated a lot quicker. // First, default-construct all VolumeComponents - List componentsDefaultStateList = new(); + using var _ = ListPool.Get(out var componentsDefaultStateList); foreach (var type in m_BaseComponentTypeArray) { componentsDefaultStateList.Add((VolumeComponent) ScriptableObject.CreateInstance(type)); diff --git a/Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl b/Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl index 4f9b5bf0d20..f52e311ac33 100644 --- a/Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl +++ b/Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl @@ -23,6 +23,7 @@ struct UnityTexture2D SAMPLER(samplerstate); float4 texelSize; float4 scaleTranslate; + float4 hdrDecode; // these functions allows users to convert code using Texture2D to UnityTexture2D by simply changing the type of the variable // the existing texture macros will call these functions, which will forward the call to the texture appropriately @@ -61,15 +62,16 @@ float4 tex2D(UnityTexture2D tex, float2 uv) { return SAMPLE_TEXT float4 tex2Dlod(UnityTexture2D tex, float4 uv0l) { return SAMPLE_TEXTURE2D_LOD(tex.tex, tex.samplerstate, uv0l.xy, uv0l.w); } float4 tex2Dbias(UnityTexture2D tex, float4 uv0b) { return SAMPLE_TEXTURE2D_BIAS(tex.tex, tex.samplerstate, uv0b.xy, uv0b.w); } -#define UnityBuildTexture2DStruct(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, n##_ST) -#define UnityBuildTexture2DStructNoScale(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, float4(1, 1, 0, 0)) -UnityTexture2D UnityBuildTexture2DStructInternal(TEXTURE2D_PARAM(tex, samplerstate), float4 texelSize, float4 scaleTranslate) +#define UnityBuildTexture2DStruct(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, n##_ST, float4(0, 0, 0, 0)) +#define UnityBuildTexture2DStructNoScale(n) UnityBuildTexture2DStructInternal(TEXTURE2D_ARGS(n, sampler##n), n##_TexelSize, float4(1, 1, 0, 0), float4(0, 0, 0, 0)) +UnityTexture2D UnityBuildTexture2DStructInternal(TEXTURE2D_PARAM(tex, samplerstate), float4 texelSize, float4 scaleTranslate, float4 hdrDecode) { UnityTexture2D result; result.tex = tex; result.samplerstate = samplerstate; result.texelSize = texelSize; result.scaleTranslate = scaleTranslate; + result.hdrDecode = hdrDecode; return result; } @@ -77,12 +79,7 @@ UnityTexture2D UnityBuildTexture2DStructInternal(TEXTURE2D_PARAM(tex, samplersta #define UnityBuildTexture2DStructNoScaleNoTexelSize(n) UnityBuildTexture2DStructNoTexelSizeInternal(TEXTURE2D_ARGS(n, sampler##n), float4(1, 1, 0, 0)) UnityTexture2D UnityBuildTexture2DStructNoTexelSizeInternal(TEXTURE2D_PARAM(tex, samplerstate), float4 scaleTranslate) { - UnityTexture2D result; - result.tex = tex; - result.samplerstate = samplerstate; - result.texelSize = float4(1, 1, 1, 1); - result.scaleTranslate = scaleTranslate; - return result; + return UnityBuildTexture2DStructInternal(tex, samplerstate, float4(1, 1, 1, 1), scaleTranslate, float4(0, 0, 0, 0)); } @@ -90,6 +87,7 @@ struct UnityTexture2DArray { TEXTURE2D_ARRAY(tex); SAMPLER(samplerstate); + float4 hdrDecode; // these functions allows users to convert code using Texture2DArray to UnityTexture2DArray by simply changing the type of the variable // the existing texture macros will call these functions, which will forward the call to the texture appropriately @@ -106,12 +104,13 @@ struct UnityTexture2DArray float4 Load(int4 pixel) { return LOAD_TEXTURE2D_ARRAY(tex, pixel.xy, pixel.z); } }; -#define UnityBuildTexture2DArrayStruct(n) UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_ARGS(n, sampler##n)) -UnityTexture2DArray UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_PARAM(tex, samplerstate)) +#define UnityBuildTexture2DArrayStruct(n) UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_ARGS(n, sampler##n), float4(0, 0, 0, 0)) +UnityTexture2DArray UnityBuildTexture2DArrayStructInternal(TEXTURE2D_ARRAY_PARAM(tex, samplerstate), float4 hdrDecode) { UnityTexture2DArray result; result.tex = tex; result.samplerstate = samplerstate; + result.hdrDecode = hdrDecode; return result; } @@ -120,6 +119,7 @@ struct UnityTextureCube { TEXTURECUBE(tex); SAMPLER(samplerstate); + float4 hdrDecode; // these functions allows users to convert code using TextureCube to UnityTextureCube by simply changing the type of the variable // the existing texture macros will call these functions, which will forward the call to the texture appropriately @@ -140,12 +140,13 @@ struct UnityTextureCube float4 texCUBE(UnityTextureCube tex, float3 dir) { return SAMPLE_TEXTURECUBE(tex.tex, tex.samplerstate, dir); } float4 texCUBEbias(UnityTextureCube tex, float4 dirBias) { return SAMPLE_TEXTURECUBE_BIAS(tex.tex, tex.samplerstate, dirBias.xyz, dirBias.w); } -#define UnityBuildTextureCubeStruct(n) UnityBuildTextureCubeStructInternal(TEXTURECUBE_ARGS(n, sampler##n)) -UnityTextureCube UnityBuildTextureCubeStructInternal(TEXTURECUBE_PARAM(tex, samplerstate)) +#define UnityBuildTextureCubeStruct(n) UnityBuildTextureCubeStructInternal(TEXTURECUBE_ARGS(n, sampler##n), float4(0, 0, 0, 0)) +UnityTextureCube UnityBuildTextureCubeStructInternal(TEXTURECUBE_PARAM(tex, samplerstate), float4 hdrDecode) { UnityTextureCube result; result.tex = tex; result.samplerstate = samplerstate; + result.hdrDecode = hdrDecode; return result; } @@ -154,6 +155,7 @@ struct UnityTexture3D { TEXTURE3D(tex); SAMPLER(samplerstate); + float4 hdrDecode; // these functions allows users to convert code using Texture3D to UnityTexture3D by simply changing the type of the variable // the existing texture macros will call these functions, which will forward the call to the texture appropriately @@ -167,12 +169,13 @@ struct UnityTexture3D float4 tex3D(UnityTexture3D tex, float3 uvw) { return SAMPLE_TEXTURE3D(tex.tex, tex.samplerstate, uvw); } -#define UnityBuildTexture3DStruct(n) UnityBuildTexture3DStructInternal(TEXTURE3D_ARGS(n, sampler##n)) -UnityTexture3D UnityBuildTexture3DStructInternal(TEXTURE3D_PARAM(tex, samplerstate)) +#define UnityBuildTexture3DStruct(n) UnityBuildTexture3DStructInternal(TEXTURE3D_ARGS(n, sampler##n), float4(0, 0, 0, 0)) +UnityTexture3D UnityBuildTexture3DStructInternal(TEXTURE3D_PARAM(tex, samplerstate), float4 hdrDecode) { UnityTexture3D result; result.tex = tex; result.samplerstate = samplerstate; + result.hdrDecode = hdrDecode; return result; } diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs index 7af25de6a5b..e5b037bb6e4 100644 --- a/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphTests.cs @@ -6,7 +6,7 @@ using UnityEngine.TestTools; using Unity.Collections; using UnityEngine.Rendering.RendererUtils; -using System.Text.RegularExpressions; +using UnityEngine.Rendering.RenderGraphModule.NativeRenderPassCompiler; #if UNITY_EDITOR using UnityEditor; @@ -1489,7 +1489,7 @@ public void ImportedTexturesAreClearedOnFirstUse() m_RenderGraphTestPipeline.recordRenderGraphBody = (context, camera, cmd) => { - var redTexture = CreateRedTexture(kWidth, kHeight); + var redTexture = CreateColorTexture(kWidth, kHeight, Color.red); ImportResourceParams importParams = new ImportResourceParams() { clearColor = Color.blue, clearOnFirstUse = true @@ -1533,6 +1533,128 @@ public void ImportedTexturesAreClearedOnFirstUse() pixels.Dispose(); } + [Test] + public void ImportedTexturesOperatorEqualAndNotEqual() + { + const int kWidth = 4; + const int kHeight = 4; + + m_RenderGraphTestPipeline.recordRenderGraphBody = (context, camera, cmd) => + { + var importParams = new ImportResourceParams() + { + clearColor = Color.black, + clearOnFirstUse = true + }; + + var redTexture = CreateColorTexture(kWidth, kHeight, Color.red); + var red2Texture = CreateColorTexture(kWidth, kHeight, Color.red); + var blackTexture = CreateColorTexture(kWidth, kHeight, Color.black); + + var importedTextureRed = m_RenderGraph.ImportTexture(redTexture, importParams); + var importedTextureRed2 = m_RenderGraph.ImportTexture(red2Texture, importParams); + var importedTextureRedSame = m_RenderGraph.ImportTexture(redTexture, importParams); + var importedTextureBlack = m_RenderGraph.ImportTexture(blackTexture, importParams); + + // Different textures, different handles. + Assert.True(importedTextureRed != importedTextureBlack); + + // Different textures, different handles. + Assert.True(importedTextureRed != importedTextureRed2); + + // Same texture, different handles. + Assert.False(importedTextureRed == importedTextureRedSame); + + importedTextureRedSame = importedTextureRed; + + // Same texture, same handle. + Assert.True(importedTextureRed == importedTextureRedSame); + }; + + m_Camera.Render(); + } + + [Test] + public void CreatedTexturesOperatorEqualAndNotEqual() + { + m_RenderGraphTestPipeline.recordRenderGraphBody = (context, camera, cmd) => + { + const int kWidth = 4; + const int kHeight = 4; + + var texture0 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture0" }); + var texture1 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture1" }); + + // Different textures, different handles. + Assert.True(texture0 != texture1); + + // Different textures, different handles. + Assert.False(texture0 == texture1); + + texture1 = texture0; + + // Same texture, same handles. + Assert.True(texture0 == texture1); + + // Same texture, same handles. + Assert.False(texture0 != texture1); + }; + + m_Camera.Render(); + } + + [Test] + public void TexturesOperatorWorksInList() + { + m_RenderGraphTestPipeline.recordRenderGraphBody = (context, camera, cmd) => + { + const int kWidth = 4; + const int kHeight = 4; + + var texture0 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture0" }); + var texture1 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture1" }); + + var listHandles = new List(); + listHandles.Add(texture0); + + Assert.True(listHandles.Contains(texture0)); + Assert.True(!listHandles.Contains(texture1)); + + listHandles.Add(texture1); + + Assert.True(listHandles.Contains(texture1)); + }; + + m_Camera.Render(); + } + + [Test] + public void TexturesOperatorWorksInDictionary() + { + m_RenderGraphTestPipeline.recordRenderGraphBody = (context, camera, cmd) => + { + const int kWidth = 4; + const int kHeight = 4; + + var texture0 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture0" }); + var texture1 = m_RenderGraph.CreateTexture(new TextureDesc(kWidth, kHeight) { colorFormat = GraphicsFormat.R8G8B8A8_UNorm, name = "Texture1" }); + + var dictionaryHandles = new Dictionary(); + dictionaryHandles.Add(texture0, 0); + + Assert.True(dictionaryHandles.ContainsKey(texture0)); + Assert.True(dictionaryHandles.TryGetValue(texture0, out var value0) && value0 == 0); + Assert.True(!dictionaryHandles.ContainsKey(texture1)); + + dictionaryHandles.Add(texture1, 1); + + Assert.True(dictionaryHandles.ContainsKey(texture1)); + Assert.True(dictionaryHandles.TryGetValue(texture1, out var value1) && value1 == 1); + }; + + m_Camera.Render(); + } + [Test] public void RequestAsyncReadbackIntoNativeArrayWorks() { @@ -1552,7 +1674,7 @@ public void RequestAsyncReadbackIntoNativeArrayWorks() passExecuted = true; - var redTexture = CreateRedTexture(kWidth, kHeight); + var redTexture = CreateColorTexture(kWidth, kHeight, Color.red); var texture0 = m_RenderGraph.ImportTexture(redTexture); pixels = new NativeArray(kWidth * kHeight * 4, Allocator.Persistent, NativeArrayOptions.UninitializedMemory); @@ -1603,11 +1725,8 @@ void RenderGraphTest_AsyncReadbackCallback(AsyncGPUReadbackRequest request, ref } } - RTHandle CreateRedTexture(int width, int height) + RTHandle CreateColorTexture(int width, int height, Color color) { - // Create a red color - Color redColor = Color.red; - // Initialize the RTHandle system if necessary RTHandles.Initialize(width, height); @@ -1625,7 +1744,7 @@ RTHandle CreateRedTexture(int width, int height) { for (int x = 0; x < tempTexture.width; x++) { - tempTexture.SetPixel(x, y, redColor); + tempTexture.SetPixel(x, y, color); } } tempTexture.Apply(); diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md index 0b4b54c3c2c..15565a39b90 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md @@ -1,6 +1,6 @@ # Deep learning super sampling (DLSS) -[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4 Super Resolution. +[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4.5 Super Resolution. ## Requirements and compatibility @@ -82,18 +82,20 @@ Available presets are marked as '1' in the table below. | Render Preset | Maximum Quality | Balanced | Maximum Performance | Ultra Performance | DLAA | Explanation | AI Model | |- |- |- |- |- |- |- |- | -| Preset F | | | | 1 | 1 | Provides the highest image stability. Default value for UltraPerformance. | CNN | -| Preset J | 1 | 1 | 1| | 1 | Slightly lowers ghosting but increases flickering.
NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer | -| Preset K | 1 | 1 | 1| | 1 | Provides the highest image quality. | Transformer | +| Preset F | | | | 1 | 1 | Marked for deprecation in upcoming DLSS releases. Don't use for new projects. | CNN | +| Preset J | 1 | 1 | 1| 1 | 1 | Slightly lowers ghosting but increases flickering.
NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer | +| Preset K | 1 | 1 | 1| 1 | 1 | Default preset for DLAA/Balanced/Quality modes. Requires fewer resources than Preset L. | Transformer | +| Preset L | | | | 1 | | Delivers a sharper, more stable image with less ghosting than Preset J, K, but lowers performance. Recommended for RTX 40 Series GPUs and above. | Transformer Gen 2 | +Provides about the same image quality as **Preset L**. This preset is slower than presets **J** and **K**, but faster than preset **L**. Recommended for RTX 40 Series GPUs and above. The defaults for each quality mode are: | **Quality mode** | **Default render preset** | |- |- | -| **Maximum Quality** | Preset K -| **Balanced** | Preset K -| **Maximum Performance** | Preset K -| **Ultra Performance** | Preset F +| **Maximum Quality** | Preset K | +| **Balanced** | Preset K | +| **Maximum Performance** | Preset M | +| **Ultra Performance** | Preset L | | **DLAA** | Preset K | DLSS render presets are project-specific. Presets are available only from the HDRP Asset settings. You can't override presets on a per-camera basis. diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs index 5a9a93713c7..ad5f77caf66 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs @@ -41,12 +41,86 @@ public void OnPreprocessBuild(BuildReport report) ConfigureMinimumMaxLoDValueForAllQualitySettings(); + if (HDRenderPipelineGlobalSettings.instance.TryInitializeDefaultVolumeProfile(out var defaultVolumeProfileSettings)) + { + Debug.Log("Default Volume Profile has been created or Diffusion Profiles have been updated to ensure all components are present. This is required to avoid missing overrides at runtime which can lead to unexpected rendering issues. Please save these changes to avoid this message in the future."); + } + + if (defaultVolumeProfileSettings == null) + { + throw new BuildFailedException("Failed to initialize the Default Volume Profile. A Default Volume Profile is required for HDRP to function properly."); + } + + if (VolumeProfileUtils.TryEnsureAllOverridesForDefaultProfile(defaultVolumeProfileSettings.volumeProfile)) + { + Debug.Log("Default Volume Profile has been modified to ensure all components are present. This is required to avoid missing overrides at runtime which can lead to unexpected rendering issues. Please save these changes to avoid this message in the future."); + } + LogIncludedAssets(m_BuildData.renderPipelineAssets); + if (!IsConfigurationValid()) + { + if(!ProceedWithBuild()) + throw new BuildFailedException("Build canceled by user due to HDRP configuration issues."); + } + + GatherShaderFeatures(); } } + private static bool IsConfigurationValid() + { + // Validate the configuration of the HDRP assets for the current build target. We want to make sure that users are aware of potential performance issues or unsupported features before building. + // We still want to build the player even if the configuration is not optimal, but we log warnings to inform users about potential issues. + // Note that we validate the configuration of all HDRP assets included in the build, not just the one assigned in Graphics Settings. + // This is because users can have multiple HDRP assets in their project and switch between them at runtime, so we want to make sure that all of them are correctly configured for the target platform. + + // We must log all the warnings, and avoid doing validConfiguration &= ValidationXXX, that will avoid logging all the warnings, and only log the first one that fails. + // This way users will have a complete overview of all the potential issues with their configuration, and can fix them all at once, instead of having to go through multiple build iterations to fix each issue one by one. + // So be carefull when you edit this code, and make sure to log all the warnings, even if one of the validation fails. + bool validConfiguration = true; + + { + bool config = ValidateRayTracingConfiguration(m_BuildData.renderPipelineAssets); + validConfiguration &= config; + } + + { + bool config = ValidateSubsurfaceScatteringConfiguration(m_BuildData.renderPipelineAssets); + validConfiguration &= config; + } + + { + bool config = ValidateFilmGrainConfiguration(m_BuildData.renderPipelineAssets); + validConfiguration &= config; + } + + return validConfiguration; + } + + internal static string k_DialogKey = $"{nameof(UnityEditor)}.{nameof(Rendering)}.{nameof(HighDefinition)}.{nameof(HDRPPreprocessBuild)}.{nameof(ProceedWithBuild)}"; + + private bool ProceedWithBuild() + { + var title = "Build Configuration Issues Detected"; + var body = new StringBuilder(); + + body.AppendLine("HDRP identified settings that may impact performance or enable unsupported features for the current build target."); + body.AppendLine("Review the Console for details (look for messages tagged 'HDRP Build Validation')."); + body.AppendLine(); + body.Append("Do you want to continue building?"); + + return EditorUtility.DisplayDialog( + title, + body.ToString(), + "Proceed", + "Cancel", + DialogOptOutDecisionType.ForThisMachine, + k_DialogKey + ); + } + internal static void LogIncludedAssets(List assetsList) { using (GenericPool.Get(out var assetsIncluded)) @@ -64,6 +138,97 @@ internal static void LogIncludedAssets(List assetsList) } } + internal static bool ValidateRayTracingConfiguration(List assetsList) + { + // Check if any asset has ray tracing enabled + bool anyAssetHasRayTracingEnabled = false; + foreach (var hdrpAsset in assetsList) + { + if (hdrpAsset != null && hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing) + { + anyAssetHasRayTracingEnabled = true; + break; + } + } + + if (!anyAssetHasRayTracingEnabled) + return true; // No ray tracing enabled, skip validation + + return true; + } + + internal static bool ValidateSubsurfaceScatteringConfiguration(List assetsList) + { + var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget; + + // Only validate for Switch 2 + if (currentBuildTarget != BuildTarget.Switch2) + return true; + + // Check if any asset has Subsurface Scattering enabled + bool anyAssetHasSSSEnabled = false; + foreach (var hdrpAsset in assetsList) + { + if (hdrpAsset != null && hdrpAsset.currentPlatformRenderPipelineSettings.supportSubsurfaceScattering) + { + anyAssetHasSSSEnabled = true; + break; + } + } + + if (!anyAssetHasSSSEnabled) + return true; // No SSS enabled, skip validation + + var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(BuildTarget.Switch2); + var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup); + Debug.LogWarning($"HDRP Build Validation - Subsurface Scattering: Subsurface Scattering is enabled for {namedBuildTarget.TargetName}. For optimal performance, set the Downsample Level to the maximum value (2) for this platform."); + return false; + } + + internal static bool ValidateFilmGrainConfiguration(List assetsList) + { + var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget; + + // Only validate for Switch 2 + if (currentBuildTarget != BuildTarget.Switch2) + return true; + + // Check default volume profile from HDRP Global Settings + bool foundFilmGrain = false; + var defaultVolumeProfileSettings = GraphicsSettings.GetRenderPipelineSettings(); + if (defaultVolumeProfileSettings?.volumeProfile != null) + { + if (defaultVolumeProfileSettings.volumeProfile.TryGet(out var filmGrain) && filmGrain.intensity.value > 0) + { + foundFilmGrain = true; + } + } + + // Check volume profiles in each HDRP asset + if (!foundFilmGrain) + { + foreach (var hdrpAsset in assetsList) + { + if (hdrpAsset != null && hdrpAsset.volumeProfile != null) + { + if (hdrpAsset.volumeProfile.TryGet(out var filmGrain) && filmGrain.intensity.value > 0) + { + foundFilmGrain = true; + break; + } + } + } + } + + if (!foundFilmGrain) + return true; // No Film Grain with intensity > 0, skip validation + + var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(BuildTarget.Switch2); + var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup); + Debug.LogWarning($"HDRP Build Validation - Film Grain: Film Grain is enabled for {namedBuildTarget.TargetName}. This may significantly impact performance and should be disabled for this platform."); + return false; + } + internal static void ConfigureMinimumMaxLoDValueForAllQualitySettings() { int GetMinimumMaxLoDValue(HDRenderPipelineAsset asset) diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/TerrainLit/ShaderGraph/ShaderPassDefine.template.hlsl b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/TerrainLit/ShaderGraph/ShaderPassDefine.template.hlsl index de12049f2f5..0e9987ff87c 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/TerrainLit/ShaderGraph/ShaderPassDefine.template.hlsl +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/TerrainLit/ShaderGraph/ShaderPassDefine.template.hlsl @@ -46,12 +46,7 @@ SAMPLER(sampler_TerrainHolesTexture); UnityTexture2D TerrainBuildUnityTexture2DStructInternal(Texture2D tex, SamplerState samplerstate, float4 texelSize, float4 scaleTranslate) { - UnityTexture2D result; - result.tex = tex; - result.samplerstate = samplerstate; - result.texelSize = texelSize; - result.scaleTranslate = scaleTranslate; - return result; + return UnityBuildTexture2DStructInternal(tex, samplerstate, texelSize, scaleTranslate, float4(0, 0, 0, 0)); } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs index 54cc0482719..5f7e089ece9 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs @@ -318,7 +318,7 @@ int CountBits(uint bitMask) // System.Numerics.BitOperations not available { if (preset == UnityEngine.NVIDIA.DLSSPreset.Preset_Default) { - labels[(int)quality][iWrite++] = "Default Preset"; + labels[(int)quality][iWrite++] = "Default Preset" + " - " + UnityEngine.NVIDIA.GraphicsDevice.GetDLSSPresetExplanation(preset); continue; } diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta index f03ddda2af1..177c9533c47 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta @@ -5,6 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 + icon: {fileID: 2800000, guid: a51c08ea4f8a47641a38f14eff7be3db, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Canvas/HDCanvasPass.hlsl b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Canvas/HDCanvasPass.hlsl index d688c00468e..ce526019b65 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Canvas/HDCanvasPass.hlsl +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Canvas/HDCanvasPass.hlsl @@ -91,6 +91,8 @@ Varyings BuildVaryings(Attributes input) float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); + #else + output.texCoord1 = input.uv1; #endif #endif diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta index 369590cb415..292a4bcd018 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta @@ -5,6 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index d68cc3d74cc..c226b7eeaf1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -91,14 +91,28 @@ public override void Initialize(RenderPipelineGlobalSettings source = null) { SetUpRPAssetIncluded(); - TryGet(typeof(HDRenderPipelineEditorAssets), out var editorAssets); - var assets = editorAssets as HDRenderPipelineEditorAssets; - - if (TryGet(typeof(HDRPDefaultVolumeProfileSettings), out var defaultSettings) && - defaultSettings is HDRPDefaultVolumeProfileSettings defaultVolumeProfileSettings) + InitializeDefaultVolumeProfile(); + } + internal HDRPDefaultVolumeProfileSettings InitializeDefaultVolumeProfile() + { + TryInitializeDefaultVolumeProfile(out var defaultVolumeProfileSettings); + return defaultVolumeProfileSettings; + } + internal bool TryInitializeDefaultVolumeProfile(out HDRPDefaultVolumeProfileSettings defaultVolumeProfileSettings) + { + defaultVolumeProfileSettings = null; + var changed = false; + if (TryGet(typeof(HDRenderPipelineEditorAssets), out var editorAssets) && + TryGet(typeof(HDRPDefaultVolumeProfileSettings), out var defaultSettings) && + defaultSettings is HDRPDefaultVolumeProfileSettings settings && + editorAssets is HDRenderPipelineEditorAssets assets) { + defaultVolumeProfileSettings = settings; if (defaultVolumeProfileSettings.volumeProfile == null && assets != null) + { + changed = true; defaultVolumeProfileSettings.volumeProfile = VolumeUtils.CopyVolumeProfileFromResourcesToAssets(assets.defaultVolumeProfile); + } // Initialize the Volume Profile with the default diffusion profiles var diffusionProfileList = VolumeUtils.GetOrCreateDiffusionProfileList(defaultVolumeProfileSettings.volumeProfile); @@ -107,8 +121,10 @@ public override void Initialize(RenderPipelineGlobalSettings source = null) { diffusionProfileList.diffusionProfiles.value = VolumeUtils.CreateArrayWithDefaultDiffusionProfileSettingsList(assets); EditorUtility.SetDirty(diffusionProfileList); + changed = true; } } + return changed; } void SetUpRPAssetIncluded() diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs index a0a82bf4cc1..ffb4289aecb 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs @@ -227,7 +227,7 @@ RenderTargets ReadRenderTargets(in IUnsafeRenderGraphBuilder builder, in RenderT output.colorBufferRG = targets.colorBufferRG; builder.UseTexture(output.colorBufferRG, AccessFlags.ReadWrite); } - if (targets.nonMSAAColorBufferRG.IsValid()) + if (targets.nonMSAAColorBufferRG.IsValid() && targets.nonMSAAColorBufferRG != targets.colorBufferRG) { output.nonMSAAColorBufferRG = targets.nonMSAAColorBufferRG; builder.UseTexture(output.nonMSAAColorBufferRG, AccessFlags.ReadWrite); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs index 3e6155f021f..854171fc5dc 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs @@ -183,7 +183,7 @@ private bool ShouldUseAutomaticSettings() static NVIDIA.DLSSPreset Uint2Preset(uint preset) { - if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_K) + if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_M) return (NVIDIA.DLSSPreset)preset; Debug.LogWarningFormat("Unknown DLSS Preset value {0}, using default value.", preset); return NVIDIA.DLSSPreset.Preset_Default; diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta index 97092193dfc..f2bc3d8db89 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3} + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta index 7e8cc867259..da48c021a3c 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3} + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs index b484492171f..14150484661 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs @@ -8,6 +8,7 @@ namespace UnityEngine.Rendering.HighDefinition /// [HDRPHelpURL("water-decals-and-masking-in-the-water-system")] [ExecuteInEditMode] + [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")] public partial class WaterDecal : MonoBehaviour { internal enum PassType diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta index bd89e58cab4..87978e31764 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3} + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: - assetBundleVariant: \ No newline at end of file + assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/CustomPostProcessComponentListTest.cs b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/CustomPostProcessComponentListTest.cs index 0c933ed514f..24e2844ece2 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/CustomPostProcessComponentListTest.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/CustomPostProcessComponentListTest.cs @@ -5,6 +5,8 @@ using UnityEngine.Rendering; using UnityEngine.Rendering.HighDefinition; +#pragma warning disable 618 + namespace UnityEditor.Rendering.HighDefinition.Tests { class CustomPostProcessComponentListTest @@ -14,6 +16,7 @@ public void TearDown() { } + [Obsolete("Obsolete to strip from builds")] class TestComponent : CustomPostProcessVolumeComponent { public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) @@ -22,6 +25,7 @@ public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, } } + [Obsolete("Obsolete to strip from builds")] class TestComponent2 : CustomPostProcessVolumeComponent { public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDRPGlobalSettingsMigrationTests/CustomPostProcessOrdersMigrationTests.cs b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDRPGlobalSettingsMigrationTests/CustomPostProcessOrdersMigrationTests.cs index 1bc09d3b63d..47455cc62ef 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDRPGlobalSettingsMigrationTests/CustomPostProcessOrdersMigrationTests.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDRPGlobalSettingsMigrationTests/CustomPostProcessOrdersMigrationTests.cs @@ -7,9 +7,9 @@ namespace UnityEditor.Rendering.HighDefinition.Test.GlobalSettingsMigration { class CustomPostProcessOrdersMigrationTests : RenderPipelineGraphicsSettingsMigrationTestBase - { [Serializable, HideInInspector] + [Obsolete("Obsolete to strip from builds")] class CustomPostProcessesTestComponent : CustomPostProcessVolumeComponent, IPostProcessComponent { // For testing purposes we do not have a correct injection point for each setting as is not checked. @@ -34,9 +34,9 @@ class TestCase : IRenderPipelineGraphicsSettingsTestCase(); isMigrationCorrect &= settings.beforeTransparentCustomPostProcesses.Contains(); isMigrationCorrect &= settings.afterPostProcessBlursCustomPostProcesses.Contains(); @@ -62,6 +62,7 @@ public bool IsMigrationCorrect(CustomPostProcessOrdersSettings settings, out str if (!isMigrationCorrect) message = $"{nameof(CustomPostProcessesTestComponent)} has not been found in some list"; return isMigrationCorrect; +#pragma warning restore 618 } } diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs index 781b51c001f..04ad93ce517 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs @@ -43,9 +43,11 @@ public static void ShowExample() // Variables used for refresh view private bool doRefresh; private int cachedSceneHandle; + private Vector3 cachedCamPos; private int totalLightCount; private int totalShadowCount; - private Vector3 cachedCamPos; + private string[] cachedLightNames; + private string[] cachedShadowCasterNames; ILight2DCullResult lightCullResult { @@ -118,6 +120,9 @@ private VisualElement MakePill(UnityEngine.Object obj) var bubble = new Button(); bubble.AddToClassList("Pill"); bubble.text = obj.name; + bubble.style.maxWidth = 200; + bubble.style.overflow = Overflow.Hidden; + bubble.style.textOverflow = TextOverflow.Ellipsis; bubble.clicked += () => { @@ -469,8 +474,20 @@ private bool IsDirty() if (lightCullResult.IsGameView()) { + var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters()).ToList(); + isDirty |= totalLightCount != lightCullResult.visibleLights.Count(); - isDirty |= totalShadowCount != lightCullResult.visibleShadows.Count(); + isDirty |= totalShadowCount != visibleShadows.Count(); + + // Account for name changes + if (!isDirty) + { + for (int i = 0; i < totalLightCount; ++i) + isDirty |= !lightCullResult.visibleLights.Exists(x => x != null && x.name == cachedLightNames[i]); + + for (int i = 0; i < totalShadowCount; ++i) + isDirty |= !visibleShadows.Exists(x => x != null && x.name == cachedShadowCasterNames[i]); + } } return isDirty; @@ -485,8 +502,27 @@ private void ResetDirty() if (lightCullResult != null) { + var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters()); + totalLightCount = lightCullResult.visibleLights.Count(); - totalShadowCount = lightCullResult.visibleShadows.Count(); + totalShadowCount = visibleShadows.Count(); + + cachedLightNames = new string[totalLightCount]; + cachedShadowCasterNames = new string[totalShadowCount]; + + for (int i = 0; i < totalLightCount; ++i) + { + var light = lightCullResult.visibleLights[i]; + if (light != null) + cachedLightNames[i] = light.name; + } + + for (int i = 0; i < totalShadowCount; ++i) + { + var shadowCaster = visibleShadows.ElementAt(i); + if (shadowCaster != null) + cachedShadowCasterNames[i] = shadowCaster.name; + } } doRefresh = false; diff --git a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPPreprocessBuild.cs b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPPreprocessBuild.cs index 17941842c23..664792ea8eb 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPPreprocessBuild.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPPreprocessBuild.cs @@ -27,10 +27,31 @@ public void OnPreprocessBuild(BuildReport report) if (!URPBuildDataValidator.IsProjectValidForBuilding(report, out var message)) throw new BuildFailedException(message); + EnsureVolumeProfile(); + LogIncludedAssets(m_BuildData.renderPipelineAssets); } } + static void EnsureVolumeProfile() + { + if (GraphicsSettings.TryGetRenderPipelineSettings(out var volumeProfileSettings)) + { + var initState = volumeProfileSettings.volumeProfile; + volumeProfileSettings.volumeProfile = UniversalRenderPipelineGlobalSettings.GetOrCreateDefaultVolumeProfile(volumeProfileSettings.volumeProfile); + + if (initState != volumeProfileSettings.volumeProfile) + { + Debug.Log($"Default Volume Profile was missing, one has been created automatically at '{AssetDatabase.GetAssetPath(volumeProfileSettings.volumeProfile)}'."); + } + + if (VolumeProfileUtils.TryEnsureAllOverridesForDefaultProfile(volumeProfileSettings.volumeProfile)) + { + Debug.Log("Default Volume Profile has been modified to ensure all overrides are present. This is required to avoid missing overrides at runtime which can lead to unexpected rendering issues. Please save these changes to avoid this message in the future."); + } + } + } + internal static void LogIncludedAssets(List assetsList) { using (GenericPool.Get(out var assetsIncluded)) diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/CanvasPass.hlsl b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/CanvasPass.hlsl index d3f261d1c6b..82128033643 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/CanvasPass.hlsl +++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/CanvasPass.hlsl @@ -80,6 +80,8 @@ Varyings BuildVaryings(Attributes input) float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); + #else + output.texCoord1 = input.uv1; #endif #endif diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl index e1f5bcf34dc..03f675a2799 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl +++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl @@ -2,9 +2,6 @@ #error SHADERPASS_CUSTOM_UI_is_not_correctly_defined #endif - -#define UIE_NOINTERPOLATION nointerpolation - PackedVaryings uie_custom_vert(Attributes input) { appdata_t uieInput = (appdata_t)0; diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Terrain/TerrainPassDefine.template.hlsl b/Packages/com.unity.render-pipelines.universal/Editor/Terrain/TerrainPassDefine.template.hlsl index 7aa0b768754..fc30d6964f2 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/Terrain/TerrainPassDefine.template.hlsl +++ b/Packages/com.unity.render-pipelines.universal/Editor/Terrain/TerrainPassDefine.template.hlsl @@ -48,12 +48,7 @@ half4 _BlackTex_ST = half4(1,1,0,0); UnityTexture2D TerrainBuildUnityTexture2DStructInternal(Texture2D tex, SamplerState samplerstate, float4 texelSize, float4 scaleTranslate) { - UnityTexture2D result; - result.tex = tex; - result.samplerstate = samplerstate; - result.texelSize = texelSize; - result.scaleTranslate = scaleTranslate; - return result; + return UnityBuildTexture2DStructInternal(tex, samplerstate, texelSize, scaleTranslate, float4(0, 0, 0, 0)); } #define DEF_TERRAIN_TEXTURE_LOAD(name, defaultName) UnityTexture2D TerrainBuildUnityTexture2DStructInternal##name(int index) \ diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs index 31f4a444887..711c6f005ce 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs @@ -206,7 +206,6 @@ public bool ReassignUnityObjectMaterials(Object obj, StringBuilder errors) { // Make sure the changes get saved EditorUtility.SetDirty(obj); - EditorSceneManager.SaveScene(SceneManager.GetActiveScene()); } else errors.AppendLine($"Could not reassign materials of {obj} with {obj.GetType()} type."); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs index 710a8fe18a0..ba74c3922fa 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs @@ -23,6 +23,7 @@ public enum DecalScaleMode [CanEditMultipleObjects] #endif [AddComponentMenu("Rendering/URP Decal Projector")] + [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")] public partial class DecalProjector : MonoBehaviour, ISerializationCallbackReceiver { internal delegate void DecalProjectorAction(DecalProjector decalProjector); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta index 664d9b5ed37..ac0b996ac82 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: 9ba98ca4f0fc0754caca09e38af0cc0a, type: 3} + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs index acaca5a0b12..bfac148825a 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs @@ -177,6 +177,7 @@ private void OnDecalMaterialChange(DecalProjector decalProjector) [DisallowMultipleRendererFeature("Decal")] [Tooltip("With this Renderer Feature, Unity can project specific Materials (decals) onto other objects in the Scene.")] [URPHelpURL("renderer-feature-decal")] + [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")] public partial class DecalRendererFeature : ScriptableRendererFeature { private static SharedDecalEntityManager sharedDecalEntityManager { get; } = new SharedDecalEntityManager(); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta index d7eb64cb212..c2a1d425131 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta +++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: 9ba98ca4f0fc0754caca09e38af0cc0a, type: 3} + icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2} userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 619d7b5adc9..8ecef590ee4 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -2009,21 +2009,39 @@ internal enum URPProfileId internal static class PlatformAutoDetect { /// - /// Detect and cache runtime platform information. This function should only be called once when creating the URP. + /// Detect and cache runtime platform information. + /// Lazy initialized for situations where platform detection is required before URP is initialized (UUM-134298) /// - internal static void Initialize() + private sealed class PlatformDetectionCache { - bool isRunningMobile = false; - #if ENABLE_VR && ENABLE_VR_MODULE - #if PLATFORM_WINRT || PLATFORM_ANDROID - isRunningMobile = IsRunningXRMobile(); + public readonly bool isXRMobile; + public readonly bool isShaderAPIMobileDefined; + public readonly bool isSwitch; + public readonly bool isSwitch2; + public readonly bool isRunningOnPowerVRGPU; + + public PlatformDetectionCache() + { + bool isRunningMobile = false; + #if ENABLE_VR && ENABLE_VR_MODULE + #if PLATFORM_WINRT || PLATFORM_ANDROID + isRunningMobile = IsRunningXRMobile(); + #endif #endif - #endif - isXRMobile = isRunningMobile; - isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE); - isSwitch = Application.platform == RuntimePlatform.Switch; - isSwitch2 = Application.platform == RuntimePlatform.Switch2; + isXRMobile = isRunningMobile; + isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE); + isSwitch = Application.platform == RuntimePlatform.Switch; + isSwitch2 = Application.platform == RuntimePlatform.Switch2; + isRunningOnPowerVRGPU = SystemInfo.graphicsDeviceName.Contains("PowerVR"); + } + } + + private static readonly Lazy platformCache = new(() => new PlatformDetectionCache(), true); + + internal static void Initialize() + { + _ = platformCache.Value; } #if ENABLE_VR && ENABLE_VR_MODULE @@ -2052,19 +2070,21 @@ private static bool IsRunningXRMobile() /// /// If true, the runtime platform is an XR mobile platform. /// - internal static bool isXRMobile { get; private set; } = false; + internal static bool isXRMobile => platformCache.Value.isXRMobile; /// /// If true, then SHADER_API_MOBILE has been defined in URP Shaders. /// - internal static bool isShaderAPIMobileDefined { get; private set; } = false; + internal static bool isShaderAPIMobileDefined => platformCache.Value.isShaderAPIMobileDefined; /// /// If true, then the runtime platform is set to Switch. /// - internal static bool isSwitch { get; private set; } = false; + internal static bool isSwitch => platformCache.Value.isSwitch; - internal static bool isSwitch2 { get; private set; } = false; + internal static bool isSwitch2 => platformCache.Value.isSwitch2; + + internal static bool isRunningOnPowerVRGPU => platformCache.Value.isRunningOnPowerVRGPU; /// /// Gives the SH evaluation mode when set to automatically detect. @@ -2083,7 +2103,5 @@ internal static ShEvalMode ShAutoDetect(ShEvalMode mode) return mode; } - - internal static bool isRunningOnPowerVRGPU = SystemInfo.graphicsDeviceName.Contains("PowerVR"); } } diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverterTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverterTests.cs index 621a6c11936..ee8ca128ccf 100644 --- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverterTests.cs +++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverterTests.cs @@ -71,7 +71,6 @@ private void CheckMaterials(Material expected, Material actual) [Test] [Timeout(5 * 60 * 1000)] - [UnityPlatform(exclude = new[] { RuntimePlatform.OSXEditor })] // Timing out on macos: https://jira.unity3d.com/browse/UUM-131234 public void ReassignGameObjectMaterials_Succeeds_WhenMaterialCanBeSet() { var materialConverter = new ReadonlyMaterialConverter(); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs index edc460c967e..0d703d8c07d 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs @@ -23,9 +23,14 @@ internal CubemapShaderProperty() internal string modifiableTagString => modifiable ? "" : "[NonModifiableTextureData]"; + [SerializeField] + internal bool isHDR = false; + + internal string isHDRString => isHDR ? "[HDR]" : ""; + internal override string GetPropertyBlockString() { - return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{referenceName}(\"{displayName}\", CUBE) = \"\" {{}}"; + return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{isHDRString}{referenceName}(\"{displayName}\", CUBE) = \"\" {{}}"; } internal override bool AllowHLSLDeclaration(HLSLDeclaration decl) => (decl != HLSLDeclaration.HybridPerInstance) && (decl != HLSLDeclaration.DoNotDeclare); @@ -34,6 +39,8 @@ internal override void ForeachHLSLProperty(Action action) { action(new HLSLProperty(HLSLType._TextureCube, referenceName, HLSLDeclaration.Global)); action(new HLSLProperty(HLSLType._SamplerState, "sampler" + referenceName, HLSLDeclaration.Global)); + if (isHDR) + action(new HLSLProperty(HLSLType._float4, referenceName + "_HDR", HLSLDeclaration.Global)); } internal override string GetPropertyAsArgumentString(string precisionString) @@ -50,8 +57,11 @@ internal override string GetHLSLVariableName(bool isSubgraphProperty, Generation { if (isSubgraphProperty && !promoteToFinalShader) return referenceName; - else - return $"UnityBuildTextureCubeStruct({referenceName})"; + + string nameArg = referenceName; + string samplerArg = $"sampler{referenceName}"; + string hdrDecodeArg = isHDR ? $"{referenceName}_HDR" : "float4(0, 0, 0, 0)"; + return $"UnityBuildTextureCubeStructInternal({nameArg}, {samplerArg}, {hdrDecodeArg})"; } [SerializeField] diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs index 9dad1c3c532..6d6f165d5fc 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs @@ -698,7 +698,7 @@ public void ClearChanges() m_MovedContexts = false; } - public void AddNode(AbstractMaterialNode node) + public void AddNode(AbstractMaterialNode node, bool usePreviewPref = true) { if (node is AbstractMaterialNode materialNode) { @@ -708,7 +708,8 @@ public void AddNode(AbstractMaterialNode node) return; } - materialNode.previewExpanded = ShaderGraphPreferences.newNodesPreview; + if (usePreviewPref && materialNode.UsePreviewPref) + materialNode.previewExpanded = ShaderGraphPreferences.newNodesPreview; AddNodeNoValidate(materialNode); @@ -887,6 +888,17 @@ public List GetActiveBlocksForAllActiveTargets() return context.activeBlocks; } + public void RefreshBadgesAndPreviews() + { + foreach (var node in this.m_Nodes) + { + if (node.value != null) + { + node.value.Dirty(ModificationScope.Graph); + } + } + } + public void UpdateActiveBlocks(List activeBlockDescriptors) { // Set Blocks as active based on supported Block list @@ -2290,7 +2302,7 @@ internal void PasteGraph(CopyPasteGraph graphToPaste, List } remappedNodes.Add(pastedNode); - AddNode(pastedNode); + AddNode(pastedNode, false); // add the node to the pasted node list m_PastedNodes.Add(pastedNode); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs index 55059eb113a..cc63c22b3cd 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs @@ -21,9 +21,14 @@ internal Texture2DArrayShaderProperty() internal string modifiableTagString => modifiable ? "" : "[NonModifiableTextureData]"; + [SerializeField] + internal bool isHDR = false; + + internal string isHDRString => isHDR ? "[HDR]" : ""; + internal override string GetPropertyBlockString() { - return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{referenceName}(\"{displayName}\", 2DArray) = \"\" {{}}"; + return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{isHDRString}{referenceName}(\"{displayName}\", 2DArray) = \"\" {{}}"; } internal override bool AllowHLSLDeclaration(HLSLDeclaration decl) => (decl != HLSLDeclaration.HybridPerInstance) && (decl != HLSLDeclaration.DoNotDeclare); @@ -32,6 +37,8 @@ internal override void ForeachHLSLProperty(Action action) { action(new HLSLProperty(HLSLType._Texture2DArray, referenceName, HLSLDeclaration.Global)); action(new HLSLProperty(HLSLType._SamplerState, "sampler" + referenceName, HLSLDeclaration.Global)); + if (isHDR) + action(new HLSLProperty(HLSLType._float4, referenceName + "_HDR", HLSLDeclaration.Global)); } internal override string GetPropertyAsArgumentString(string precisionString) @@ -48,8 +55,11 @@ internal override string GetHLSLVariableName(bool isSubgraphProperty, Generation { if (isSubgraphProperty && !promoteToFinalShader) return referenceName; - else - return $"UnityBuildTexture2DArrayStruct({referenceName})"; + + string nameArg = referenceName; + string samplerArg = $"sampler{referenceName}"; + string hdrDecodeArg = isHDR ? $"{referenceName}_HDR" : "float4(0, 0, 0, 0)"; + return $"UnityBuildTexture2DArrayStructInternal({nameArg}, {samplerArg}, {hdrDecodeArg})"; } [SerializeField] diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs index efa312f7928..3c7eb3e59ae 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs @@ -52,14 +52,18 @@ internal Texture2DShaderProperty() [SerializeField] internal bool useTexelSize = true; + [SerializeField] + internal bool isHDR = false; + internal string useSTString => useTilingAndOffset ? "" : "[NoScaleOffset]"; internal string useTexelSizeString => useTexelSize ? "" : "[NoTexelSize]"; + internal string isHDRString => isHDR ? "[HDR]" : ""; internal string mainTextureString => isMainTexture ? "[MainTexture]" : ""; internal override string GetPropertyBlockString() { var normalTagString = (defaultType == DefaultType.NormalMap) ? "[Normal]" : ""; - return $"{hideTagString}{modifiableTagString}{normalTagString}{mainTextureString}{useSTString}{referenceName}(\"{displayName}\", 2D) = \"{ToShaderLabString(defaultType)}\" {{}}"; + return $"{hideTagString}{modifiableTagString}{normalTagString}{mainTextureString}{useSTString}{isHDRString}{referenceName}(\"{displayName}\", 2D) = \"{ToShaderLabString(defaultType)}\" {{}}"; } // Texture2D properties cannot be set via Hybrid path at the moment; disallow that choice @@ -90,6 +94,10 @@ internal override void ForeachHLSLProperty(Action action) { action(new HLSLProperty(HLSLType._float4, referenceName + "_ST", decl)); } + if (isHDR) + { + action(new HLSLProperty(HLSLType._float4, referenceName + "_HDR", decl)); + } } internal override string GetPropertyAsArgumentString(string precisionString) @@ -106,31 +114,13 @@ internal override string GetHLSLVariableName(bool isSubgraphProperty, Generation { if (isSubgraphProperty && !promoteToFinalShader) return referenceName; - else - { - if (useTexelSize) - { - if (useTilingAndOffset) - { - return $"UnityBuildTexture2DStruct({referenceName})"; - } - else - { - return $"UnityBuildTexture2DStructNoScale({referenceName})"; - } - } - else - { - if (useTilingAndOffset) - { - return $"UnityBuildTexture2DStructNoTexelSize({referenceName})"; - } - else - { - return $"UnityBuildTexture2DStructNoScaleNoTexelSize({referenceName})"; - } - } - } + + string nameArg = referenceName; + string samplerArg = $"sampler{referenceName}"; + string texelSizeArg = useTexelSize ? $"{referenceName}_TexelSize" : "float4(1, 1, 1, 1)"; + string scaleTranslateArg = useTilingAndOffset ? $"{referenceName}_ST" : "float4(1, 1, 0, 0)"; + string hdrDecodeArg = isHDR ? $"{referenceName}_HDR" : "float4(0, 0, 0, 0)"; + return $"UnityBuildTexture2DStructInternal({nameArg}, {samplerArg}, {texelSizeArg}, {scaleTranslateArg}, {hdrDecodeArg})"; } [SerializeField] diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs index 355bca08a38..6de792e7639 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs @@ -21,9 +21,14 @@ internal Texture3DShaderProperty() internal string modifiableTagString => modifiable ? "" : "[NonModifiableTextureData]"; + [SerializeField] + internal bool isHDR = false; + + internal string isHDRString => isHDR ? "[HDR]" : ""; + internal override string GetPropertyBlockString() { - return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{referenceName}(\"{displayName}\", 3D) = \"white\" {{}}"; + return $"{hideTagString}{modifiableTagString}[NoScaleOffset]{isHDRString}{referenceName}(\"{displayName}\", 3D) = \"white\" {{}}"; } internal override bool AllowHLSLDeclaration(HLSLDeclaration decl) => (decl != HLSLDeclaration.HybridPerInstance) && (decl != HLSLDeclaration.DoNotDeclare); @@ -32,6 +37,8 @@ internal override void ForeachHLSLProperty(Action action) { action(new HLSLProperty(HLSLType._Texture3D, referenceName, HLSLDeclaration.Global)); action(new HLSLProperty(HLSLType._SamplerState, "sampler" + referenceName, HLSLDeclaration.Global)); + if (isHDR) + action(new HLSLProperty(HLSLType._float4, referenceName + "_HDR", HLSLDeclaration.Global)); } internal override string GetPropertyAsArgumentString(string precisionString) @@ -48,8 +55,11 @@ internal override string GetHLSLVariableName(bool isSubgraphProperty, Generation { if (isSubgraphProperty && !promoteToFinalShader) return referenceName; - else - return $"UnityBuildTexture3DStruct({referenceName})"; + + string nameArg = referenceName; + string samplerArg = $"sampler{referenceName}"; + string hdrDecodeArg = isHDR ? $"{referenceName}_HDR" : "float4(0, 0, 0, 0)"; + return $"UnityBuildTexture3DStructInternal({referenceName}, {samplerArg}, {hdrDecodeArg})"; } [SerializeField] diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs index df214e998cf..92ad55a87dd 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs @@ -43,6 +43,8 @@ abstract class AbstractMaterialNode : JsonObject, IGroupItem, IRectInterface internal virtual bool ExposeToSearcher => true; + internal virtual bool UsePreviewPref => true; + protected virtual bool CanPropagateFloatLiteral => false; OnNodeModified m_OnModified; diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs index 6d1b8b95524..c82a8a4c263 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs @@ -27,7 +27,7 @@ static string Unity_Dither( @" { $precision2 uv = ScreenPosition.xy * _ScreenParams.xy; - $precision DITHER_THRESHOLDS[16] = + static const $precision DITHER_THRESHOLDS[16] = { 1.0 / 17.0, 9.0 / 17.0, 3.0 / 17.0, 11.0 / 17.0, 13.0 / 17.0, 5.0 / 17.0, 15.0 / 17.0, 7.0 / 17.0, diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs index 0b71135b2b5..628d5310bb2 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleCubemapNode.cs @@ -45,13 +45,16 @@ public sealed override void UpdateNodeAfterDeserialization() // Node generations public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + string outputVectorVariableName = GetVariableNameForSlot(OutputSlotId); + //Sampler input slot var samplerSlot = FindInputSlot(SamplerInputId); var edgesSampler = owner.GetEdges(samplerSlot.slotReference); + // Sample var id = GetSlotValue(CubemapInputId, generationMode); string result = string.Format("$precision4 {0} = SAMPLE_TEXTURECUBE_LOD({1}.tex, {2}.samplerstate, reflect(-{3}, {4}), {5});" - , GetVariableNameForSlot(OutputSlotId) + , outputVectorVariableName , id , edgesSampler.Any() ? GetSlotValue(SamplerInputId, generationMode) : id , GetSlotValue(ViewDirInputId, generationMode) @@ -59,6 +62,9 @@ public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode gene , GetSlotValue(LODInputId, generationMode)); sb.AppendLine(result); + + // Decode HDR + SampleTexture2DNode.AppendHDRDecodeOperation(sb, outputVectorVariableName, id); } public NeededCoordinateSpace RequiresViewDirection(ShaderStageCapability stageCapability) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs index 27ef05eab08..39ae971e9f0 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleRawCubemapNode.cs @@ -41,19 +41,25 @@ public sealed override void UpdateNodeAfterDeserialization() // Node generations public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + string outputVectorVariableName = GetVariableNameForSlot(OutputSlotId); + //Sampler input slot var samplerSlot = FindInputSlot(SamplerInputId); var edgesSampler = owner.GetEdges(samplerSlot.slotReference); + // Sample var id = GetSlotValue(CubemapInputId, generationMode); string result = string.Format("$precision4 {0} = SAMPLE_TEXTURECUBE_LOD({1}.tex, {2}.samplerstate, {3}, {4});" - , GetVariableNameForSlot(OutputSlotId) + , outputVectorVariableName , id , edgesSampler.Any() ? GetSlotValue(SamplerInputId, generationMode) : id , GetSlotValue(NormalInputId, generationMode) , GetSlotValue(LODInputId, generationMode)); sb.AppendLine(result); + + // Decode HDR + SampleTexture2DNode.AppendHDRDecodeOperation(sb, outputVectorVariableName, id); } public NeededCoordinateSpace RequiresNormal(ShaderStageCapability stageCapability) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs index aecfa085e44..f5cdb655d64 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DArrayNode.cs @@ -82,6 +82,8 @@ public sealed override void UpdateNodeAfterDeserialization() // Node generations public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + string outputVectorVariableName = GetVariableNameForSlot(OutputSlotRGBAId); + var uvName = GetSlotValue(UVInput, generationMode); var indexName = GetSlotValue(IndexInputId, generationMode); @@ -89,9 +91,10 @@ public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode gene var samplerSlot = FindInputSlot(SamplerInput); var edgesSampler = owner.GetEdges(samplerSlot.slotReference); + // Sample var id = GetSlotValue(TextureInputId, generationMode); var result = string.Format("$precision4 {0} = {1}({2}.tex, {3}.samplerstate, {4}, {5} {6});" - , GetVariableNameForSlot(OutputSlotRGBAId) + , outputVectorVariableName , MipSamplingModesUtils.Get2DTextureSamplingMacro(m_MipSamplingMode, usePlatformMacros: !m_EnableGlobalMipBias, isArray: true) , id , edgesSampler.Any() ? GetSlotValue(SamplerInput, generationMode) : id @@ -101,10 +104,14 @@ public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode gene sb.AppendLine(result); - sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), GetVariableNameForSlot(OutputSlotRGBAId))); + // Decode HDR + SampleTexture2DNode.AppendHDRDecodeOperation(sb, outputVectorVariableName, id); + + // Extract components + sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), outputVectorVariableName)); } public bool RequiresMeshUV(UVChannel channel, ShaderStageCapability stageCapability) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs index a5f6cf049f2..8ef013af9fe 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture2DNode.cs @@ -127,18 +127,31 @@ public override void Setup() textureSlot.defaultType = (textureType == TextureType.Normal ? Texture2DShaderProperty.DefaultType.NormalMap : Texture2DShaderProperty.DefaultType.White); } + public static void AppendHDRDecodeOperation(ShaderStringBuilder sb, string sampledDataVariableName, + string textureInputVariableName) + { + // Compiler should optimize away the whole branch if the texture isn't an HDR texture property + sb.AppendLine(string.Format("if ({0}.hdrDecode.x > 0)", textureInputVariableName)); + sb.IncreaseIndent(); + sb.AppendLine(string.Format("{0} = DecodeHDRSample({0}, {1}.hdrDecode);", sampledDataVariableName, + textureInputVariableName)); + sb.DecreaseIndent(); + } + // Node generations public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { var uvName = GetSlotValue(UVInput, generationMode); + string outputVectorVariableName = GetVariableNameForSlot(OutputSlotRGBAId); //Sampler input slot var samplerSlot = FindInputSlot(SamplerInput); var edgesSampler = owner.GetEdges(samplerSlot.slotReference); + // Sample var id = GetSlotValue(TextureInputId, generationMode); var result = string.Format("$precision4 {0} = {1}({2}.tex, {3}.samplerstate, {2}.GetTransformedUV({4}) {5});" - , GetVariableNameForSlot(OutputSlotRGBAId) + , outputVectorVariableName , MipSamplingModesUtils.Get2DTextureSamplingMacro(m_MipSamplingMode, usePlatformMacros: !m_EnableGlobalMipBias, isArray: false) , id , edgesSampler.Any() ? GetSlotValue(SamplerInput, generationMode) : id @@ -147,24 +160,27 @@ public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode gene sb.AppendLine(result); + // Decode HDR + AppendHDRDecodeOperation(sb, outputVectorVariableName, id); + + // Unpack normal if (textureType == TextureType.Normal) { if (normalMapSpace == NormalMapSpace.Tangent) { - sb.AppendLine(string.Format("{0}.rgb = UnpackNormal({0});", GetVariableNameForSlot(OutputSlotRGBAId))); + sb.AppendLine(string.Format("{0}.rgb = UnpackNormal({0});", outputVectorVariableName)); } else { - sb.AppendLine(string.Format("{0}.rgb = UnpackNormalRGB({0});", GetVariableNameForSlot(OutputSlotRGBAId))); + sb.AppendLine(string.Format("{0}.rgb = UnpackNormalRGB({0});", outputVectorVariableName)); } } - sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), GetVariableNameForSlot(OutputSlotRGBAId))); - - - sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), GetVariableNameForSlot(OutputSlotRGBAId))); + // Extract components + sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), outputVectorVariableName)); } public bool RequiresMeshUV(UVChannel channel, ShaderStageCapability stageCapability) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs index 195d4ff155b..113b7bcd6bb 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/Texture/SampleTexture3DNode.cs @@ -68,14 +68,16 @@ public sealed override void UpdateNodeAfterDeserialization() public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { var uvName = GetSlotValue(UVInput, generationMode); + string outputVectorVariableName = GetVariableNameForSlot(OutputSlotRGBAId); //Sampler input slot var samplerSlot = FindInputSlot(SamplerInput); var edgesSampler = owner.GetEdges(samplerSlot.slotReference); + // Sample var id = GetSlotValue(TextureInputId, generationMode); var result = string.Format("$precision4 {0} = {1}({2}.tex, {3}.samplerstate, {4} {5});" - , GetVariableNameForSlot(OutputSlotRGBAId) + , outputVectorVariableName , MipSamplingModesUtils.Get3DTextureSamplingMacro(m_MipSamplingMode, usePlatformMacros: false) , id , edgesSampler.Any() ? GetSlotValue(SamplerInput, generationMode) : id @@ -84,10 +86,14 @@ public virtual void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode gene sb.AppendLine(result); - sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), GetVariableNameForSlot(OutputSlotRGBAId))); - sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), GetVariableNameForSlot(OutputSlotRGBAId))); + // Decode HDR + SampleTexture2DNode.AppendHDRDecodeOperation(sb, outputVectorVariableName, id); + + // Extract components + sb.AppendLine(string.Format("$precision {0} = {1}.r;", GetVariableNameForSlot(OutputSlotRId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.g;", GetVariableNameForSlot(OutputSlotGId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.b;", GetVariableNameForSlot(OutputSlotBId), outputVectorVariableName)); + sb.AppendLine(string.Format("$precision {0} = {1}.a;", GetVariableNameForSlot(OutputSlotAId), outputVectorVariableName)); } } } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementLayoutUVNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementLayoutUVNode.cs index b03a43168cd..8fb535852f6 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementLayoutUVNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementLayoutUVNode.cs @@ -1,12 +1,13 @@ using UnityEditor.Graphing; using UnityEditor.Rendering.UITK.ShaderGraph; +using UnityEditor.ShaderGraph.Internal; using UnityEngine; namespace UnityEditor.ShaderGraph { [Title("Input", "UI", "Element Layout UV")] [SubTargetFilter(typeof(IUISubTarget))] - class ElementLayoutUV : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireUITK + class ElementLayoutUV : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireUITK, IMayRequireMeshUV { public const int LayoutUVSlotId = 0; @@ -29,12 +30,25 @@ public override void UpdateNodeAfterDeserialization() public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { - if (GetInputNodeFromSlot(LayoutUVSlotId) != null) sb.AppendLine(string.Format("$precision2 {0} = IN.layoutUV.xy;", GetVariableNameForSlot(LayoutUVSlotId))); + if (generationMode == GenerationMode.Preview) + { + // In preview mode, use standard mesh UV0 (will visualize as color: red = u, green = v) + sb.AppendLine("$precision2 {0} = IN.uv0.xy;", GetVariableNameForSlot(LayoutUVSlotId)); + return; + } + + if (GetInputNodeFromSlot(LayoutUVSlotId) != null) sb.AppendLine("$precision2 {0} = IN.layoutUV.xy;", GetVariableNameForSlot(LayoutUVSlotId)); } public bool RequiresUITK(ShaderStageCapability stageCapability) { return true; } + + public bool RequiresMeshUV(UVChannel channel, ShaderStageCapability stageCapability) + { + // Require UV0 in preview mode for visualization + return channel == UVChannel.UV0; + } } } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureSizeNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureSizeNode.cs index eaa0f19b0f7..8f465d10f12 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureSizeNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureSizeNode.cs @@ -39,6 +39,16 @@ public override void UpdateNodeAfterDeserialization() public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + if (generationMode == GenerationMode.Preview) + { + // In preview mode, return default values (1.0) + if (GetInputNodeFromSlot(TextureWidthSlotId) != null) sb.AppendLine("$precision1 {0} = 1.0;", GetVariableNameForSlot(TextureWidthSlotId)); + if (GetInputNodeFromSlot(TextureHeightSlotId) != null) sb.AppendLine("$precision1 {0} = 1.0;", GetVariableNameForSlot(TextureHeightSlotId)); + if (GetInputNodeFromSlot(TexelWidthSlotId) != null) sb.AppendLine("$precision1 {0} = 1.0;", GetVariableNameForSlot(TexelWidthSlotId)); + if (GetInputNodeFromSlot(TexelHeightSlotId) != null) sb.AppendLine("$precision1 {0} = 1.0;", GetVariableNameForSlot(TexelHeightSlotId)); + return; + } + if ((GetInputNodeFromSlot(TextureWidthSlotId) != null) || (GetInputNodeFromSlot(TextureHeightSlotId) != null) || (GetInputNodeFromSlot(TexelWidthSlotId) != null) || diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureUVNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureUVNode.cs index 62f4226cdb7..2c6f9125666 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureUVNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Input/UI/ElementTextureUVNode.cs @@ -1,12 +1,13 @@ using UnityEditor.Graphing; using UnityEditor.Rendering.UITK.ShaderGraph; +using UnityEditor.ShaderGraph.Internal; using UnityEngine; namespace UnityEditor.ShaderGraph { [Title("Input", "UI", "Element Texture UV")] [SubTargetFilter(typeof(IUISubTarget))] - class ElementTextureUVNode : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireUITK + class ElementTextureUVNode : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireUITK, IMayRequireMeshUV { public const int TextureUVSlotId = 0; @@ -29,12 +30,25 @@ public override void UpdateNodeAfterDeserialization() public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { - if (GetInputNodeFromSlot(TextureUVSlotId) != null) sb.AppendLine(string.Format("$precision2 {0} = IN.uvClip.xy;", GetVariableNameForSlot(TextureUVSlotId))); + if (generationMode == GenerationMode.Preview) + { + // In preview mode, use standard mesh UV0 (will visualize as color: red = u, green = v) + sb.AppendLine("$precision2 {0} = IN.uv0.xy;", GetVariableNameForSlot(TextureUVSlotId)); + return; + } + + if (GetInputNodeFromSlot(TextureUVSlotId) != null) sb.AppendLine("$precision2 {0} = IN.uvClip.xy;", GetVariableNameForSlot(TextureUVSlotId)); } public bool RequiresUITK(ShaderStageCapability stageCapability) { return true; } + + public bool RequiresMeshUV(UVChannel channel, ShaderStageCapability stageCapability) + { + // Require UV0 in preview mode for visualization + return channel == UVChannel.UV0; + } } } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultBitmapTextNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultBitmapTextNode.cs index 2d8e4e4b3ef..7acf9e22c6f 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultBitmapTextNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultBitmapTextNode.cs @@ -33,7 +33,15 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo { string outputVarName = GetVariableNameForSlot(k_OutputSlotId); - sb.AppendLine("float4 {0} = float4(1, 1, 0, 1);", outputVarName); + sb.AppendLine("float4 {0} = float4(1, 1, 1, 1);", outputVarName); + + if (generationMode == GenerationMode.Preview) + { + bool hasTint = GetInputNodeFromSlot(k_InputSlotIdTint) != null; + if (hasTint) + sb.AppendLine("{0} = {1};", outputVarName, GetSlotValue(k_InputSlotIdTint, generationMode)); + return; + } sb.AppendLine("[branch] if ((_UIE_RENDER_TYPE_TEXT || _UIE_RENDER_TYPE_ANY) && round(IN.typeTexSettings.x) == k_FragTypeText && (!(GetTextureInfo(IN.typeTexSettings.y).sdfScale > 0.0)))"); using (sb.BlockScope()) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultGradientNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultGradientNode.cs index d5c2f7420d7..d94d3f231fb 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultGradientNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultGradientNode.cs @@ -29,7 +29,10 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo { string outputVarName = GetVariableNameForSlot(k_OutputSlotId); - sb.AppendLine("float4 {0} = float4(1, 1, 0, 1);", outputVarName); + sb.AppendLine("float4 {0} = float4(1, 1, 1, 1);", outputVarName); + + if (generationMode == GenerationMode.Preview) + return; sb.AppendLine("[branch] if (_UIE_RENDER_TYPE_GRADIENT || _UIE_RENDER_TYPE_ANY && round(IN.typeTexSettings.x) == k_FragTypeSvgGradient)"); using (sb.BlockScope()) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSDFTextNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSDFTextNode.cs index 8791c282b74..3c17868952d 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSDFTextNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSDFTextNode.cs @@ -33,7 +33,15 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo { string outputVarName = GetVariableNameForSlot(k_OutputSlotId); - sb.AppendLine("float4 {0} = float4(1, 1, 0, 1);", outputVarName); + sb.AppendLine("float4 {0} = float4(1, 1, 1, 1);", outputVarName); + + if (generationMode == GenerationMode.Preview) + { + bool hasTint = GetInputNodeFromSlot(k_InputSlotIdTint) != null; + if (hasTint) + sb.AppendLine("{0} = {1};", outputVarName, GetSlotValue(k_InputSlotIdTint, generationMode)); + return; + } sb.AppendLine("[branch] if ((_UIE_RENDER_TYPE_TEXT || _UIE_RENDER_TYPE_ANY) && round(IN.typeTexSettings.x) == k_FragTypeText && (GetTextureInfo(IN.typeTexSettings.y).sdfScale > 0.0))"); using (sb.BlockScope()) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSolidNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSolidNode.cs index 2f24f607cd5..d02938ca859 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSolidNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultSolidNode.cs @@ -29,7 +29,10 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo { string outputVarName = GetVariableNameForSlot(k_OutputSlotId); - sb.AppendLine("float4 {0} = float4(1, 1, 0, 1);", outputVarName); + sb.AppendLine("float4 {0} = float4(1, 1, 1, 1);", outputVarName); + + if (generationMode == GenerationMode.Preview) + return; sb.AppendLine("[branch] if (_UIE_RENDER_TYPE_SOLID || _UIE_RENDER_TYPE_ANY && round(IN.typeTexSettings.x) == k_FragTypeSolid)"); using (sb.BlockScope()) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultTextureNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultTextureNode.cs index 64c73d86836..fdbb5b0405d 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultTextureNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/DefaultTextureNode.cs @@ -36,7 +36,15 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo { string outputVarName = GetVariableNameForSlot(k_OutputSlotId); - sb.AppendLine("float4 {0} = float4(1, 1, 0, 1);", outputVarName); + sb.AppendLine("float4 {0} = float4(1, 1, 1, 1);", outputVarName); + + if (generationMode == GenerationMode.Preview) + { + bool hasTint = GetInputNodeFromSlot(k_InputSlotIdTint) != null; + if (hasTint) + sb.AppendLine("{0} = {1};", outputVarName, GetSlotValue(k_InputSlotIdTint, generationMode)); + return; + } sb.AppendLine("[branch] if (_UIE_RENDER_TYPE_TEXTURE || _UIE_RENDER_TYPE_ANY && round(IN.typeTexSettings.x) == k_FragTypeTexture)"); using (sb.BlockScope()) diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/IsForcedGammaNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/IsForcedGammaNode.cs index 1c812950f37..f46ac45e640 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/IsForcedGammaNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/IsForcedGammaNode.cs @@ -26,6 +26,13 @@ public sealed override void UpdateNodeAfterDeserialization() public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + if (generationMode == GenerationMode.Preview) + { + // In preview mode, return false by default + sb.AppendLine("bool {0} = false;", GetVariableNameForSlot(k_OutputSlotId)); + return; + } + sb.AppendLine("bool {0} = _UIE_FORCE_GAMMA;", GetVariableNameForSlot(k_OutputSlotId)); } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeBranchNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeBranchNode.cs index 4d35f17f2fb..caceae8a92b 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeBranchNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeBranchNode.cs @@ -49,9 +49,21 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo string outputVarNameColor = GetVariableNameForSlot(k_OutputSlotIdColor); string outputVarNameAlpha = GetVariableNameForSlot(k_OutputSlotIdAlpha); - sb.AppendLine("float3 {0} = float3(0, 0, 0);", outputVarNameColor); + sb.AppendLine("float3 {0} = float3(1, 1, 1);", outputVarNameColor); sb.AppendLine("float {0} = 1.0;", outputVarNameAlpha); + if (generationMode == GenerationMode.Preview) + { + // In preview mode the UITK render-type macros don't exist. + // Output the Solid input if connected. + if (GetInputNodeFromSlot(k_InputSlotIdSolid) != null) + { + sb.AppendLine("{0} = {1}.rgb;", outputVarNameColor, GetSlotValue(k_InputSlotIdSolid, generationMode)); + sb.AppendLine("{0} = {1}.a;", outputVarNameAlpha, GetSlotValue(k_InputSlotIdSolid, generationMode)); + } + return; + } + sb.AppendLine("[branch] if (_UIE_RENDER_TYPE_SOLID || _UIE_RENDER_TYPE_ANY && TestType(IN.typeTexSettings.x, k_FragTypeSolid))"); using (sb.BlockScope()) { diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeNode.cs index 3aaed5f3bcf..45a7663a8f7 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/RenderTypeNode.cs @@ -39,6 +39,18 @@ public sealed override void UpdateNodeAfterDeserialization() public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + if (generationMode == GenerationMode.Preview) + { + // In preview mode the UITK render-type macros don't exist. + // Default to Solid render type. + sb.AppendLine("bool {0} = true;", GetVariableNameForSlot(k_OutputSlotIdSolid)); + sb.AppendLine("bool {0} = false;", GetVariableNameForSlot(k_OutputSlotIdTexture)); + sb.AppendLine("bool {0} = false;", GetVariableNameForSlot(k_OutputSlotIdSDFText)); + sb.AppendLine("bool {0} = false;", GetVariableNameForSlot(k_OutputSlotIdBitmapText)); + sb.AppendLine("bool {0} = false;", GetVariableNameForSlot(k_OutputSlotIdGradient)); + return; + } + sb.AppendLine("bool {0} = _UIE_RENDER_TYPE_SOLID || _UIE_RENDER_TYPE_ANY && round(IN.typeTexSettings.x) == k_FragTypeSolid;", GetVariableNameForSlot(k_OutputSlotIdSolid)); sb.AppendLine("bool {0} = _UIE_RENDER_TYPE_TEXTURE || _UIE_RENDER_TYPE_ANY && round(IN.typeTexSettings.x) == k_FragTypeTexture;", GetVariableNameForSlot(k_OutputSlotIdTexture)); sb.AppendLine("bool {0} = (_UIE_RENDER_TYPE_TEXT || _UIE_RENDER_TYPE_ANY) && round(IN.typeTexSettings.x) == k_FragTypeText && (GetTextureInfo(IN.typeTexSettings.y).sdfScale > 0.0);", GetVariableNameForSlot(k_OutputSlotIdSDFText)); diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs index 24f2be454ac..2083a0d538b 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs @@ -82,6 +82,16 @@ public void GenerateNodeFunction(FunctionRegistry registry, GenerationMode gener public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode) { + if (generationMode == GenerationMode.Preview) + { + // In preview mode, return white + sb.AppendLine("$precision4 {0} = $precision4(1, 1, 1, 1);", GetVariableNameForSlot(Color0SlotId)); + sb.AppendLine("$precision4 {0} = $precision4(1, 1, 1, 1);", GetVariableNameForSlot(Color1SlotId)); + sb.AppendLine("$precision4 {0} = $precision4(1, 1, 1, 1);", GetVariableNameForSlot(Color2SlotId)); + sb.AppendLine("$precision4 {0} = $precision4(1, 1, 1, 1);", GetVariableNameForSlot(Color3SlotId)); + return; + } + sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color0SlotId)); sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color1SlotId)); sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color2SlotId)); @@ -99,6 +109,13 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo GetVariableNameForSlot(Color1SlotId), GetVariableNameForSlot(Color2SlotId), GetVariableNameForSlot(Color3SlotId)); + + sb.AppendLine("#if _UIE_FORCE_GAMMA"); + sb.AppendLine("{0}.rgb = uie_linear_to_gamma({1}.rgb);", GetVariableNameForSlot(Color0SlotId), GetVariableNameForSlot(Color0SlotId)); + sb.AppendLine("{0}.rgb = uie_linear_to_gamma({1}.rgb);", GetVariableNameForSlot(Color1SlotId), GetVariableNameForSlot(Color1SlotId)); + sb.AppendLine("{0}.rgb = uie_linear_to_gamma({1}.rgb);", GetVariableNameForSlot(Color2SlotId), GetVariableNameForSlot(Color2SlotId)); + sb.AppendLine("{0}.rgb = uie_linear_to_gamma({1}.rgb);", GetVariableNameForSlot(Color3SlotId), GetVariableNameForSlot(Color3SlotId)); + sb.AppendLine("#endif"); } } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs index 6b000443f58..0deb70fed20 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs @@ -245,6 +245,10 @@ void AssignDefaultBareResource(MaterialSlot slot, ShaderStringBuilder sb) sb.Append(slotVariable); sb.Append(".scaleTranslate = float4(1.0f, 1.0f, 0.0f, 0.0f);"); sb.AppendNewLine(); + sb.TryAppendIndentation(); + sb.Append(slotVariable); + sb.Append(".hdrDecode = float4(0.0f, 0.0f, 0.0f, 0.0f);"); + sb.AppendNewLine(); } break; case ConcreteSlotValueType.Texture3D: diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs index b40b821fdfa..7ce6a14f9c1 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs @@ -8,6 +8,8 @@ class PreviewNode : CodeFunctionNode { public override bool hasPreview { get { return true; } } + internal override bool UsePreviewPref => false; + protected override bool CanPropagateFloatLiteral => true; [SerializeField] diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs index d495c88ca16..38462794b0f 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs @@ -141,8 +141,7 @@ public bool FindPort(SlotReference slot, out ShaderPort port) public void AttachMessage(string errString, ShaderCompilerMessageSeverity severity) { ClearMessage(); - IconBadge badge; - badge = IconBadge.CreateComment(errString); + IconBadge badge = IconBadgeWrapper.CreateComment(errString); Add(badge); badge.AttachTo(outputContainer, SpriteAlignment.RightCenter); diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs index 187a8577d9e..7e0b9f7cf3f 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs @@ -68,6 +68,10 @@ class ShaderInputPropertyDrawer : IPropertyDrawer const string m_EnumRefDisallowedPattern = @"(?:[^A-Za-z_0-9_.])"; const string m_AttributeValueDisallowedPattern = @"(?:[^A-Za-z_0-9._ ])"; + const string kHDRTextureToggleTooltip = + "When enabled, any node which samples this texture will automatically decode the sampled value" + + " if the texture was stored using an encoded HDR format such as dLDR."; + public ShaderInputPropertyDrawer() { greyLabel = new GUIStyle(EditorStyles.label); @@ -1020,6 +1024,19 @@ out var texture2DField new ToggleData(texture2DProperty.useTexelSize, true), "Use TexelSize", out var texelSizeToggle)); + propertySheet.Add(togglePropertyDrawer.CreateGUI( + newValue => + { + this._preChangeValueCallback("Change Is HDR"); + if (texture2DProperty.isHDR == newValue.isOn) + return; + texture2DProperty.isHDR = newValue.isOn; + this._postChangeValueCallback(modificationScope: ModificationScope.Graph); + }, + new ToggleData(texture2DProperty.isHDR, true), + "Is HDR", + out var isHDRToggle, + tooltip: kHDRTextureToggleTooltip)); } } @@ -1037,6 +1054,24 @@ void HandleTexture2DArrayProperty(PropertySheet propertySheet, Texture2DArraySha isCurrentPropertyGlobal ? "Preview Value" : "Default Value", out var texture2DArrayField )); + + if (!isSubGraph || shaderInput.promoteToFinalShader) + { + var togglePropertyDrawer = new ToggleDataPropertyDrawer(); + propertySheet.Add(togglePropertyDrawer.CreateGUI( + newValue => + { + this._preChangeValueCallback("Change Is HDR"); + if (texture2DArrayProperty.isHDR == newValue.isOn) + return; + texture2DArrayProperty.isHDR = newValue.isOn; + this._postChangeValueCallback(modificationScope: ModificationScope.Graph); + }, + new ToggleData(texture2DArrayProperty.isHDR, true), + "Is HDR", + out var isHDRToggle, + tooltip: kHDRTextureToggleTooltip)); + } } #region VT reorderable list handler @@ -1296,6 +1331,24 @@ void HandleTexture3DProperty(PropertySheet propertySheet, Texture3DShaderPropert isCurrentPropertyGlobal ? "Preview Value" : "Default Value", out var texture3DField )); + + if (!isSubGraph || shaderInput.promoteToFinalShader) + { + ToggleDataPropertyDrawer togglePropertyDrawer = new ToggleDataPropertyDrawer(); + propertySheet.Add(togglePropertyDrawer.CreateGUI( + newValue => + { + this._preChangeValueCallback("Change Is HDR"); + if (texture3DShaderProperty.isHDR == newValue.isOn) + return; + texture3DShaderProperty.isHDR = newValue.isOn; + this._postChangeValueCallback(modificationScope: ModificationScope.Graph); + }, + new ToggleData(texture3DShaderProperty.isHDR, true), + "Is HDR", + out var isHDRToggle, + tooltip: kHDRTextureToggleTooltip)); + } } void HandleCubemapProperty(PropertySheet propertySheet, CubemapShaderProperty cubemapProperty) @@ -1312,6 +1365,24 @@ void HandleCubemapProperty(PropertySheet propertySheet, CubemapShaderProperty cu isCurrentPropertyGlobal ? "Preview Value" : "Default Value", out var propertyCubemapField )); + + if (!isSubGraph || shaderInput.promoteToFinalShader) + { + ToggleDataPropertyDrawer togglePropertyDrawer = new ToggleDataPropertyDrawer(); + propertySheet.Add(togglePropertyDrawer.CreateGUI( + newValue => + { + this._preChangeValueCallback("Change Is HDR"); + if (cubemapProperty.isHDR == newValue.isOn) + return; + cubemapProperty.isHDR = newValue.isOn; + this._postChangeValueCallback(modificationScope: ModificationScope.Graph); + }, + new ToggleData(cubemapProperty.isHDR, true), + "Is HDR", + out var isHDRToggle, + tooltip: kHDRTextureToggleTooltip)); + } } void HandleBooleanProperty(PropertySheet propertySheet, BooleanShaderProperty booleanProperty) diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs b/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs index 464f339083a..c6a10882539 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs @@ -1402,7 +1402,9 @@ void CompileMasterNodeShader() // Skip generation for VFXTarget if (!m_Graph.isOnlyVFXTarget) { - var generator = new Generator(m_Graph, m_Graph.outputNode, GenerationMode.Preview, "Master"); + // UITK shaders need ForReals mode to have access to UITK macros for proper rendering + var mode = prefersUITKPreview ? GenerationMode.ForReals : GenerationMode.Preview; + var generator = new Generator(m_Graph, m_Graph.outputNode, mode, "Master"); shaderData.shaderString = generator.generatedShader; // record the blocks temporarily created for missing stack blocks diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs index 0ce96188f94..c8160a7917e 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs @@ -131,6 +131,7 @@ void ChangeTargetSettings() graph.AddRemoveBlocksFromActiveList(activeBlocks); } + graph.RefreshBadgesAndPreviews(); graph.UpdateActiveBlocks(activeBlocks); this.m_PreviewManagerUpdateDelegate(); this.m_InspectorUpdateDelegate(); diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs index 830d0220222..9cdf104caac 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs @@ -195,11 +195,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi IconBadge badge; if (severity == ShaderCompilerMessageSeverity.Error) { - badge = IconBadge.CreateError(errString); + badge = IconBadgeWrapper.CreateError(errString); } else { - badge = IconBadge.CreateComment(errString); + badge = IconBadgeWrapper.CreateComment(errString); } Add(badge); diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs index dcfd38e5ab8..051d612b3ae 100644 --- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs +++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs @@ -326,11 +326,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi IconBadge badge; if (severity == ShaderCompilerMessageSeverity.Error) { - badge = IconBadge.CreateError(errString); + badge = IconBadgeWrapper.CreateError(errString); } else { - badge = IconBadge.CreateComment(errString); + badge = IconBadgeWrapper.CreateComment(errString); } Add(badge); diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs index dd53a92c2f4..47cf20d0cc8 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs +++ b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs @@ -12,6 +12,7 @@ using UnityEngine.Assertions; using Pool = UnityEngine.Pool; using UnityEngine.Profiling; +using UnityEditor.Rendering.UITK.ShaderGraph; namespace UnityEditor.ShaderGraph { @@ -166,6 +167,14 @@ Target[] GetTargetImplementations() } else { + var targets = m_GraphData.activeTargets.ToList(); + foreach (var target in targets) + { + if (target.activeSubTarget is IUISubTarget) + { + return new Target[] { new PreviewTarget(true) }; + } + } return new Target[] { new PreviewTarget() }; } } diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuiltInCanvasPass.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuiltInCanvasPass.hlsl index 7d326cef6d9..1edf07826d8 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuiltInCanvasPass.hlsl +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Includes/BuiltInCanvasPass.hlsl @@ -77,6 +77,8 @@ Varyings BuildVaryings(Attributes input) float4 clampedRect = clamp(_ClipRect, -2e10, 2e10); float2 maskUV = (input.positionOS.xy - clampedRect.xy) / (clampedRect.zw - clampedRect.xy); output.texCoord1 = float4(input.positionOS.xy * 2 - clampedRect.xy - clampedRect.zw, 0.25 / (0.25 * half2(_UIMaskSoftnessX, _UIMaskSoftnessY) + abs(pixelSize.xy))); + #else + output.texCoord1 = input.uv1; #endif #endif diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl index 7ed9e206705..6ac285ffcc4 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl @@ -218,8 +218,8 @@ real SampleShadowmapFiltered(TEXTURE2D_SHADOW_PARAM(ShadowMap, sampler_ShadowMap attenuation4.w = SAMPLE_TEXTURE2D_SHADOW(ShadowMap, sampler_ShadowMap, shadowCoord.xyz + samplingData.shadowOffset3.xyz); attenuation = dot(attenuation4, 0.25); #else - float fetchesWeights[9]; - float2 fetchesUV[9]; + real fetchesWeights[9]; + real2 fetchesUV[9]; SampleShadow_ComputeSamples_Tent_5x5(samplingData.shadowmapSize, shadowCoord.xy, fetchesWeights, fetchesUV); attenuation = fetchesWeights[0] * SAMPLE_TEXTURE2D_SHADOW(ShadowMap, sampler_ShadowMap, float3(fetchesUV[0].xy, shadowCoord.z)); diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl new file mode 100644 index 00000000000..5a1bca85b00 --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl @@ -0,0 +1,3 @@ +#ifdef UITK_PREVIEW +#include "UIShim.hlsl" +#endif diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl.meta b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl.meta new file mode 100644 index 00000000000..021fe44fc02 --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9f12249d09c77224c8a6d6fad6e252b5 +ShaderIncludeImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs b/Packages/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs index 89efef4d16b..8a65dac3ad6 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs @@ -10,10 +10,17 @@ sealed class PreviewTarget : Target { static readonly GUID kSourceCodeGuid = new GUID("7464b9fcde08e5645a16b9b8ae1e573c"); // PreviewTarget.cs - public PreviewTarget() + private bool isUITKPreview = false; + + public PreviewTarget() : this(false) + { + } + + public PreviewTarget(bool isUITKPreview) { displayName = "Preview"; isHidden = true; + this.isUITKPreview = isUITKPreview; } public override bool IsActive() => false; @@ -22,7 +29,7 @@ public PreviewTarget() public override void Setup(ref TargetSetupContext context) { context.AddAssetDependency(kSourceCodeGuid, AssetCollection.Flags.SourceDependency); - context.AddSubShader(SubShaders.Preview); + context.AddSubShader(SubShaders.GetPreview(isUITKPreview)); } public override void GetFields(ref TargetFieldContext context) @@ -41,66 +48,77 @@ public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Acti static class SubShaders { - public static SubShaderDescriptor Preview = new SubShaderDescriptor() + public static SubShaderDescriptor GetPreview(bool isUITKPreview) { - renderQueue = "Geometry", - renderType = "Opaque", - generatesPreview = true, - passes = new PassCollection { Passes.Preview }, - }; + var preview = new SubShaderDescriptor() + { + renderQueue = "Geometry", + renderType = "Opaque", + generatesPreview = true, + passes = new PassCollection { Passes.GetPreview(isUITKPreview) }, + }; + + return preview; + } } static class Passes { - public static PassDescriptor Preview = new PassDescriptor() + public static PassDescriptor GetPreview(bool isUITKPreview) { - // Definition - referenceName = "SHADERPASS_PREVIEW", - useInPreview = true, + var pass = new PassDescriptor() + { + // Definition + referenceName = "SHADERPASS_PREVIEW", + useInPreview = true, - // Templates - passTemplatePath = GenerationUtils.GetDefaultTemplatePath("PassMesh.template"), - sharedTemplateDirectories = GenerationUtils.GetDefaultSharedTemplateDirectories(), + // Templates + passTemplatePath = GenerationUtils.GetDefaultTemplatePath("PassMesh.template"), + sharedTemplateDirectories = GenerationUtils.GetDefaultSharedTemplateDirectories(), - // Collections - structs = new StructCollection - { - { Structs.Attributes }, - { StructDescriptors.PreviewVaryings }, - { Structs.SurfaceDescriptionInputs }, - { Structs.VertexDescriptionInputs }, - }, - fieldDependencies = FieldDependencies.Default, - pragmas = new PragmaCollection - { - { Pragma.Vertex("vert") }, - { Pragma.Fragment("frag") }, - }, - defines = new DefineCollection - { - { KeywordDescriptors.PreviewKeyword, 1 }, - }, - includes = new IncludeCollection - { - // Pre-graph - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/TextureStack.hlsl", IncludeLocation.Pregraph }, // TODO: put this on a conditional - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/NormalSurfaceGradient.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.shadergraph/ShaderGraphLibrary/ShaderVariables.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.shadergraph/ShaderGraphLibrary/ShaderVariablesFunctions.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl", IncludeLocation.Pregraph }, - { "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShim.hlsl", IncludeLocation.Pregraph }, - - // Post-graph - { "Packages/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl", IncludeLocation.Postgraph }, - { "Packages/com.unity.shadergraph/ShaderGraphLibrary/PreviewPass.hlsl", IncludeLocation.Postgraph }, - } - }; + // Collections + structs = new StructCollection + { + { Structs.Attributes }, + { StructDescriptors.PreviewVaryings }, + { Structs.SurfaceDescriptionInputs }, + { Structs.VertexDescriptionInputs }, + }, + fieldDependencies = FieldDependencies.Default, + pragmas = new PragmaCollection + { + { Pragma.Vertex("vert") }, + { Pragma.Fragment("frag") }, + }, + defines = new DefineCollection + { + { KeywordDescriptors.PreviewKeyword, 1 }, + { KeywordDescriptors.UITKPreviewKeyword, isUITKPreview ? 1 : 0 } + }, + includes = new IncludeCollection + { + // Pre-graph + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/TextureStack.hlsl", IncludeLocation.Pregraph }, // TODO: put this on a conditional + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/NormalSurfaceGradient.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/Texture.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.shadergraph/ShaderGraphLibrary/ShaderVariables.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.shadergraph/ShaderGraphLibrary/ShaderVariablesFunctions.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl", IncludeLocation.Pregraph }, + { "Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shim/UIShimPreview.hlsl", IncludeLocation.Pregraph }, + + // Post-graph + { "Packages/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl", IncludeLocation.Postgraph }, + { "Packages/com.unity.shadergraph/ShaderGraphLibrary/PreviewPass.hlsl", IncludeLocation.Postgraph }, + } + }; + + return pass; + } } static class StructDescriptors @@ -144,6 +162,15 @@ static class KeywordDescriptors scope = KeywordScope.Global, stages = KeywordShaderStage.All, }; + public static KeywordDescriptor UITKPreviewKeyword = new KeywordDescriptor() + { + displayName = "UITK Preview", + referenceName = "UITK_PREVIEW", + type = KeywordType.Boolean, + definition = KeywordDefinition.MultiCompile, + scope = KeywordScope.Global, + stages = KeywordShaderStage.All, + }; } } } diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs b/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs index 321ad95f8be..d69a5deb115 100644 --- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs +++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs @@ -218,6 +218,9 @@ public string GetValidatorKey() return "UISubTarget"; } + const string kUVErrorMessageNode = "UI Material does not support UV1-7. Consider using 'UV0'."; + const string kUVErrorMessageSubGraph = "UI Material does not support UV1-7. Consider using 'UV0' in the subgraph."; + public INodeValidationExtension.Status GetValidationStatus(AbstractMaterialNode node, out string msg) { // Make sure node is in our graph first @@ -227,6 +230,12 @@ public INodeValidationExtension.Status GetValidationStatus(AbstractMaterialNode return INodeValidationExtension.Status.None; } + // Clear all Warning/Error message from other providers. + // The message from the graph (when loading the graph) will not be removed + // since it's not the same provider as the UISubTarget. It then stays present + // even if the UV0 is selected. + node.owner.messageManager.ClearNodeFromOtherProvider(this, new[] { node }); + foreach (var item in node.owner.activeTargets) { if (item.prefersUITKPreview) @@ -235,16 +244,6 @@ public INodeValidationExtension.Status GetValidationStatus(AbstractMaterialNode { return INodeValidationExtension.Status.Warning; } - - UVNode uvNode = node as UVNode; - if (uvNode != null) - { - if (uvNode.uvChannel != UnityEditor.ShaderGraph.Internal.UVChannel.UV0) - { - msg = "UI Material does not support UV1-7. Consider using 'UV0'."; - return INodeValidationExtension.Status.Warning; - } - } } } @@ -261,7 +260,17 @@ private bool ValidateUV(AbstractMaterialNode node, out string warningMessage) { if (uvSlot.channel != UnityEditor.ShaderGraph.Internal.UVChannel.UV0) { - warningMessage = "UI Material does not support UV1-7. Consider using 'UV0'."; + warningMessage = kUVErrorMessageNode; + return true; + } + } + + UVNode uvNode = node as UVNode; + if (uvNode != null) + { + if (uvNode.uvChannel != UnityEditor.ShaderGraph.Internal.UVChannel.UV0) + { + warningMessage = kUVErrorMessageNode; return true; } } @@ -283,7 +292,7 @@ public override bool ValidateNodeCompatibility(AbstractMaterialNode node, out st { if (uvSlot.channel != UnityEditor.ShaderGraph.Internal.UVChannel.UV0) { - warningMessage = "UI Material does not support UV1-7. Consider using 'UV0'."; + warningMessage = kUVErrorMessageNode; return true; } } @@ -303,7 +312,7 @@ public override bool ValidateNodeCompatibility(AbstractMaterialNode node, out st { if (item != UnityEditor.ShaderGraph.Internal.UVChannel.UV0) { - warningMessage = "UI Material does not support UV1-7. Consider using 'UV0' in the subgraph."; + warningMessage = kUVErrorMessageSubGraph; return true; } } diff --git a/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs b/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs new file mode 100644 index 00000000000..726bb852d3d --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs @@ -0,0 +1,24 @@ +using GraphViewIconBadge = UnityEditor.Experimental.GraphView.IconBadge; + +namespace UnityEditor.ShaderGraph +{ + // Wrapper class for internal access to GraphView's IconBadge. + // Allows for creation of badges which don't manually layout their label's dimensions. Works around + // a GraphView bug. + internal static class IconBadgeWrapper + { + public static GraphViewIconBadge CreateError(string message) + { + var result = GraphViewIconBadge.CreateError(message); + result.m_ComputeTextBoundingBox = false; + return result; + } + + public static GraphViewIconBadge CreateComment(string message) + { + var result = GraphViewIconBadge.CreateComment(message); + result.m_ComputeTextBoundingBox = false; + return result; + } + } +} diff --git a/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs.meta b/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs.meta new file mode 100644 index 00000000000..c1cc195fd6a --- /dev/null +++ b/Packages/com.unity.shadergraph/Editor/Util/IconBadgeWrapper.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5c787299c2fabe242bc0bd089105b90e \ No newline at end of file diff --git a/Packages/com.unity.shadergraph/Editor/Util/MessageManager.cs b/Packages/com.unity.shadergraph/Editor/Util/MessageManager.cs index 2878744ae55..90d75b39bb4 100644 --- a/Packages/com.unity.shadergraph/Editor/Util/MessageManager.cs +++ b/Packages/com.unity.shadergraph/Editor/Util/MessageManager.cs @@ -124,6 +124,24 @@ public void ClearNodesFromProvider(object messageProvider, IEnumerable nodes) + { + foreach (var key in m_Messages.Keys) + { + if (key != messageProvider) + { + foreach (var node in nodes) + { + if (m_Messages[key].TryGetValue(node.objectId, out var messages)) + { + nodeMessagesChanged |= messages.Count > 0; + messages.Clear(); + } + } + } + } + } + public void ClearAll() { m_Messages.Clear(); diff --git a/Packages/com.unity.shadergraph/Samples~/CustomLighting/Components/Debug/DebugMaterials.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/CustomLighting/Components/Debug/DebugMaterials.shadersubgraph index 36f2d17785c..1c10d09d34f 100644 --- a/Packages/com.unity.shadergraph/Samples~/CustomLighting/Components/Debug/DebugMaterials.shadersubgraph +++ b/Packages/com.unity.shadergraph/Samples~/CustomLighting/Components/Debug/DebugMaterials.shadersubgraph @@ -2048,7 +2048,7 @@ "m_FunctionName": "DebugMaterialSwitch", "m_FunctionSource": "", "m_FunctionSourceUsePragmas": true, - "m_FunctionBody": "Out = None;\n#if !defined(SHADERGRAPH_PREVIEW) && defined(DEBUG_DISPLAY)\n[branch] switch(int(_DebugMaterialMode))\r\n{\r\n case 0:\r\n Out = None; break;\r\n case 1:\r\n Out = Albedo; break;\r\n case 2:\r\n Out = Specular; break;\n case 3:\r\n Out = Alpha; break;\n case 4:\r\n Out = Smoothness; break;\n case 5:\r\n Out = AmbientOcclusion; break;\n case 6:\r\n Out = Emission; break;\n case 7:\r\n Out = NormalWS * 0.5 + 0.5; break;\n case 8:\r\n Out = NormalTS * 0.5 + 0.5; break;\n case 9:\r\n Out = LightComplexity; break;\n case 10:\r\n Out = Metallic; break;\n case 11:\r\n Out = SpriteMask; break;\n case 12:\r\n Out = RenderingLayerMasks; break;\r\n default:\r\n Out = None; break;\r\n}\n#endif" + "m_FunctionBody": "Out = None;\n#if !defined(SHADERGRAPH_PREVIEW) && defined(DEBUG_DISPLAY)\n[branch] switch(int(_DebugMaterialMode))\r\n{\r\n case 0:\r\n Out = None; break;\r\n case 1:\r\n Out = Albedo; break;\r\n case 2:\r\n Out = Specular; break;\n case 3:\r\n Out = Alpha; break;\n case 4:\r\n Out = Smoothness; break;\n case 5:\r\n Out = AmbientOcclusion; break;\n case 6:\r\n Out = Emission; break;\n case 7:\r\n Out = NormalWS * 0.5 + 0.5; break;\n case 8:\r\n Out = NormalTS * 0.5 + 0.5; break;\n case 9:\r\n Out = LightComplexity; break;\n case 10:\r\n Out = Metallic; break;\n case 11:\r\n Out = SpriteMask; break;\n case 12:\r\n Out = RenderingLayerMasks; break;\r\n default:\r\n Out = None; break;\r\n}\n#endif\n\n// Disable this define to prevent the global unlit\n// fragment pass to override the color output again.\n#undef DEBUG_DISPLAY" } { diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph index a3fabf6d459..3b5473e0b84 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph @@ -51,9 +51,6 @@ { "m_Id": "af598f69845d4322a3fa6f65e57b5d22" }, - { - "m_Id": "16f8535027f847949355b78ab41f2dac" - }, { "m_Id": "0da18572f8504cfd84b5f52ff40a5928" }, @@ -113,6 +110,9 @@ }, { "m_Id": "afcc5a38abcc456e98bcc58aa7406f79" + }, + { + "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e" } ], "m_GroupDatas": [ @@ -136,20 +136,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "16f8535027f847949355b78ab41f2dac" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "c8bf5d9b74724d6bb41e87a6cbc4f87f" - }, - "m_SlotId": 395448508 - } - }, { "m_OutputSlot": { "m_Node": { @@ -383,9 +369,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "16f8535027f847949355b78ab41f2dac" + "m_Id": "6f377d1621c04ce29156fd4589667310" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { @@ -397,9 +383,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "6f377d1621c04ce29156fd4589667310" + "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e" }, - "m_SlotId": 1 + "m_SlotId": 2 } }, { @@ -486,6 +472,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c8bf5d9b74724d6bb41e87a6cbc4f87f" + }, + "m_SlotId": -505402754 + } + }, { "m_OutputSlot": { "m_Node": { @@ -666,11 +666,13 @@ "m_DisplayName": "SDFStroke", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "SDFStroke", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -681,6 +683,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, "m_Value": { @@ -703,6 +706,7 @@ "m_DisplayName": "Color", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -728,6 +732,7 @@ "m_DisplayName": "Width Height", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Width_Height", "m_StageCapability": 3, "m_Value": { @@ -749,6 +754,7 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { @@ -762,7 +768,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -773,11 +780,39 @@ "m_DisplayName": "Warp Direction", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Warp_Direction", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0aa550961ff5431d9a93be2281cbe094", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": -0.20000000298023225, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false } { @@ -788,11 +823,13 @@ "m_DisplayName": "Loop", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Loop", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -841,6 +878,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -854,7 +892,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -865,6 +904,7 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { @@ -878,7 +918,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -889,6 +930,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -929,52 +971,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.LerpNode", - "m_ObjectId": "16f8535027f847949355b78ab41f2dac", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Lerp", - "m_DrawState": { - "m_Expanded": false, - "m_Position": { - "serializedVersion": "2", - "x": -758.0000610351563, - "y": 262.0000305175781, - "width": 125.50006103515625, - "height": 94.0 - } - }, - "m_Slots": [ - { - "m_Id": "3dcd160c15ee4688aacb164c381c8f11" - }, - { - "m_Id": "c2cecac8e43c419f839bddf1ed5a4621" - }, - { - "m_Id": "1fa890e753ae4712a4c9ebb2560b070f" - }, - { - "m_Id": "9e8abc5f77574269983ef6ef21a25a4c" - } - ], - "synonyms": [ - "mix", - "blend", - "linear interpolate" - ], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -983,6 +979,7 @@ "m_DisplayName": "Move", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Move", "m_StageCapability": 3, "m_Value": { @@ -1004,6 +1001,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -1017,7 +1015,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1028,11 +1027,13 @@ "m_DisplayName": "Segments", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1043,6 +1044,7 @@ "m_DisplayName": "Pivot Point", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Pivot_Point", "m_StageCapability": 3, "m_Value": { @@ -1064,11 +1066,13 @@ "m_DisplayName": "Cutoff", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Cutoff", "m_StageCapability": 2, "m_Value": 0.5, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false } { @@ -1079,11 +1083,13 @@ "m_DisplayName": "Stroke", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Stroke", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1094,6 +1100,7 @@ "m_DisplayName": "PatternUV", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "PatternUV", "m_StageCapability": 3, "m_Value": { @@ -1107,30 +1114,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "1fa890e753ae4712a4c9ebb2560b070f", - "m_Id": 2, - "m_DisplayName": "T", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "T", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1139,6 +1122,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -1152,7 +1136,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1163,11 +1148,13 @@ "m_DisplayName": "Length Scale", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "LengthScale", "m_StageCapability": 3, "m_Value": 1.0, "m_DefaultValue": 1.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1178,6 +1165,7 @@ "m_DisplayName": "T", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, "m_Value": { @@ -1191,7 +1179,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1202,11 +1191,13 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1263,11 +1254,13 @@ "m_DisplayName": "Radial Scale", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "RadialScale", "m_StageCapability": 3, "m_Value": 0.6499999761581421, "m_DefaultValue": 1.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1278,6 +1271,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -1299,6 +1293,7 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { @@ -1312,7 +1307,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1323,6 +1319,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -1344,6 +1341,7 @@ "m_DisplayName": "UVraw", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "UVraw", "m_StageCapability": 3, "m_Value": { @@ -1365,11 +1363,13 @@ "m_DisplayName": "X", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, "m_Value": 0.11999999731779099, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1380,11 +1380,13 @@ "m_DisplayName": "Gradient", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Gradient", "m_StageCapability": 2, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1395,11 +1397,13 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1410,11 +1414,13 @@ "m_DisplayName": "Switch", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Switch", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1425,6 +1431,7 @@ "m_DisplayName": "RGBA", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 3, "m_Value": { @@ -1450,11 +1457,13 @@ "m_DisplayName": "A", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1465,6 +1474,7 @@ "m_DisplayName": "T", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, "m_Value": { @@ -1478,7 +1488,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1489,6 +1500,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -1529,30 +1541,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "3dcd160c15ee4688aacb164c381c8f11", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "x": -0.5, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1561,6 +1549,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -1582,6 +1571,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -1628,8 +1618,8 @@ "m_ObjectId": "4193bac99fe14dd6ac143ae0e13dc3cb", "m_Title": "Fake 3D Parallax Movement", "m_Position": { - "x": -3135.000244140625, - "y": 84.49995422363281 + "x": -3134.999755859375, + "y": 83.99998474121094 } } @@ -1723,11 +1713,13 @@ "m_DisplayName": "B", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1738,11 +1730,13 @@ "m_DisplayName": "R", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1753,6 +1747,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -1766,7 +1761,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1777,11 +1773,13 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 2, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1791,6 +1789,9 @@ "m_Guid": { "m_GuidSerialized": "971fbf50-1045-4944-816a-52e39cf83695" }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, "m_Name": "Speed", "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Speed", @@ -1803,13 +1804,27 @@ "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, + "hideConnector": false, "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], "m_Value": 0.30000001192092898, "m_FloatType": 0, + "m_LiteralFloatMode": false, "m_RangeValues": { "x": 0.0, "y": 1.0 - } + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] } { @@ -1820,6 +1835,7 @@ "m_DisplayName": "Scale", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Scale", "m_StageCapability": 3, "m_Value": { @@ -1880,6 +1896,7 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { @@ -1893,7 +1910,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -1904,26 +1922,13 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_In", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5ef9e0e8700940b288c7f65af21e3154", - "m_Id": 1024715749, - "m_DisplayName": "Edge Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "_Edge_Max", - "m_StageCapability": 3, - "m_Value": 0.6000000238418579, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -1933,7 +1938,7 @@ "m_Group": { "m_Id": "" }, - "m_Name": "Scale", + "m_Name": "UV Scale", "m_DrawState": { "m_Expanded": false, "m_Position": { @@ -1989,6 +1994,7 @@ "m_DisplayName": "Center", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Center", "m_StageCapability": 3, "m_Value": { @@ -2056,6 +2062,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -2069,7 +2076,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2080,11 +2088,13 @@ "m_DisplayName": "Mirror", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Mirror", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -2095,11 +2105,13 @@ "m_DisplayName": "Speed", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -2110,6 +2122,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -2149,6 +2162,7 @@ "m_DisplayName": "In", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { @@ -2162,7 +2176,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2284,11 +2299,13 @@ "m_DisplayName": "Tile V", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Tile_V", "m_StageCapability": 3, "m_Value": 12.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 2.0, + "m_Labels": [], + "m_LiteralMode": false } { @@ -2299,11 +2316,13 @@ "m_DisplayName": "Speed", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Speed", "m_StageCapability": 3, "m_Value": -0.30000001192092898, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.30000001192092898, + "m_Labels": [], + "m_LiteralMode": false } { @@ -2314,6 +2333,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -2327,7 +2347,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2338,11 +2359,13 @@ "m_DisplayName": "SDF", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "SDF", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -2398,6 +2421,7 @@ "m_DisplayName": "Scale", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Scale", "m_StageCapability": 3, "m_Value": { @@ -2462,6 +2486,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -2483,11 +2508,13 @@ "m_DisplayName": "G", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -2498,11 +2525,13 @@ "m_DisplayName": "Segments", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -2513,6 +2542,7 @@ "m_DisplayName": "T", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, "m_Value": { @@ -2526,7 +2556,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2537,6 +2568,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -2550,7 +2582,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2561,6 +2594,7 @@ "m_DisplayName": "Steps", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Steps", "m_StageCapability": 3, "m_Value": { @@ -2574,7 +2608,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2585,6 +2620,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -2606,6 +2642,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -2619,7 +2656,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2630,6 +2668,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -2643,7 +2682,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2654,11 +2694,13 @@ "m_DisplayName": "Tile U", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Tile_U", "m_StageCapability": 3, "m_Value": 1.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 2.0, + "m_Labels": [], + "m_LiteralMode": false } { @@ -2669,6 +2711,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -2682,7 +2725,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -2741,6 +2785,7 @@ "m_DisplayName": "UVrepeat", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "UVrepeat", "m_StageCapability": 3, "m_Value": { @@ -2841,6 +2886,7 @@ "m_DisplayName": "RawUV", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "RawUV", "m_StageCapability": 3, "m_Value": { @@ -2862,11 +2908,13 @@ "m_DisplayName": "Raw", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Raw", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -3005,6 +3053,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -3048,15 +3097,16 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "9ced7da4dc9d43ccb0f1ff9e43c3bd2c", - "m_Id": 0, - "m_DisplayName": "A", + "m_ObjectId": "973d8ebe90be4f08add8b2d1bf952a60", + "m_Id": 2, + "m_DisplayName": "T", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "A", + "m_HideConnector": false, + "m_ShaderOutputName": "T", "m_StageCapability": 3, "m_Value": { - "x": 0.5, + "x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0 @@ -3066,21 +3116,23 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "9e8abc5f77574269983ef6ef21a25a4c", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_ObjectId": "9ced7da4dc9d43ccb0f1ff9e43c3bd2c", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_HideConnector": false, + "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { - "x": 0.0, + "x": 0.5, "y": 0.0, "z": 0.0, "w": 0.0 @@ -3090,22 +3142,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "a055066658e44c1594559c0d9843b190", - "m_Id": 395448508, - "m_DisplayName": "Size", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "_Size", - "m_StageCapability": 3, - "m_Value": 0.30000001192092898, - "m_DefaultValue": 0.0, - "m_Labels": [] + }, + "m_LiteralMode": false } { @@ -3116,6 +3154,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3129,7 +3168,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3140,11 +3180,13 @@ "m_DisplayName": "Alpha Blur", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Alpha_Blur", "m_StageCapability": 3, "m_Value": 0.019999999552965165, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.019999999552965165, + "m_Labels": [], + "m_LiteralMode": false } { @@ -3155,6 +3197,7 @@ "m_DisplayName": "ScaledPatternUV", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "ScaledPatternUV", "m_StageCapability": 3, "m_Value": { @@ -3176,6 +3219,7 @@ "m_DisplayName": "Steps", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Steps", "m_StageCapability": 3, "m_Value": { @@ -3189,7 +3233,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3200,6 +3245,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3213,7 +3259,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3224,6 +3271,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3245,11 +3293,13 @@ "m_DisplayName": "Stroke Thickness", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Stroke_Thickness", "m_StageCapability": 3, "m_Value": 0.00800000037997961, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.10000000149011612, + "m_Labels": [], + "m_LiteralMode": false } { @@ -3260,6 +3310,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -3273,7 +3324,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3284,6 +3336,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -3396,11 +3449,13 @@ "m_DisplayName": "Alpha", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -3447,11 +3502,13 @@ "m_DisplayName": "Alpha Threshold", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Alpha_Threshold", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -3462,6 +3519,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3475,6 +3533,75 @@ "y": 0.0, "z": 0.0, "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "b9174043493f4cd99e2c39effb5651be", + "m_Id": -505402754, + "m_DisplayName": "Size", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "_Size", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5, + "y": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.LerpNode", + "m_ObjectId": "b9ab5b6eaab84b1b862f4d7475d9f64e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Lerp", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -788.0000610351563, + "y": 309.0, + "width": 126.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "0aa550961ff5431d9a93be2281cbe094" + }, + { + "m_Id": "f4033cbee9ae446fad531b0104fd0b01" + }, + { + "m_Id": "973d8ebe90be4f08add8b2d1bf952a60" + }, + { + "m_Id": "c2755eb0ebb141b0b3a9970ac54f1313" + } + ], + "synonyms": [ + "mix", + "blend", + "linear interpolate" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] } } @@ -3486,6 +3613,7 @@ "m_DisplayName": "RG", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "RG", "m_StageCapability": 3, "m_Value": { @@ -3507,11 +3635,13 @@ "m_DisplayName": "Warp", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Warp", "m_StageCapability": 3, "m_Value": -1.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.4000000059604645, + "m_Labels": [], + "m_LiteralMode": false } { @@ -3522,6 +3652,7 @@ "m_DisplayName": "Pivot Point", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Pivot_Point", "m_StageCapability": 3, "m_Value": { @@ -3538,25 +3669,27 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "c2cecac8e43c419f839bddf1ed5a4621", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_ObjectId": "c2755eb0ebb141b0b3a9970ac54f1313", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_HideConnector": false, + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { - "x": 0.5, - "y": 0.30000001192092898, - "z": 0.30000001192092898, - "w": 1.0 + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3567,6 +3700,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3580,7 +3714,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3591,11 +3726,13 @@ "m_DisplayName": "Segments", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -3700,10 +3837,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -609.9999389648438, - "y": 143.0, - "width": 135.50009155273438, - "height": 119.0 + "x": -586.0, + "y": 142.99998474121095, + "width": 138.00003051757813, + "height": 128.00001525878907 } }, "m_Slots": [ @@ -3711,13 +3848,10 @@ "m_Id": "aca6a626a141477499a6e0ef687a3891" }, { - "m_Id": "a055066658e44c1594559c0d9843b190" - }, - { - "m_Id": "ee08c56a92cc410e85ee383f93591908" + "m_Id": "b9174043493f4cd99e2c39effb5651be" }, { - "m_Id": "5ef9e0e8700940b288c7f65af21e3154" + "m_Id": "ee9a570ba03b469b8abe72d8af459242" }, { "m_Id": "a9fea0a8d40b4a099502bf7523b0e613" @@ -3753,7 +3887,9 @@ "b00cb833-c23a-491d-851f-f34a25e00811", "1e104722-91c8-4241-940c-215f9b31633e", "d6fb666f-cc12-409c-896b-7637d4c23f5f", - "e015c630-94c7-4d37-ba07-d88ff5cc18f7" + "e015c630-94c7-4d37-ba07-d88ff5cc18f7", + "232e58ed-3874-4127-b883-2b145fc9c297", + "a3e09643-9c20-4550-bbff-325ba2da06d6" ], "m_PropertyIds": [ -1344339004, @@ -3761,7 +3897,9 @@ -1561688663, 1024715749, -30538976, - -706569800 + -706569800, + -505402754, + 1803825018 ], "m_Dropdowns": [], "m_DropdownSelectedEntries": [] @@ -3775,6 +3913,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -3796,6 +3935,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -3809,7 +3949,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -3922,11 +4063,13 @@ "m_DisplayName": "Normalized", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Normalized", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -3937,6 +4080,7 @@ "m_DisplayName": "UV", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 3, "m_Value": { @@ -3959,13 +4103,13 @@ }, "m_Name": "Anti-Aliasing", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -474.4998474121094, - "y": 143.0, - "width": 207.99993896484376, - "height": 302.9999694824219 + "x": -447.9999694824219, + "y": 142.99998474121095, + "width": 163.0, + "height": 104.0 } }, "m_Slots": [ @@ -4008,6 +4152,7 @@ "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { @@ -4055,6 +4200,9 @@ "m_Guid": { "m_GuidSerialized": "ac38edfc-2b02-4f69-a8c1-c8c0ce8b9e7f" }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, "m_Name": "Segments", "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Segments", @@ -4067,13 +4215,27 @@ "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, + "hideConnector": false, "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], "m_Value": 20.0, "m_FloatType": 0, + "m_LiteralFloatMode": false, "m_RangeValues": { "x": 0.0, "y": 1.0 - } + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] } { @@ -4084,11 +4246,13 @@ "m_DisplayName": "Fill", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Fill", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -4138,6 +4302,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -4289,11 +4454,13 @@ "m_DisplayName": "Speed", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Speed", "m_StageCapability": 3, "m_Value": 1.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_DefaultValue": 0.20000000298023225, + "m_Labels": [], + "m_LiteralMode": false } { @@ -4304,6 +4471,7 @@ "m_DisplayName": "Stroke Thickness Relative", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "_Stroke_Thickness_Relative", "m_StageCapability": 3, "m_Value": true, @@ -4318,6 +4486,7 @@ "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { @@ -4331,21 +4500,29 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ee08c56a92cc410e85ee383f93591908", - "m_Id": -1561688663, - "m_DisplayName": "Edge Min", + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "ee9a570ba03b469b8abe72d8af459242", + "m_Id": 1803825018, + "m_DisplayName": "Edge Min Max", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "_Edge_Min", + "m_HideConnector": false, + "m_ShaderOutputName": "_Edge_Min_Max", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, "m_Labels": [] } @@ -4357,6 +4534,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -4370,7 +4548,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_LiteralMode": false } { @@ -4381,11 +4560,39 @@ "m_DisplayName": "G", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f4033cbee9ae446fad531b0104fd0b01", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_HideConnector": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false } { @@ -4396,11 +4603,13 @@ "m_DisplayName": "Alpha", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } { @@ -4411,6 +4620,7 @@ "m_DisplayName": "RGB", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "RGB", "m_StageCapability": 3, "m_Value": { @@ -4434,6 +4644,7 @@ "m_DisplayName": "Out", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 2, "m_Value": { @@ -4456,7 +4667,7 @@ "m_Group": { "m_Id": "4193bac99fe14dd6ac143ae0e13dc3cb" }, - "m_Name": "Scale", + "m_Name": "UV Scale", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -4512,13 +4723,15 @@ "m_DisplayName": "Y", "m_SlotType": 0, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [ "Y" - ] + ], + "m_LiteralMode": false } { @@ -4529,6 +4742,7 @@ "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { @@ -4549,6 +4763,9 @@ "m_Guid": { "m_GuidSerialized": "88540279-3baf-44d0-b0d8-244f93ef64c1" }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, "m_Name": "Color", "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Color", @@ -4561,7 +4778,10 @@ "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, + "hideConnector": false, "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], "m_Value": { "r": 1.0, "g": 1.0, @@ -4580,10 +4800,12 @@ "m_DisplayName": "R", "m_SlotType": 1, "m_Hidden": false, + "m_HideConnector": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Labels": [], + "m_LiteralMode": false } diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity index 535ec82ff0f..1b0673be55a 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity @@ -532,6 +532,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1026,6 +1027,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1475,6 +1477,7 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -2737,9 +2740,7 @@ PrefabInstance: memory, can be authored and edited directly in Shader Graph inside of Unity, automatically adapt to aspect ratio, and contain all visual states and behaviors.\r\n\nTo get started exploring the content, enter Play mode and then click on one - of the tabs to the left.\n\nNote: If you are using the New Input System, - you need to select the EventSystem GameObject and click on \"Replace with - InputSystemUIInputModule.\"" + of the tabs to the left." objectReference: {fileID: 0} - target: {fileID: 4262581316619277117, guid: abd54f4572036c549b81c1816521a3b1, type: 3} propertyPath: m_SizeDelta.x @@ -3134,17 +3135,28 @@ MonoBehaviour: m_GameObject: {fileID: 1084802477} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &1096159063 GameObject: m_ObjectHideFlags: 0 @@ -3767,6 +3779,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 + m_UseReflectionProbes: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -3859,6 +3872,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3880,9 +3895,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1402949190 MeshFilter: diff --git a/Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl b/Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl index 0ca356cf3c1..9b58e172208 100644 --- a/Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl +++ b/Packages/com.unity.shadergraph/ShaderGraphLibrary/Functions.hlsl @@ -80,6 +80,20 @@ float3 OklabToLinear(float3 lab) -0.0041960863f * l - 0.7034186147f * m + 1.7076147010f * s); } +// Decodes data sampled from an lDLR- or RGBM-encoded HDR texture, given decode instructions as supplied by +// the built-in {textureName}_HDR property. +float4 DecodeHDRSample(float4 encoded, float4 decodeInstructions) +{ + float alpha = decodeInstructions.w * (encoded.a - 1.0) + 1.0; +#if UNITY_COLORSPACE_GAMMA + encoded.rgb = (decodeInstructions.x * alpha) * encoded.rgb; +#else + encoded.rgb = (decodeInstructions.x * PositivePow(alpha, decodeInstructions.y)) * encoded.rgb; +#endif + encoded.a = 1; + return encoded; +} + #ifndef SHADERGRAPH_SAMPLE_SCENE_DEPTH #define SHADERGRAPH_SAMPLE_SCENE_DEPTH(uv) shadergraph_SampleSceneDepth(uv) #endif diff --git a/Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MessageManagerTests.cs b/Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MessageManagerTests.cs index 9ff8a425902..98d777c11a5 100644 --- a/Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MessageManagerTests.cs +++ b/Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MessageManagerTests.cs @@ -320,6 +320,27 @@ public void ReportAnyErrors_EmptyManager_ErrorOneProvider() var ret = m_EmptyMgr.HasSeverity(); Assert.IsTrue(ret); } + + [Test] + public void ClearNodesFromOtherProvider() + { + m_ComplexMgr.ClearNodeFromOtherProvider(p0, new List { node1 }); + + // Verify node1 is still in provider0 + Assert.IsTrue(m_ComplexMgr.Messages.ContainsKey(p0)); + Assert.IsTrue(m_ComplexMgr.Messages[p0].ContainsKey(node1.objectId)); + Assert.AreEqual(1, m_ComplexMgr.Messages[p0][node1.objectId].Count); + Assert.AreEqual(e2, m_ComplexMgr.Messages[p0][node1.objectId][0]); + + // Verify node1 is cleared from provider1 + Assert.IsTrue(m_ComplexMgr.Messages.ContainsKey(p1)); + Assert.IsTrue(m_ComplexMgr.Messages[p1].ContainsKey(node1.objectId)); + Assert.AreEqual(0, m_ComplexMgr.Messages[p1][node1.objectId].Count); + + // Verify other nodes in provider1 are unchanged + Assert.AreEqual(1, m_ComplexMgr.Messages[p1][node0.objectId].Count); + Assert.AreEqual(1, m_ComplexMgr.Messages[p1][node2.objectId].Count); + } } } diff --git a/Packages/com.unity.visualeffectgraph/Shaders/Sort.compute b/Packages/com.unity.visualeffectgraph/Shaders/Sort.compute index e4fe54c210a..419fea2b19e 100644 --- a/Packages/com.unity.visualeffectgraph/Shaders/Sort.compute +++ b/Packages/com.unity.visualeffectgraph/Shaders/Sort.compute @@ -112,6 +112,8 @@ void LoadFromMemory(uint3 groupId, uint ldsIndex) uint memIndex = DST_INDEX(groupId, ldsIndex); KVP kvp = { REJECTED_VALUE, 0xFFFFFFFF }; + + UNITY_BRANCH if (instanceDstIndex < GetElementCount(groupId.z)) kvp = inputSequence[totalInstanceCount + memIndex]; @@ -245,6 +247,7 @@ void MERGE_PASS(uint3 groupId : SV_GroupID, const int arrayStart = arraySize * (id / arraySize); // If the current array considered is less than one half filled (due to element count), we can copy it directly as it is already sorted + UNITY_BRANCH if (GetElementCount(groupId.z) - (uint)arrayStart <= subArraySize) { #if FINAL_PASS diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/RuntimeTestsDefaultVolumeProfile.asset b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/RuntimeTestsDefaultVolumeProfile.asset index 22770b079fa..53708910487 100644 --- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/RuntimeTestsDefaultVolumeProfile.asset +++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/HDRPDefaultResources/RuntimeTestsDefaultVolumeProfile.asset @@ -142,6 +142,11 @@ MonoBehaviour: m_RayMaxIterationsRT: m_OverrideState: 1 m_Value: 48 + adaptiveProbeVolumesLayerMask: + m_OverrideState: 1 + m_Value: + serializedVersion: 0 + m_Bits: 1 --- !u!114 &-8709408532520374176 MonoBehaviour: m_ObjectHideFlags: 3 @@ -202,6 +207,22 @@ MonoBehaviour: tileOpacityThreshold: m_OverrideState: 1 m_Value: 1 + writeDepthAlphaThreshold: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-7739451323514130505 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent + active: 1 --- !u!114 &-7246698617964109626 MonoBehaviour: m_ObjectHideFlags: 3 @@ -224,6 +245,19 @@ MonoBehaviour: balance: m_OverrideState: 1 m_Value: 0 +--- !u!114 &-7123124553783797643 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent + active: 1 --- !u!114 &-7075947427743425047 MonoBehaviour: m_ObjectHideFlags: 3 @@ -480,9 +514,31 @@ MonoBehaviour: m_PhysicallyBased: m_OverrideState: 1 m_Value: 0 + m_AdaptiveSamplingWeight: + m_OverrideState: 1 + m_Value: 0.75 m_LimitManualRangeNearBlur: m_OverrideState: 1 m_Value: 0 + coCStabilization: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &-5764323527967918075 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: cf4ca3f87079ba246a93410400bb24c4, type: 3} + m_Name: ChromaKeying + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Runtime::UnityEngine.Rendering.HighDefinition.Compositor.ChromaKeying + active: 1 + activate: + m_OverrideState: 1 + m_Value: 0 --- !u!114 &-5708058657063037015 MonoBehaviour: m_ObjectHideFlags: 3 @@ -673,6 +729,32 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 m_SelectedCurve: 0 +--- !u!114 &-5518664618547686920 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: CustomPostProcessesTestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Test.GlobalSettingsMigration:CustomPostProcessOrdersMigrationTests/CustomPostProcessesTestComponent + active: 1 +--- !u!114 &-4999627956410936425 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent2 + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent2 + active: 1 --- !u!114 &-4827657061865861275 MonoBehaviour: m_ObjectHideFlags: 3 @@ -759,6 +841,19 @@ MonoBehaviour: sampleCount: m_OverrideState: 1 m_Value: 1 +--- !u!114 &-4663216890105621533 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: da907761ad48a684aa45e5dc639d9304, type: 3} + m_Name: AlphaInjection + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Runtime::UnityEngine.Rendering.HighDefinition.Compositor.AlphaInjection + active: 1 --- !u!114 &-4384083579854892528 MonoBehaviour: m_ObjectHideFlags: 3 @@ -839,6 +934,11 @@ MonoBehaviour: rayMiss: m_OverrideState: 1 m_Value: 3 + adaptiveProbeVolumesLayerMask: + m_OverrideState: 1 + m_Value: + serializedVersion: 0 + m_Bits: 1 depthBufferThickness: m_OverrideState: 1 m_Value: 0.1 @@ -1165,6 +1265,25 @@ MonoBehaviour: tilingParameters: m_OverrideState: 1 m_Value: {x: 1, y: 1, z: 0, w: 0} + seedMode: + m_OverrideState: 1 + m_Value: 0 + customSeed: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-1188996441049714604 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent2 + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent2 + active: 1 --- !u!114 &-688532562795869724 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1370,17 +1489,10 @@ MonoBehaviour: - {fileID: -7075947427743425047} - {fileID: -8763409069734796491} - {fileID: 8905465521536762476} - - {fileID: 8915808375378866830} - - {fileID: 6048895169011428347} - - {fileID: -4283572591636895020} - {fileID: 4996846787334918998} - - {fileID: 5272879409583702316} - - {fileID: 2580024676090772256} - - {fileID: -8434016068765879828} - - {fileID: -2229819705722879696} - - {fileID: 6646219502037267185} - - {fileID: -4384083579854892528} - {fileID: 7464798260824706875} + - {fileID: -4663216890105621533} + - {fileID: -5764323527967918075} --- !u!114 &914979290351957011 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1394,6 +1506,25 @@ MonoBehaviour: m_Name: VolumetricClouds m_EditorClassIdentifier: active: 1 + m_Version: 3 + localClouds: + m_OverrideState: 1 + m_Value: 0 + m_ObsoleteWindSpeed: + m_OverrideState: 1 + m_Value: 1 + m_ObsoleteOrientation: + m_OverrideState: 1 + m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 1 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 1 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 1 + m_Value: 0 enable: m_OverrideState: 1 m_Value: 0 @@ -1678,25 +1809,6 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 1 m_Value: 0 - m_Version: 3 - localClouds: - m_OverrideState: 1 - m_Value: 0 - m_ObsoleteWindSpeed: - m_OverrideState: 1 - m_Value: 1 - m_ObsoleteOrientation: - m_OverrideState: 1 - m_Value: 0 - m_ObsoleteShapeOffsetX: - m_OverrideState: 1 - m_Value: 0 - m_ObsoleteShapeOffsetY: - m_OverrideState: 1 - m_Value: 0 - m_ObsoleteShapeOffsetZ: - m_OverrideState: 1 - m_Value: 0 --- !u!114 &1019198869158007962 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1829,6 +1941,9 @@ MonoBehaviour: sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 + multipleScatteringIntensity: + m_OverrideState: 1 + m_Value: 0 m_FogControlMode: m_OverrideState: 1 m_Value: 0 @@ -1847,6 +1962,9 @@ MonoBehaviour: directionalLightsOnly: m_OverrideState: 1 m_Value: 0 + volumetricLightingDensityCutoff: + m_OverrideState: 1 + m_Value: 0 --- !u!114 &2580024676090772256 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2009,6 +2127,19 @@ MonoBehaviour: m_SampleCount: m_OverrideState: 1 m_Value: 10 +--- !u!114 &4299465874012644358 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: CustomPostProcessesTestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Test.GlobalSettingsMigration:CustomPostProcessOrdersMigrationTests/CustomPostProcessesTestComponent + active: 1 --- !u!114 &4555149668680963751 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2120,6 +2251,7 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_Version: 1 skyType: m_OverrideState: 1 m_Value: 0 @@ -2150,7 +2282,6 @@ MonoBehaviour: fogType: m_OverrideState: 1 m_Value: 0 - m_Version: 1 --- !u!114 &4949846515292518198 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2269,6 +2400,28 @@ MonoBehaviour: occlusionOnlyReflectionNormalization: m_OverrideState: 1 m_Value: 1 + intensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + skyOcclusionIntensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} +--- !u!114 &5003559593845283392 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent2 + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent2 + active: 1 --- !u!114 &5272879409583702316 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2369,6 +2522,19 @@ MonoBehaviour: includeSunInBaking: m_OverrideState: 1 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 1 + m_Value: 0 + procedural: + m_OverrideState: 1 + m_Value: 1 + scrollDirection: + m_OverrideState: 1 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 1 + m_Value: 1 hdriSky: m_OverrideState: 1 m_Value: {fileID: 0} @@ -2440,19 +2606,6 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 1 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 1 - m_Value: 0 - procedural: - m_OverrideState: 1 - m_Value: 1 - scrollDirection: - m_OverrideState: 1 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 1 - m_Value: 1 --- !u!114 &6046202428831047222 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2466,6 +2619,7 @@ MonoBehaviour: m_Name: HDShadowSettings m_EditorClassIdentifier: active: 1 + interCascadeBorders: 1 maxShadowDistance: m_OverrideState: 1 m_Value: 500 @@ -2547,6 +2701,19 @@ MonoBehaviour: p21: m_OverrideState: 1 m_Value: 0 +--- !u!114 &6682535370678827113 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: CustomPostProcessesTestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Test.GlobalSettingsMigration:CustomPostProcessOrdersMigrationTests/CustomPostProcessesTestComponent + active: 1 --- !u!114 &6713115047983291795 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2590,6 +2757,16 @@ MonoBehaviour: includeSunInBaking: m_OverrideState: 1 m_Value: 0 + m_SkyVersion: 2 + m_ObsoleteEarthPreset: + m_OverrideState: 1 + m_Value: 1 + planetaryRadius: + m_OverrideState: 1 + m_Value: 6378100 + planetCenterPosition: + m_OverrideState: 1 + m_Value: {x: 0, y: -6378100, z: 0} type: m_OverrideState: 1 m_Value: 2 @@ -2681,16 +2858,6 @@ MonoBehaviour: horizonZenithShift: m_OverrideState: 1 m_Value: 0 - m_SkyVersion: 2 - m_ObsoleteEarthPreset: - m_OverrideState: 1 - m_Value: 1 - planetaryRadius: - m_OverrideState: 1 - m_Value: 6378100 - planetCenterPosition: - m_OverrideState: 1 - m_Value: {x: 0, y: -6378100, z: 0} --- !u!114 &6960557901262462549 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2783,6 +2950,19 @@ MonoBehaviour: tint: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} +--- !u!114 &8659316401418472115 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0} + m_Name: TestComponent + m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor.Tests:UnityEditor.Rendering.HighDefinition.Tests:CustomPostProcessComponentListTest/TestComponent + active: 1 --- !u!114 &8905465521536762476 MonoBehaviour: m_ObjectHideFlags: 3 @@ -2823,6 +3003,9 @@ MonoBehaviour: cullingDistance: m_OverrideState: 1 m_Value: 1000 + minSolidAngle: + m_OverrideState: 1 + m_Value: 4 --- !u!114 &8915808375378866830 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/006-Compositor.unity b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/006-Compositor.unity index 161e5c0358e..4d7ab1769ac 100644 --- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/006-Compositor.unity +++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/006-Compositor.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 2035111234} - m_IndirectSpecularColor: {r: 3074.1802, g: 3809.067, b: 5041.4185, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -352,23 +352,28 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 - m_Intensity: 100000 m_EnableSpotReflector: 0 + m_LightUnit: 0 m_LuxAtDistance: 1 - m_InnerSpotPercent: 82.6 + m_Intensity: 100000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0.025 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 @@ -379,30 +384,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0.5 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 1.5e+11 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -418,7 +426,7 @@ MonoBehaviour: m_MinFilterSize: 1 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -470,11 +478,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 --- !u!108 &109571089 Light: m_ObjectHideFlags: 0 @@ -483,14 +486,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 109571086} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 7957.747 m_Range: 5 m_SpotAngle: 88.2 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_InnerSpotAngle: 72.853195 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -534,45 +537,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 + m_ForceVisible: 0 + m_ShapeRadius: 0.025 m_ShadowAngle: 0 ---- !u!84 &114834915 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_IsAlphaChannelOptional: 0 - serializedVersion: 6 - m_Width: 960 - m_Height: 540 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_EnableRandomWrite: 0 - 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 + m_LightUnit: 0 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 0 --- !u!1 &168218571 GameObject: m_ObjectHideFlags: 0 @@ -602,7 +572,7 @@ Transform: m_GameObject: {fileID: 168218571} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100562} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: 1.8100605} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -653,6 +623,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 9 + m_ObsoleteInfiniteProjection: 0 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0.1} + m_EditorSimplifiedModeBlendDistance: 0.33046675 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0.1 + m_EditorAdvancedModeEnabled: 1 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 3.683801, y: 2.547348, z: 3.717638} + m_BoxBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0.1} + m_BoxBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -664,23 +729,13 @@ MonoBehaviour: realtimeMode: 0 timeSlicing: 0 lighting: + importance: 1 multiplier: 1 weight: 1 lightLayer: 1 fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 3.683801, y: 2.547348, z: 3.717638} - m_BoxBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0.1} - m_BoxBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0.1} m_EditorSimplifiedModeBlendDistance: 0.33046675 @@ -693,13 +748,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 3.683801, y: 2.547348, z: 3.717638} + m_BoxBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0.1} + m_BoxBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 1 capturePositionProxySpace: {x: -2.2351372e-10, y: 0, z: -0.0000004518032} @@ -945,102 +1011,7 @@ MonoBehaviour: 'sh[26]': 0 m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 0 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 3.683801, y: 2.547348, z: 3.717638} - m_BoxBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0.1} - m_BoxBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0.1} - m_EditorSimplifiedModeBlendDistance: 0.33046675 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0.1, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0.1 - m_EditorAdvancedModeEnabled: 1 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_ReflectionProbeVersion: 9 + m_ReflectionProbeVersion: 10 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 m_ObsoleteBlendDistancePositive: {x: 0.1, y: 0.33046675, z: 0} @@ -1068,6 +1039,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1089,9 +1063,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &168218576 MeshFilter: @@ -1155,6 +1131,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1176,9 +1155,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &309522793 MeshFilter: @@ -1289,6 +1270,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1310,9 +1294,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &374923935 MeshFilter: @@ -1356,43 +1342,6 @@ Transform: - {fileID: 2059789767} m_Father: {fileID: 1444734336} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!84 &471121842 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_IsAlphaChannelOptional: 0 - serializedVersion: 6 - m_Width: 960 - m_Height: 540 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_EnableRandomWrite: 0 - 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 --- !u!1 &497075323 GameObject: m_ObjectHideFlags: 0 @@ -1471,6 +1420,53 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -1519,6 +1515,13 @@ MonoBehaviour: deepLearningSuperSamplingUseCustomAttributes: 0 deepLearningSuperSamplingUseOptimalSettings: 1 deepLearningSuperSamplingSharpening: 0 + allowFidelityFX2SuperResolution: 1 + fidelityFX2SuperResolutionUseCustomQualitySettings: 0 + fidelityFX2SuperResolutionQuality: 0 + fidelityFX2SuperResolutionUseCustomAttributes: 0 + fidelityFX2SuperResolutionUseOptimalSettings: 1 + fidelityFX2SuperResolutionEnableSharpening: 0 + fidelityFX2SuperResolutionSharpening: 0 fsrOverrideSharpness: 0 fsrSharpness: 0.92 exposureTarget: {fileID: 0} @@ -1544,53 +1547,6 @@ MonoBehaviour: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 8 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 --- !u!20 &498191327 Camera: m_ObjectHideFlags: 0 @@ -1774,6 +1730,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1795,9 +1754,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &540979857 MeshFilter: @@ -1855,23 +1816,28 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 - m_Intensity: 200000 m_EnableSpotReflector: 1 + m_LightUnit: 0 m_LuxAtDistance: 1 - m_InnerSpotPercent: 80 + m_Intensity: 200000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0.1 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 55.8 @@ -1882,30 +1848,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -1921,7 +1890,7 @@ MonoBehaviour: m_MinFilterSize: 0.01 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -1973,11 +1942,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 --- !u!108 &551887031 Light: m_ObjectHideFlags: 0 @@ -1986,14 +1950,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 551887028} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 0 m_Color: {r: 0.9529412, g: 0.9254902, b: 0.8039216, a: 1} m_Intensity: 108677.79 m_Range: 15 m_SpotAngle: 90 - m_InnerSpotAngle: 9 - m_CookieSize: 10 + m_InnerSpotAngle: 72 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -2037,8 +2001,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: -0.000000004421082, z: 6.99e-43, w: 7.8e-44} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0.1 + m_ForceVisible: 0 + m_ShapeRadius: 0.1 m_ShadowAngle: 0 + m_LightUnit: 0 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &587141976 GameObject: m_ObjectHideFlags: 0 @@ -2091,6 +2059,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2112,9 +2083,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &587141979 MeshFilter: @@ -2134,16 +2107,32 @@ PrefabInstance: m_Modifications: - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} propertyPath: m_Version - value: 12 + value: 15 objectReference: {fileID: 0} - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} propertyPath: m_Intensity value: 10000 objectReference: {fileID: 0} + - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} + propertyPath: m_ShapeWidth + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} + propertyPath: m_ShapeHeight + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} + propertyPath: m_ShapeRadius + value: -1 + objectReference: {fileID: 0} - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} propertyPath: m_MinFilterSize value: 0.01 objectReference: {fileID: 0} + - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} + propertyPath: m_InnerSpotPercent + value: -1 + objectReference: {fileID: 0} - target: {fileID: 420649283, guid: 56207039676fd3345bc93c40b7b5731e, type: 3} propertyPath: m_ShadowResolution.m_Level value: 1 @@ -2275,6 +2264,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2296,9 +2288,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &776547617 MeshFilter: @@ -2339,6 +2333,53 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -2387,6 +2428,13 @@ MonoBehaviour: deepLearningSuperSamplingUseCustomAttributes: 0 deepLearningSuperSamplingUseOptimalSettings: 1 deepLearningSuperSamplingSharpening: 0 + allowFidelityFX2SuperResolution: 1 + fidelityFX2SuperResolutionUseCustomQualitySettings: 0 + fidelityFX2SuperResolutionQuality: 0 + fidelityFX2SuperResolutionUseCustomAttributes: 0 + fidelityFX2SuperResolutionUseOptimalSettings: 1 + fidelityFX2SuperResolutionEnableSharpening: 0 + fidelityFX2SuperResolutionSharpening: 0 fsrOverrideSharpness: 0 fsrSharpness: 0.92 exposureTarget: {fileID: 0} @@ -2412,53 +2460,6 @@ MonoBehaviour: data1: 1 data2: 0 defaultFrameSettings: 0 - m_Version: 9 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 --- !u!20 &821430578 Camera: m_ObjectHideFlags: 0 @@ -2549,17 +2550,17 @@ MonoBehaviour: IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 - ImageResolution: 0 ActiveImageTests: 1 ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 - waitFrames: 20 + waitFrames: 60 waitForFrameCountMultiple: 0 frameCountMultiple: 8 xrCompatible: 1 + gpuDrivenCompatible: 1 xrThresholdMultiplier: 1 checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: 06ecab3b4a26ece4eb73cb23fbd506b5, @@ -2703,23 +2704,28 @@ MonoBehaviour: m_PointlightHDType: 1 m_SpotLightShape: 0 m_AreaLightShape: 0 - m_Intensity: 10000 m_EnableSpotReflector: 0 + m_LightUnit: 0 m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 + m_Intensity: 10000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.34999964 - m_ShapeHeight: 0.35 - m_AspectRatio: 1 - m_ShapeRadius: 0 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 @@ -2730,30 +2736,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -2769,7 +2778,7 @@ MonoBehaviour: m_MinFilterSize: 0.01 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -2821,11 +2830,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 1 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 --- !u!108 &886047838 Light: m_ObjectHideFlags: 0 @@ -2834,14 +2838,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 886047833} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 3 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 25984.508 m_Range: 5 m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_InnerSpotAngle: 0 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -2882,11 +2886,15 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 5} + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 5.247487} m_UseBoundingSphereOverride: 1 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 + m_ForceVisible: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 0 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 0 --- !u!1 &957496292 GameObject: m_ObjectHideFlags: 0 @@ -2996,6 +3004,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3017,9 +3028,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &981181528 MeshFilter: @@ -3095,7 +3108,7 @@ Transform: m_GameObject: {fileID: 1037846703} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.68701315} + m_LocalPosition: {x: 0.019999983, y: 1.196, z: -0.6870142} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3146,6 +3159,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 9 + m_ObsoleteInfiniteProjection: 0 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 3.7381597, y: 2.5, z: 1.25} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -3157,23 +3265,13 @@ MonoBehaviour: realtimeMode: 0 timeSlicing: 0 lighting: + importance: 1 multiplier: 1 weight: 1 lightLayer: 1 fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 3.7381597, y: 2.5, z: 1.25} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -3186,13 +3284,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 3.7381597, y: 2.5, z: 1.25} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 1 capturePositionProxySpace: {x: -5.8120087e-10, y: 0, z: 0.00000014388556} @@ -3438,102 +3547,7 @@ MonoBehaviour: 'sh[26]': 0 m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 0 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 3.7381597, y: 2.5, z: 1.25} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_ReflectionProbeVersion: 9 + m_ReflectionProbeVersion: 10 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 m_ObsoleteBlendDistancePositive: {x: 0, y: 0, z: 0} @@ -3561,6 +3575,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3582,9 +3599,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1037846708 MeshFilter: @@ -3669,6 +3688,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3690,9 +3712,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090868674 MeshFilter: @@ -4013,6 +4037,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4034,9 +4061,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1236845696 MeshFilter: @@ -4098,6 +4127,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4119,9 +4151,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1243026021 MeshFilter: @@ -4183,6 +4217,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4204,9 +4241,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1247603196 MeshFilter: @@ -4310,6 +4349,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4331,9 +4373,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1295334279 MeshFilter: @@ -4388,21 +4432,68 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaSharpenMode: 0 - taaRingingReduction: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaSharpenMode: 0 + taaRingingReduction: 0 taaHistorySharpening: 0.35 taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 @@ -4436,6 +4527,13 @@ MonoBehaviour: deepLearningSuperSamplingUseCustomAttributes: 0 deepLearningSuperSamplingUseOptimalSettings: 1 deepLearningSuperSamplingSharpening: 0 + allowFidelityFX2SuperResolution: 1 + fidelityFX2SuperResolutionUseCustomQualitySettings: 0 + fidelityFX2SuperResolutionQuality: 0 + fidelityFX2SuperResolutionUseCustomAttributes: 0 + fidelityFX2SuperResolutionUseOptimalSettings: 1 + fidelityFX2SuperResolutionEnableSharpening: 0 + fidelityFX2SuperResolutionSharpening: 0 fsrOverrideSharpness: 0 fsrSharpness: 0.92 exposureTarget: {fileID: 0} @@ -4461,53 +4559,6 @@ MonoBehaviour: data1: 17 data2: 0 defaultFrameSettings: 0 - m_Version: 8 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 --- !u!20 &1297650283 Camera: m_ObjectHideFlags: 0 @@ -4574,109 +4625,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 17.5, y: 109.65, z: 0} ---- !u!21 &1336196516 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Shader Graphs/TestCompositionGraph - m_Shader: {fileID: -6465566751694194690, guid: 64fcbeb03211da74295e0878bd451f91, - type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHATEST_ON - m_InvalidKeywords: - - _DOUBLESIDED_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2450 - stringTagMap: - MotionVector: User - RenderType: TransparentCutout - disabledShaderPasses: - - TransparentDepthPrepass - - TransparentDepthPostpass - - TransparentBackface - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - GreenScreen: - m_Texture: {fileID: 471121842} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - Layer0: - m_Texture: {fileID: 1969329230} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - Layer1: - m_Texture: {fileID: 114834915} - 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: - - _AddPrecomputedVelocity: 0 - - _AlphaCutoffEnable: 1 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _BlendMode: 0 - - _ConservativeDepthOffsetEnable: 0 - - _CullMode: 0 - - _CullModeForward: 0 - - _DepthOffsetEnable: 0 - - _DoubleSidedEnable: 1 - - _DoubleSidedGIMode: 0 - - _DoubleSidedNormalMode: 2 - - _DstBlend: 0 - - _DstBlend2: 0 - - _EnableBlendModePreserveSpecularLighting: 0 - - _EnableFogOnTransparent: 1 - - _OpaqueCullMode: 2 - - _PerPixelSorting: 0 - - _RenderQueueType: 1 - - _SrcBlend: 1 - - _StencilRef: 0 - - _StencilRefDepth: 1 - - _StencilRefDistortionVec: 4 - - _StencilRefMV: 33 - - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 9 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskMV: 43 - - _SurfaceType: 0 - - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - - _TransparentDepthPostpassEnable: 0 - - _TransparentDepthPrepassEnable: 0 - - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - - _UseShadowThreshold: 0 - - _ZTestDepthEqualForOpaque: 3 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1380583528 GameObject: m_ObjectHideFlags: 0 @@ -4762,6 +4710,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4783,9 +4734,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1382797349 MeshFilter: @@ -4919,6 +4872,43 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1512143111} m_PrefabAsset: {fileID: 0} +--- !u!84 &1520012484 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 480 + m_Height: 270 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 48 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + 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 --- !u!1 &1531545286 GameObject: m_ObjectHideFlags: 0 @@ -5221,6 +5211,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5242,9 +5235,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1613682959 MeshFilter: @@ -5299,6 +5294,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 3 m_Material: {fileID: 2100000, guid: 759683ea64b540d4082e6fc951c94405, type: 2} m_DrawDistance: 1000 m_FadeScale: 0.9 @@ -5316,7 +5312,6 @@ MonoBehaviour: m_Offset: {x: 0, y: 0, z: 0.1} m_Size: {x: 3, y: 1.5, z: 0.2} m_FadeFactor: 1 - m_Version: 3 --- !u!4 &1695031467 Transform: m_ObjectHideFlags: 0 @@ -5384,6 +5379,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5405,9 +5403,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1761006931 MeshFilter: @@ -5466,33 +5466,70 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1825057978 -GameObject: +--- !u!84 &1786431202 +RenderTexture: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 serializedVersion: 6 - m_Component: - - component: {fileID: 1825057979} - - component: {fileID: 1825057983} - - component: {fileID: 1825057982} - m_Layer: 0 - m_Name: LineLight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1825057979 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1825057978} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_Width: 480 + m_Height: 270 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 48 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + 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 +--- !u!1 &1825057978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1825057979} + - component: {fileID: 1825057983} + - component: {fileID: 1825057982} + m_Layer: 0 + m_Name: LineLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1825057979 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825057978} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.0576} m_LocalScale: {x: 0.749999, y: 0.01, z: 0.009999997} m_ConstrainProportionsScale: 0 @@ -5514,23 +5551,28 @@ MonoBehaviour: m_PointlightHDType: 1 m_SpotLightShape: 0 m_AreaLightShape: 1 - m_Intensity: 100000 m_EnableSpotReflector: 0 + m_LightUnit: 0 m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 + m_Intensity: 100000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.74999917 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 @@ -5541,30 +5583,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -5580,7 +5625,7 @@ MonoBehaviour: m_MinFilterSize: 0.01 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -5632,11 +5677,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 1 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 1 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 --- !u!108 &1825057983 Light: m_ObjectHideFlags: 0 @@ -5645,14 +5685,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825057978} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 7 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 10610.341 m_Range: 5 m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_InnerSpotAngle: 0 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -5693,11 +5733,15 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 5} + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 5.3749995} m_UseBoundingSphereOverride: 1 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 + m_ForceVisible: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 0 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 0 --- !u!1 &1859213454 GameObject: m_ObjectHideFlags: 0 @@ -5806,6 +5850,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5827,9 +5874,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1893658012 MeshFilter: @@ -5869,7 +5918,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Enable: 1 - m_Material: {fileID: 1336196516} + m_Material: {fileID: 1979693240} m_OutputDisplay: 0 m_InputLayers: - m_LayerName: Layer0 @@ -5900,7 +5949,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 1969329230} + m_RenderTarget: {fileID: 1786431202} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -6002,7 +6051,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 114834915} + m_RenderTarget: {fileID: 1937071441} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -6070,7 +6119,7 @@ MonoBehaviour: m_InputFilters: [] m_AOVBitmask: 0 m_AOVRenderTargets: [] - m_RenderTarget: {fileID: 471121842} + m_RenderTarget: {fileID: 1520012484} m_ClearsBackGround: 0 m_Show: 1 m_LayerCamera: {fileID: 0} @@ -6136,6 +6185,43 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!84 &1937071441 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 480 + m_Height: 270 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 48 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + 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 --- !u!1 &1953544257 GameObject: m_ObjectHideFlags: 0 @@ -6180,6 +6266,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 9 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -6191,23 +6372,13 @@ MonoBehaviour: realtimeMode: 0 timeSlicing: 0 lighting: + importance: 64 multiplier: 1 weight: 1 lightLayer: 1 fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 1, y: 0.01, z: 1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -6220,13 +6391,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 1, y: 0.01, z: 1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} @@ -6472,144 +6654,108 @@ MonoBehaviour: 'sh[26]': 0 m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} - m_PlanarProbeVersion: 7 + m_PlanarProbeVersion: 8 m_ObsoleteCaptureNearPlane: 0.3 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 ---- !u!84 &1969329230 -RenderTexture: + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} +--- !u!21 &1979693240 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_IsAlphaChannelOptional: 0 - serializedVersion: 6 - m_Width: 960 - m_Height: 540 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthStencilFormat: 94 - m_ColorFormat: 48 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_UseDynamicScaleExplicit: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_EnableRandomWrite: 0 - 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 + m_Name: Shader Graphs/TestCompositionGraph + m_Shader: {fileID: -6465566751694194690, guid: 64fcbeb03211da74295e0878bd451f91, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - GreenScreen: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Layer0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Layer1: + 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: + - _AddPrecomputedVelocity: 0 + - _AlphaCutoffEnable: 1 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _BlendMode: 0 + - _ConservativeDepthOffsetEnable: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _DepthOffsetEnable: 0 + - _DoubleSidedEnable: 1 + - _DoubleSidedGIMode: 0 + - _DoubleSidedNormalMode: 2 + - _DstBlend: 0 + - _DstBlend2: 0 + - _EnableBlendModePreserveSpecularLighting: 0 + - _EnableFogOnTransparent: 1 + - _ExcludeFromTUAndAA: 0 + - _OpaqueCullMode: 2 + - _PerPixelSorting: 0 + - _RenderQueueType: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 1 + - _StencilRefDistortionVec: 4 + - _StencilRefMV: 33 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskMV: 43 + - _SurfaceType: 0 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1988564076 GameObject: m_ObjectHideFlags: 0 @@ -6662,6 +6808,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6683,9 +6832,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1988564079 MeshFilter: @@ -6724,6 +6875,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f19d9143a39eb3b46bc4563e9889cfbd, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 3 m_Material: {fileID: 2100000, guid: 735f24af7101b4a43b60487db8217b85, type: 2} m_DrawDistance: 1000 m_FadeScale: 0.9 @@ -6741,7 +6893,6 @@ MonoBehaviour: m_Offset: {x: 0, y: 0, z: 0.1} m_Size: {x: 2, y: 2, z: 0.2} m_FadeFactor: 1 - m_Version: 3 --- !u!4 &2000874750 Transform: m_ObjectHideFlags: 0 @@ -6854,6 +7005,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 + m_UseReflectionProbes: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -6928,6 +7080,7 @@ MonoBehaviour: m_StaticLightingSkyUniqueID: 1 m_StaticLightingCloudsUniqueID: 0 m_StaticLightingVolumetricClouds: 0 + bounces: 1 --- !u!114 &2011204168 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7019,14 +7172,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2035111233} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 1 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 80000 m_Range: 10 m_SpotAngle: 30 - m_InnerSpotAngle: 21.802082 - m_CookieSize: 10 + m_InnerSpotAngle: 0 + m_CookieSize2D: {x: 0.5, y: 0.5} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -7070,8 +7223,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 + m_ForceVisible: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0.53 + m_LightUnit: 2 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 0 --- !u!4 &2035111235 Transform: m_ObjectHideFlags: 0 @@ -7102,23 +7259,28 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 - m_Intensity: 80000 m_EnableSpotReflector: 0 + m_LightUnit: 2 m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 + m_Intensity: 80000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 2 + m_ObsoleteUseShadowQualitySettings: 1 + m_ObsoleteCustomShadowResolution: 4096 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 2 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 @@ -7129,30 +7291,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0.53 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -7168,7 +7333,7 @@ MonoBehaviour: m_MinFilterSize: 0.01 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -7220,11 +7385,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 2 - m_ObsoleteUseShadowQualitySettings: 1 - m_ObsoleteCustomShadowResolution: 4096 - m_ObsoleteContactShadows: 0 --- !u!1 &2044480112 GameObject: m_ObjectHideFlags: 0 @@ -7300,6 +7460,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7321,9 +7484,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2044480116 MeshFilter: @@ -7362,7 +7527,7 @@ Transform: m_GameObject: {fileID: 2059789766} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.510054, y: 1.196, z: 1.1760272} + m_LocalPosition: {x: 2.5100584, y: 1.196, z: 1.1760293} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7413,6 +7578,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 9 + m_ObsoleteInfiniteProjection: 0 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 1.27, y: 2.5, z: 4.9506874} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -7424,23 +7684,13 @@ MonoBehaviour: realtimeMode: 0 timeSlicing: 0 lighting: + importance: 1 multiplier: 1 weight: 1 lightLayer: 1 fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 1.27, y: 2.5, z: 4.9506874} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -7453,13 +7703,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 1.27, y: 2.5, z: 4.9506874} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 2 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 1 capturePositionProxySpace: {x: -0.00000043940543, y: 0, z: -0.000000317812} @@ -7705,102 +7966,7 @@ MonoBehaviour: 'sh[26]': 0 m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 0 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 1.27, y: 2.5, z: 4.9506874} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_ReflectionProbeVersion: 9 + m_ReflectionProbeVersion: 10 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 m_ObsoleteBlendDistancePositive: {x: 0, y: 0, z: 0} @@ -7828,6 +7994,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7849,9 +8018,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2059789771 MeshFilter: @@ -8002,6 +8173,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8023,9 +8197,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2072213265 MeshFilter: @@ -8154,6 +8330,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8175,9 +8354,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2113397028 MeshFilter: @@ -9250,6 +9431,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9272,9 +9456,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23102778595975102 MeshRenderer: @@ -9295,6 +9481,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9316,9 +9505,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23105044117804180 MeshRenderer: @@ -9339,6 +9530,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9360,9 +9554,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23108239442236004 MeshRenderer: @@ -9383,6 +9579,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9405,9 +9604,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23113288655538896 MeshRenderer: @@ -9428,6 +9629,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9449,9 +9653,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23153506525441086 MeshRenderer: @@ -9472,6 +9678,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9493,9 +9702,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23159474732925824 MeshRenderer: @@ -9516,6 +9727,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9537,9 +9751,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23234624825969392 MeshRenderer: @@ -9560,6 +9776,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9581,9 +9800,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23280013929241180 MeshRenderer: @@ -9604,6 +9825,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9625,9 +9849,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23297504398282328 MeshRenderer: @@ -9648,6 +9874,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9670,9 +9899,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23313931999218306 MeshRenderer: @@ -9693,6 +9924,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9714,9 +9948,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23380737865223604 MeshRenderer: @@ -9737,6 +9973,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9760,9 +9999,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23417825174992344 MeshRenderer: @@ -9783,6 +10024,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9804,9 +10048,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23469017206319436 MeshRenderer: @@ -9827,6 +10073,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9848,9 +10097,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23660396016633692 MeshRenderer: @@ -9871,6 +10122,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9892,9 +10146,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23678019684133178 MeshRenderer: @@ -9915,6 +10171,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9936,9 +10195,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23820014581838294 MeshRenderer: @@ -9959,6 +10220,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9980,9 +10244,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23834675469963112 MeshRenderer: @@ -10003,6 +10269,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10027,9 +10296,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23855476998699522 MeshRenderer: @@ -10050,6 +10321,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10074,9 +10348,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23862939749928067 MeshRenderer: @@ -10097,6 +10373,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10120,9 +10399,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23912046455902760 MeshRenderer: @@ -10143,6 +10424,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10166,9 +10450,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &23912405108167244 MeshRenderer: @@ -10189,6 +10475,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10210,9 +10499,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &33055920987286580 MeshFilter: @@ -10419,14 +10710,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1507423174311380} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 13 m_Type: 0 m_Color: {r: 0.9529412, g: 0.9254902, b: 0.8039216, a: 1} m_Intensity: 108677.79 m_Range: 15 m_SpotAngle: 90 - m_InnerSpotAngle: 9 - m_CookieSize: 10 + m_InnerSpotAngle: 72 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -10470,8 +10761,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: -0.000000004421082, z: 6.99e-43, w: 7.8e-44} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0.1 + m_ForceVisible: 0 + m_ShapeRadius: 0.1 m_ShadowAngle: 0 + m_LightUnit: 0 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!114 &114600619915666046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10487,23 +10782,28 @@ MonoBehaviour: m_PointlightHDType: 0 m_SpotLightShape: 0 m_AreaLightShape: 0 - m_Intensity: 200000 m_EnableSpotReflector: 1 + m_LightUnit: 0 m_LuxAtDistance: 1 - m_InnerSpotPercent: 80 + m_Intensity: 200000 + m_InnerSpotPercent: -1 + m_ShapeWidth: -1 + m_ShapeHeight: -1 + m_AspectRatio: 1 + m_ShapeRadius: -1 + m_Version: 15 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 - m_LightUnit: 0 m_FadeDistance: 10000 m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeWidth: 0.5 - m_ShapeHeight: 0.5 - m_AspectRatio: 1 - m_ShapeRadius: 0.1 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 55.8 @@ -10514,30 +10814,33 @@ MonoBehaviour: m_IESPoint: {fileID: 0} m_IESSpot: {fileID: 0} m_IncludeForRayTracing: 1 + m_IncludeForPathTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 m_AngularDiameter: 0 - m_DiameterMultiplerMode: 1 - m_DiameterMultiplier: 1 - m_DiameterOverride: 0.5 - m_EmissiveLightSource: 1 - m_FlareSize: 2 - m_FlareTint: {r: 1, g: 1, b: 1, a: 1} - m_FlareFalloff: 4 - m_AutomaticMoonPhase: 1 - m_MoonPhase: 0.2 - m_MoonPhaseRotation: 0 - m_Earthshine: 1 - m_SurfaceTexture: {fileID: 0} - m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + diameterMultiplerMode: 1 + diameterMultiplier: 1 + diameterOverride: 0.5 + celestialBodyShadingSource: 1 + sunLightOverride: {fileID: 0} + sunColor: {r: 1, g: 1, b: 1, a: 1} + sunIntensity: 130000 + moonPhase: 0.2 + moonPhaseRotation: 0 + earthshine: 1 + flareSize: 2 + flareTint: {r: 1, g: 1, b: 1, a: 1} + flareFalloff: 4 + flareMultiplier: 1 + surfaceTexture: {fileID: 0} + surfaceTint: {r: 1, g: 1, b: 1, a: 1} m_Distance: 150000000 m_UseRayTracedShadows: 0 m_NumRayTracingSamples: 4 m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -10553,7 +10856,7 @@ MonoBehaviour: m_MinFilterSize: 0.01 m_DirLightPCSSBlockerSampleCount: 24 m_DirLightPCSSFilterSampleCount: 16 - m_DirLightPCSSMaxBlockerDistance: 64 + m_DirLightPCSSMaxPenumbraSize: 0.56 m_DirLightPCSSMaxSamplingDistance: 0.5 m_DirLightPCSSMinFilterSizeTexels: 1.5 m_DirLightPCSSMinFilterMaxAngularDiameter: 10 @@ -10605,11 +10908,6 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 12 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 --- !u!1 &204727572796561979 GameObject: m_ObjectHideFlags: 0 @@ -10655,6 +10953,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10677,9 +10978,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!23 &909831428394599154 MeshRenderer: @@ -10700,6 +11003,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10721,9 +11027,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &931851623488560781 Transform: @@ -10834,6 +11142,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10855,9 +11166,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &6358232971868724209 Transform: @@ -10927,6 +11240,9 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10948,9 +11264,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentEditorSupportedOnTests.cs b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentEditorSupportedOnTests.cs index c92a3533127..d205479853d 100644 --- a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentEditorSupportedOnTests.cs +++ b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentEditorSupportedOnTests.cs @@ -33,7 +33,7 @@ class VolumeComponentEditorSupportedOnTests : RenderPipelineTests public void TestVolumeManagerSupportedOnFiltering(Type renderPipelineAssetType, Type[] expectedTypes, Type[] notExpectedTypes) { var volumeManager = new VolumeManager(); - volumeManager.LoadBaseTypes(renderPipelineAssetType); + volumeManager.LoadBaseTypesByReflection(renderPipelineAssetType); volumeManager.InitializeInternal(); foreach (var expectedType in expectedTypes) diff --git a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentTests.cs b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentTests.cs index 4a3dc401064..a91ca59de60 100644 --- a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentTests.cs +++ b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/Volumes/VolumeComponentTests.cs @@ -409,13 +409,5 @@ public void TestInputForGetVolumeComponentsForDisplay() Assert.That(() => volumeManager.GetVolumeComponentsForDisplay(typeof(CustomRenderPipeline)), Throws.ArgumentException); Assert.IsNotNull(volumeManager.GetVolumeComponentsForDisplay(null)); } - - [Test] - public void TestVolumeManagerFetchsTypesWhenNotInitialized() - { - var volumeManager = new VolumeManager(); - var typesForDisplay = volumeManager.GetVolumeComponentsForDisplay(typeof(CustomRenderPipelineAsset)); - Assert.IsTrue(typesForDisplay.Count > 0); - } } } diff --git a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Runtime/Volumes/VolumeManagerTests.cs b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Runtime/Volumes/VolumeManagerTests.cs index ec81fc9f781..bee767114bc 100644 --- a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Runtime/Volumes/VolumeManagerTests.cs +++ b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Runtime/Volumes/VolumeManagerTests.cs @@ -10,6 +10,7 @@ namespace UnityEngine.Rendering.Tests class VolumeManagerTests { readonly LayerMask k_defaultLayer = 1; + VolumeProfile m_defaultProfile; VolumeProfile m_VolumeProfile; readonly List m_Objects = new(); readonly bool m_IsGlobal; @@ -36,8 +37,12 @@ public void Setup() var volumeComponent = m_VolumeProfile.Add(); volumeComponent.param.Override(TestVolume.k_OverrideValue); + m_defaultProfile = ScriptableObject.CreateInstance(); + var defaultComponent = m_defaultProfile.Add(); + defaultComponent.param.Override(TestVolume.k_DefaultValue); + volumeManager = new VolumeManager(); - volumeManager.Initialize(); + volumeManager.Initialize(m_defaultProfile); camera = new GameObject("Camera", typeof(Camera)); m_Objects.Add(camera); } @@ -143,6 +148,7 @@ public void ParameterOverrideTest() class VolumeManagerDefaultProfileTests { + VolumeProfile m_VolumeProfileDefault; VolumeProfile m_VolumeProfile1; VolumeProfile m_VolumeProfile2; VolumeProfile m_VolumeProfile3; @@ -153,6 +159,9 @@ class VolumeManagerDefaultProfileTests [SetUp] public void Setup() { + m_VolumeProfileDefault = ScriptableObject.CreateInstance(); + m_VolumeProfileDefault.Add().param.Override(TestVolume.k_DefaultValue); + m_VolumeProfile1 = ScriptableObject.CreateInstance(); m_VolumeProfile1.Add().param.Override(TestVolume.k_OverrideValue); @@ -176,7 +185,7 @@ public void TearDown() public void ParameterIsCorrectByDefault() { volumeManager = new VolumeManager(); - volumeManager.Initialize(); + volumeManager.Initialize(m_VolumeProfileDefault); LayerMask defaultLayer = 1; var camera = new GameObject("Camera", typeof(Camera)); @@ -202,20 +211,20 @@ public void DefaultProfilesAreAppliedToDefaultState() Assert.AreEqual(TestVolume.k_OverrideValue3, GetDefaultState().param.value); volumeManager.SetGlobalDefaultProfile(null); - Assert.AreEqual(TestVolume.k_OverrideValue3, GetDefaultState().param.value); + Assert.IsNull(GetDefaultState()); // No global default profile - default state should be null even if quality and custom defaults are set, as global is the base for the default state volumeManager.SetQualityDefaultProfile(null); - Assert.AreEqual(TestVolume.k_OverrideValue3, GetDefaultState().param.value); + Assert.IsNull(GetDefaultState()); // No global default profile - default state should be null even if quality and custom defaults are set, as global is the base for the default state volumeManager.SetCustomDefaultProfiles(null); - Assert.AreEqual(TestVolume.k_DefaultValue, GetDefaultState().param.value); + Assert.IsNull(GetDefaultState()); // No global default profile - default state should be null even if quality and custom defaults are set, as global is the base for the default state } [Test] public void CustomDefaultProfilesAreAppliedInOrder() { volumeManager = new VolumeManager(); - volumeManager.Initialize(); + volumeManager.Initialize(m_VolumeProfileDefault); volumeManager.SetCustomDefaultProfiles(new List { m_VolumeProfile1, m_VolumeProfile2 }); Assert.AreEqual(TestVolume.k_OverrideValue2, GetDefaultState().param.value); diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes.unity b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes.unity index a7544897428..b3a8e6af441 100644 --- a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes.unity +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes.unity @@ -208,6 +208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &577818 MeshFilter: @@ -313,6 +314,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1221712 SphereCollider: @@ -424,6 +426,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &17182308 SphereCollider: @@ -541,6 +544,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &29891251 MeshFilter: @@ -646,6 +650,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &42793508 SphereCollider: @@ -757,6 +762,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &53016697 SphereCollider: @@ -868,6 +874,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &83771984 SphereCollider: @@ -978,6 +985,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &94556132 MeshFilter: @@ -1068,6 +1076,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &97661565 SphereCollider: @@ -1179,6 +1188,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &100390684 SphereCollider: @@ -1289,6 +1299,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &126287434 MeshFilter: @@ -1424,6 +1435,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &147557062 MeshFilter: @@ -1529,6 +1541,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &172255954 SphereCollider: @@ -1640,6 +1653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &207413613 SphereCollider: @@ -1751,6 +1765,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &212523233 SphereCollider: @@ -1862,6 +1877,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &227977878 SphereCollider: @@ -1979,6 +1995,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &238486951 MeshFilter: @@ -2156,6 +2173,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &250086848 SphereCollider: @@ -2267,6 +2285,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &283589528 SphereCollider: @@ -2378,6 +2397,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &285294294 SphereCollider: @@ -2408,6 +2428,118 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 285294291} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &288196185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 288196186} + - component: {fileID: 288196189} + - component: {fileID: 288196188} + - component: {fileID: 288196187} + m_Layer: 0 + m_Name: SampleTexture3DHDRProperty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &288196186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288196185} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 596523079} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &288196187 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288196185} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: ecd5a5a17ce8bba44b98141a1fb3737e, type: 3} + 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: 1 + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &288196188 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288196185} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &288196189 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288196185} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &303484557 GameObject: m_ObjectHideFlags: 0 @@ -2540,6 +2672,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &315644276 SphereCollider: @@ -2658,7 +2791,7 @@ Transform: m_GameObject: {fileID: 366199728} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.39, y: 0.85, z: 0.5} + m_LocalPosition: {x: 0, y: 0.85, z: 0.9} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2864,6 +2997,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &371422991 SphereCollider: @@ -2975,6 +3109,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &414293742 SphereCollider: @@ -3086,6 +3221,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &414435822 SphereCollider: @@ -3144,7 +3280,7 @@ Transform: m_GameObject: {fileID: 434826378} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710653, z: -0, w: 0.7071071} - m_LocalPosition: {x: 8.139999, y: 0, z: 0.95999765} + m_LocalPosition: {x: 8, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3197,6 +3333,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &434826381 SphereCollider: @@ -3308,6 +3445,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &460208045 SphereCollider: @@ -3419,6 +3557,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &462242930 SphereCollider: @@ -3530,6 +3669,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &480521287 SphereCollider: @@ -3641,6 +3781,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &485539996 SphereCollider: @@ -3797,6 +3938,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &507897637 SphereCollider: @@ -3908,6 +4050,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &510972452 SphereCollider: @@ -4019,6 +4162,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &513781238 SphereCollider: @@ -4130,6 +4274,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &524449750 SphereCollider: @@ -4241,6 +4386,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &529652658 SphereCollider: @@ -4271,6 +4417,118 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 529652655} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &541782607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 541782608} + - component: {fileID: 541782611} + - component: {fileID: 541782610} + - component: {fileID: 541782609} + m_Layer: 0 + m_Name: SampleTexture2DHDRProperty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &541782608 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541782607} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 596523079} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &541782609 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541782607} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: afd7888077e98424487647ce919963b3, type: 3} + 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: 1 + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &541782610 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541782607} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &541782611 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541782607} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &574756863 GameObject: m_ObjectHideFlags: 0 @@ -4352,6 +4610,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &574756866 SphereCollider: @@ -4463,6 +4722,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &582133713 SphereCollider: @@ -4574,6 +4834,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &585441713 SphereCollider: @@ -4635,6 +4896,7 @@ Transform: m_Children: - {fileID: 840653958} - {fileID: 978955574} + - {fileID: 2133753688} - {fileID: 853683121} - {fileID: 1050940235} - {fileID: 804860713} @@ -4644,12 +4906,15 @@ Transform: - {fileID: 1926593705} - {fileID: 1785428291} - {fileID: 1343815776} + - {fileID: 541782608} - {fileID: 485539994} + - {fileID: 878232280} - {fileID: 2140997633} - {fileID: 1701306555} - {fileID: 1221710} - {fileID: 1704958864} - {fileID: 1976893045} + - {fileID: 288196186} - {fileID: 697337478} - {fileID: 1349630381} - {fileID: 1491550965} @@ -4736,6 +5001,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &620689886 SphereCollider: @@ -4848,6 +5114,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &628137915 SphereCollider: @@ -4970,6 +5237,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &634194923 MeshFilter: @@ -5066,6 +5334,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &644476904 MeshFilter: @@ -5171,6 +5440,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &661742760 SphereCollider: @@ -5282,6 +5552,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &697337480 SphereCollider: @@ -5393,6 +5664,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &715693414 SphereCollider: @@ -5510,6 +5782,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &735557293 MeshFilter: @@ -5615,6 +5888,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &738840891 SphereCollider: @@ -5732,6 +6006,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &770505458 MeshFilter: @@ -5837,6 +6112,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &801207487 SphereCollider: @@ -5948,6 +6224,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &804860715 SphereCollider: @@ -6059,6 +6336,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &820177706 SphereCollider: @@ -6170,6 +6448,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &840653960 SphereCollider: @@ -6281,6 +6560,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &841185861 SphereCollider: @@ -6392,6 +6672,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &853683123 SphereCollider: @@ -6503,6 +6784,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &871278867 SphereCollider: @@ -6533,6 +6815,118 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871278864} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &878232279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 878232280} + - component: {fileID: 878232283} + - component: {fileID: 878232282} + - component: {fileID: 878232281} + m_Layer: 0 + m_Name: SampleTexture2DArrayHDRProperty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &878232280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878232279} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 596523079} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &878232281 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878232279} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: afd7888077e98424487647ce919963b3, type: 3} + 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: 1 + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &878232282 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878232279} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &878232283 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878232279} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &919728588 GameObject: m_ObjectHideFlags: 0 @@ -6615,6 +7009,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &919728591 SphereCollider: @@ -6738,6 +7133,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &925157437 SphereCollider: @@ -6796,7 +7192,7 @@ Transform: m_GameObject: {fileID: 948050368} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710653, z: -0, w: 0.7071071} - m_LocalPosition: {x: 8.14, y: 0, z: 2.9600005} + m_LocalPosition: {x: 8, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6849,6 +7245,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &948050371 SphereCollider: @@ -6960,6 +7357,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &978955576 SphereCollider: @@ -7071,6 +7469,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &991341885 SphereCollider: @@ -7182,6 +7581,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1029832736 SphereCollider: @@ -7293,6 +7693,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1029851379 SphereCollider: @@ -7404,6 +7805,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1050940237 SphereCollider: @@ -7521,6 +7923,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1051528461 MeshFilter: @@ -7626,6 +8029,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1059825223 SphereCollider: @@ -7737,6 +8141,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1077364020 SphereCollider: @@ -7848,6 +8253,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1114000236 SphereCollider: @@ -7959,6 +8365,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1126344843 SphereCollider: @@ -8070,6 +8477,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1136984179 SphereCollider: @@ -8181,6 +8589,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1182234435 SphereCollider: @@ -8292,6 +8701,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1222953126 SphereCollider: @@ -8403,6 +8813,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1235329771 SphereCollider: @@ -8514,6 +8925,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1290363524 SphereCollider: @@ -8625,6 +9037,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1290626768 SphereCollider: @@ -8742,6 +9155,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1311165579 MeshFilter: @@ -8847,6 +9261,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1315568619 SphereCollider: @@ -8958,6 +9373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1322529935 SphereCollider: @@ -9069,6 +9485,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1324643245 SphereCollider: @@ -9180,6 +9597,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1327032209 SphereCollider: @@ -9291,6 +9709,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1343815778 SphereCollider: @@ -9402,6 +9821,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1349630383 SphereCollider: @@ -9513,6 +9933,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1383437970 SphereCollider: @@ -9624,6 +10045,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1425383531 SphereCollider: @@ -9772,6 +10194,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1452926176 SphereCollider: @@ -9883,6 +10306,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1462505747 SphereCollider: @@ -9994,6 +10418,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1467200803 SphereCollider: @@ -10105,6 +10530,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1469504154 SphereCollider: @@ -10216,6 +10642,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1471236226 SphereCollider: @@ -10333,6 +10760,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1475762080 MeshFilter: @@ -10438,6 +10866,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1477714188 SphereCollider: @@ -10549,6 +10978,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1491550967 SphereCollider: @@ -10666,6 +11096,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1506539578 MeshFilter: @@ -10771,6 +11202,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1536751011 SphereCollider: @@ -10882,6 +11314,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1545791080 SphereCollider: @@ -10992,6 +11425,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1554978902 MeshFilter: @@ -11119,6 +11553,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1606512716 SphereCollider: @@ -11230,6 +11665,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1610334440 SphereCollider: @@ -11347,6 +11783,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1619359163 MeshFilter: @@ -11451,6 +11888,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1633755741 MeshFilter: @@ -11541,6 +11979,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1701306557 SphereCollider: @@ -11652,6 +12091,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1704958866 SphereCollider: @@ -11828,6 +12268,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1718807272 SphereCollider: @@ -11945,6 +12386,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1739134292 MeshFilter: @@ -11997,7 +12439,7 @@ Transform: m_GameObject: {fileID: 1756854116} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710653, z: -0, w: 0.7071071} - m_LocalPosition: {x: 8.139998, y: 0, z: 1.9599979} + m_LocalPosition: {x: 8, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12050,6 +12492,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1756854119 SphereCollider: @@ -12161,6 +12604,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1765169125 SphereCollider: @@ -12272,6 +12716,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1770065823 SphereCollider: @@ -12389,6 +12834,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1770552485 MeshFilter: @@ -12494,6 +12940,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1785428293 SphereCollider: @@ -12605,6 +13052,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1787014627 SphereCollider: @@ -12716,6 +13164,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1806418204 SphereCollider: @@ -12833,6 +13282,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1808814367 MeshFilter: @@ -12944,6 +13394,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1813021371 MeshFilter: @@ -13055,6 +13506,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1824269726 MeshFilter: @@ -13160,6 +13612,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1840713833 SphereCollider: @@ -13271,6 +13724,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1856304762 SphereCollider: @@ -13382,6 +13836,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1887502894 SphereCollider: @@ -13499,6 +13954,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1888281877 MeshFilter: @@ -13604,6 +14060,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1889196527 SphereCollider: @@ -13715,6 +14172,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1889255734 SphereCollider: @@ -13826,6 +14284,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1894348793 SphereCollider: @@ -13937,6 +14396,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1908664928 SphereCollider: @@ -14054,6 +14514,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1909678460 MeshFilter: @@ -14159,6 +14620,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1926593707 SphereCollider: @@ -14270,6 +14732,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1947256755 SphereCollider: @@ -14423,6 +14886,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1976893047 SphereCollider: @@ -14534,6 +14998,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1981582517 SphereCollider: @@ -14645,6 +15110,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1990772824 SphereCollider: @@ -14756,6 +15222,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2006496221 SphereCollider: @@ -14867,6 +15334,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2011343687 SphereCollider: @@ -14978,6 +15446,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2048688198 SphereCollider: @@ -15095,6 +15564,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2064675060 MeshFilter: @@ -15147,7 +15617,7 @@ Transform: m_GameObject: {fileID: 2074179181} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.70710653, z: -0, w: 0.7071071} - m_LocalPosition: {x: 8.14, y: 0, z: 3.96} + m_LocalPosition: {x: 8, y: 0, z: 4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15200,6 +15670,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2074179184 SphereCollider: @@ -15311,6 +15782,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2076468049 SphereCollider: @@ -15422,6 +15894,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2087670892 SphereCollider: @@ -15452,6 +15925,118 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2087670889} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2133753687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2133753688} + - component: {fileID: 2133753691} + - component: {fileID: 2133753690} + - component: {fileID: 2133753689} + m_Layer: 0 + m_Name: SampleCubemapHDRProperty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2133753688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133753687} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8, y: 0, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 596523079} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2133753689 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133753687} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: aa7adbc51980e644f9beeb116144a0cc, type: 3} + 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: 1 + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &2133753690 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133753687} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &2133753691 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133753687} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2140997632 GameObject: m_ObjectHideFlags: 0 @@ -15533,6 +16118,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2140997635 SphereCollider: diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr new file mode 100644 index 00000000000..119416e1ae5 Binary files /dev/null and b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr differ diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr.meta new file mode 100644 index 00000000000..b2adeb05b61 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2d.hdr.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: b6b0f404c8e7d7a488e67a68b9c21f45 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreXboxOne + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreScarlett + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Switch + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr new file mode 100644 index 00000000000..119416e1ae5 Binary files /dev/null and b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr differ diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr.meta new file mode 100644 index 00000000000..97f8825aea2 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex2darray.hdr.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 68f8e3b049578b040903a1fc7f76bb57 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 4 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreXboxOne + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreScarlett + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Switch + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr new file mode 100644 index 00000000000..119416e1ae5 Binary files /dev/null and b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr differ diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr.meta new file mode 100644 index 00000000000..698a9832899 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Scenes/InputNodes/ballroom_2k_as_tex3d.hdr.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 9d4384f5fdf185443b5a5fabbe208b7c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 8 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreXboxOne + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: GameCoreScarlett + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Switch + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph new file mode 100644 index 00000000000..d6f82f2ebdd --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph @@ -0,0 +1,680 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "cbb90a03a22c42d5bcba788f953785ac", + "m_Properties": [ + { + "m_Id": "95c3c00915d54e4cb7e473c2d2cc6e37" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "f1a30dbd45dc4df98cd1782b90d2312d" + } + ], + "m_Nodes": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + }, + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + }, + { + "m_Id": "d8c2021d209a4480ad8e969aae85a784" + }, + { + "m_Id": "ff8812f0afed448a80021c82f0496b24" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d8c2021d209a4480ad8e969aae85a784" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ff8812f0afed448a80021c82f0496b24" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ff8812f0afed448a80021c82f0496b24" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -101.0, + "y": -59.0 + }, + "m_Blocks": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -101.0, + "y": 141.0 + }, + "m_Blocks": [ + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graph Tests/Input/Texture", + "m_GraphPrecision": 0, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "223f4985cc484287baf6a49af81858e4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "019813b21b3741f29e4b5402a7a326d5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ff660e2a2c834f718033951e20a37a09" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "133647787a96485f9b2cd5fcd6b62dff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e6333f5002464c73903cdb3bf53f540b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1aab67cf5f0944eaab60bfc67dbe4b4e", + "m_Id": 4, + "m_DisplayName": "LOD", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "LOD", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CubemapMaterialSlot", + "m_ObjectId": "1b547d84f92b43729a01135821737bbb", + "m_Id": 0, + "m_DisplayName": "HDRCubemap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "223f4985cc484287baf6a49af81858e4", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "767557cbb5ba4f549e0b18f9dd7869d9" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "33f3ade4f3e04a2aa924997cfb0e764a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e279564ec7814c0bbdb16ed7895c032e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3c0c08ea40414a87ac25f5ab55fb9ec7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "93f3c2977f864ebcbcf2501b4aa1a01b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "622f620cbc8d43bbab2fa7a1150c774c", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "663be1f9ca624d8f8ed0f185345e8545", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "767557cbb5ba4f549e0b18f9dd7869d9", + "m_KeepLightingVariants": false, + "m_DefaultDecalBlending": true, + "m_DefaultSSAO": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "7f56040487ad433d8041f7ce4f982067", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "93f3c2977f864ebcbcf2501b4aa1a01b", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.CubemapShaderProperty", + "m_ObjectId": "95c3c00915d54e4cb7e473c2d2cc6e37", + "m_Guid": { + "m_GuidSerialized": "11bffe0e-7f23-447e-8b62-c3916c01827a" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "HDRCubemap", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "HDRCubemap", + "m_DefaultReferenceName": "_HDRCubemap", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "m_SerializedCubemap": "{\"cubemap\":{\"fileID\":8900000,\"guid\":\"e38e3a1c6e553244f848c69129f52d31\",\"type\":3}}", + "m_Guid": "" + }, + "isHDR": true, + "m_Modifiable": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "b9f2ddbe182a47c0964cb70cfacb0c66", + "m_Id": 2, + "m_DisplayName": "Dir", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Dir", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 2 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bdafcb6cf5124f4a89caef86b4189145", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "663be1f9ca624d8f8ed0f185345e8545" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d8c2021d209a4480ad8e969aae85a784", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -620.0000610351563, + "y": 7.999999523162842, + "width": 152.0, + "height": 33.99999237060547 + } + }, + "m_Slots": [ + { + "m_Id": "1b547d84f92b43729a01135821737bbb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "95c3c00915d54e4cb7e473c2d2cc6e37" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "e279564ec7814c0bbdb16ed7895c032e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CubemapInputMaterialSlot", + "m_ObjectId": "e4469ffff91f4cfdb899db3776d415c6", + "m_Id": 1, + "m_DisplayName": "Cube", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Cube", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Cubemap": { + "m_SerializedCubemap": "{\"cubemap\":{\"instanceID\":0}}", + "m_Guid": "" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "e6333f5002464c73903cdb3bf53f540b", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f1a30dbd45dc4df98cd1782b90d2312d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "95c3c00915d54e4cb7e473c2d2cc6e37" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "ff660e2a2c834f718033951e20a37a09", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleRawCubemapNode", + "m_ObjectId": "ff8812f0afed448a80021c82f0496b24", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Cubemap", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -427.9999694824219, + "y": 8.000004768371582, + "width": 207.99996948242188, + "height": 350.0 + } + }, + "m_Slots": [ + { + "m_Id": "622f620cbc8d43bbab2fa7a1150c774c" + }, + { + "m_Id": "e4469ffff91f4cfdb899db3776d415c6" + }, + { + "m_Id": "b9f2ddbe182a47c0964cb70cfacb0c66" + }, + { + "m_Id": "7f56040487ad433d8041f7ce4f982067" + }, + { + "m_Id": "1aab67cf5f0944eaab60bfc67dbe4b4e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph.meta new file mode 100644 index 00000000000..7f262796829 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleCubemapHDRProperty.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: aa7adbc51980e644f9beeb116144a0cc +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph new file mode 100644 index 00000000000..664942b5c60 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph @@ -0,0 +1,760 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "cbb90a03a22c42d5bcba788f953785ac", + "m_Properties": [ + { + "m_Id": "ee4fb18ba6984b1dbf94393ddb57aa90" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "f1a30dbd45dc4df98cd1782b90d2312d" + } + ], + "m_Nodes": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + }, + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + }, + { + "m_Id": "81f1bd27e5cd4da1bdf0331c16cf233c" + }, + { + "m_Id": "40607302c27b4744811c0c42c4dd846f" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "40607302c27b4744811c0c42c4dd846f" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "81f1bd27e5cd4da1bdf0331c16cf233c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "40607302c27b4744811c0c42c4dd846f" + }, + "m_SlotId": 1 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -101.0, + "y": -59.0 + }, + "m_Blocks": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -101.0, + "y": 141.0 + }, + "m_Blocks": [ + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graph Tests/Input/Texture", + "m_GraphPrecision": 0, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "223f4985cc484287baf6a49af81858e4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "019813b21b3741f29e4b5402a7a326d5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ff660e2a2c834f718033951e20a37a09" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "10eb53fdca2946cc9e64508be63cbddc", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "133647787a96485f9b2cd5fcd6b62dff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e6333f5002464c73903cdb3bf53f540b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "223f4985cc484287baf6a49af81858e4", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "767557cbb5ba4f549e0b18f9dd7869d9" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2353c363914c4ce1807808373f67a14f", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "255398e2956d4a80aec6134f8fd8a098", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "33f3ade4f3e04a2aa924997cfb0e764a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e279564ec7814c0bbdb16ed7895c032e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3c0c08ea40414a87ac25f5ab55fb9ec7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "93f3c2977f864ebcbcf2501b4aa1a01b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DArrayNode", + "m_ObjectId": "40607302c27b4744811c0c42c4dd846f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D Array", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -481.0, + "y": 29.0, + "width": 218.0, + "height": 374.0 + } + }, + "m_Slots": [ + { + "m_Id": "76982fb951964ed1bf4bbd9180306dd6" + }, + { + "m_Id": "448e292efa3240f993c43cc4ade09211" + }, + { + "m_Id": "5de481a50123419b83b144ac7152abb9" + }, + { + "m_Id": "c0eccdb94ed746bdae1c1cb741a60225" + }, + { + "m_Id": "2353c363914c4ce1807808373f67a14f" + }, + { + "m_Id": "ab63b2623c784d72ac0d8ba3edf0070a" + }, + { + "m_Id": "f27cce2254eb4131be6726ef025021e0" + }, + { + "m_Id": "255398e2956d4a80aec6134f8fd8a098" + }, + { + "m_Id": "10eb53fdca2946cc9e64508be63cbddc" + } + ], + "synonyms": [ + "stack", + "pile", + "tex2darray" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_EnableGlobalMipBias": false, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "448e292efa3240f993c43cc4ade09211", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5de481a50123419b83b144ac7152abb9", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "663be1f9ca624d8f8ed0f185345e8545", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayMaterialSlot", + "m_ObjectId": "67ea8ac479e342468d710c5942b39e01", + "m_Id": 0, + "m_DisplayName": "HDRTexture2DArray", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "767557cbb5ba4f549e0b18f9dd7869d9", + "m_KeepLightingVariants": false, + "m_DefaultDecalBlending": true, + "m_DefaultSSAO": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "76982fb951964ed1bf4bbd9180306dd6", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "81f1bd27e5cd4da1bdf0331c16cf233c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -739.3076782226563, + "y": 28.892486572265626, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "67ea8ac479e342468d710c5942b39e01" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ee4fb18ba6984b1dbf94393ddb57aa90" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "93f3c2977f864ebcbcf2501b4aa1a01b", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayInputMaterialSlot", + "m_ObjectId": "ab63b2623c784d72ac0d8ba3edf0070a", + "m_Id": 1, + "m_DisplayName": "Texture Array", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture Array", + "m_StageCapability": 3, + "m_BareResource": false, + "m_TextureArray": { + "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", + "m_Guid": "" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bdafcb6cf5124f4a89caef86b4189145", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "663be1f9ca624d8f8ed0f185345e8545" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c0eccdb94ed746bdae1c1cb741a60225", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "e279564ec7814c0bbdb16ed7895c032e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "e6333f5002464c73903cdb3bf53f540b", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DArrayShaderProperty", + "m_ObjectId": "ee4fb18ba6984b1dbf94393ddb57aa90", + "m_Guid": { + "m_GuidSerialized": "56afd070-3277-493a-818c-8c30c4538b82" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "HDRTexture2DArray", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "HDRTexture2DArray", + "m_DefaultReferenceName": "_HDRTexture2DArray", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "m_SerializedTexture": "{\"textureArray\":{\"fileID\":18700000,\"guid\":\"68f8e3b049578b040903a1fc7f76bb57\",\"type\":3}}", + "m_Guid": "" + }, + "isHDR": true, + "m_Modifiable": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f1a30dbd45dc4df98cd1782b90d2312d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "ee4fb18ba6984b1dbf94393ddb57aa90" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f27cce2254eb4131be6726ef025021e0", + "m_Id": 8, + "m_DisplayName": "Index", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Index", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "ff660e2a2c834f718033951e20a37a09", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph.meta new file mode 100644 index 00000000000..241b90c42be --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DArrayHDRProperty.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2d8aac95ceb765a46a041955c157971d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph new file mode 100644 index 00000000000..1fdc13d30e1 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph @@ -0,0 +1,746 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "cbb90a03a22c42d5bcba788f953785ac", + "m_Properties": [ + { + "m_Id": "ff0b13eaa98e421692c4a70aee8c7954" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "f1a30dbd45dc4df98cd1782b90d2312d" + } + ], + "m_Nodes": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + }, + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + }, + { + "m_Id": "e8518b29251546c3a1be26a11fca3668" + }, + { + "m_Id": "bec33609ad52499583bed28a5a5253c8" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bec33609ad52499583bed28a5a5253c8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e8518b29251546c3a1be26a11fca3668" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "bec33609ad52499583bed28a5a5253c8" + }, + "m_SlotId": 1 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -101.0, + "y": -59.0 + }, + "m_Blocks": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -101.0, + "y": 141.0 + }, + "m_Blocks": [ + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graph Tests/Input/Texture", + "m_GraphPrecision": 0, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "223f4985cc484287baf6a49af81858e4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "019813b21b3741f29e4b5402a7a326d5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ff660e2a2c834f718033951e20a37a09" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "0bd63fd5aa434960ac233b632826ba40", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "133647787a96485f9b2cd5fcd6b62dff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e6333f5002464c73903cdb3bf53f540b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "223f4985cc484287baf6a49af81858e4", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "767557cbb5ba4f549e0b18f9dd7869d9" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2a05de10c9dd443d85ef1cd22f8716f0", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "2d50dfb6554c457bb0bdbb72d420547f", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "33f3ade4f3e04a2aa924997cfb0e764a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e279564ec7814c0bbdb16ed7895c032e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3c0c08ea40414a87ac25f5ab55fb9ec7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "93f3c2977f864ebcbcf2501b4aa1a01b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "636eb5f8b9e54a85bf08681e6e1a156c", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "663be1f9ca624d8f8ed0f185345e8545", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "767557cbb5ba4f549e0b18f9dd7869d9", + "m_KeepLightingVariants": false, + "m_DefaultDecalBlending": true, + "m_DefaultSSAO": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "93f3c2977f864ebcbcf2501b4aa1a01b", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9f66d71aec234f198e043249769134ee", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "ac7420de53a3457b815b078f5cbda3c8", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b2daeff43fe44d58870581aa013af1c6", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b42e66f91b5942d39e67aa5912333ced", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bdafcb6cf5124f4a89caef86b4189145", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "663be1f9ca624d8f8ed0f185345e8545" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "bec33609ad52499583bed28a5a5253c8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -507.8968811035156, + "y": 13.179909706115723, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "636eb5f8b9e54a85bf08681e6e1a156c" + }, + { + "m_Id": "b42e66f91b5942d39e67aa5912333ced" + }, + { + "m_Id": "9f66d71aec234f198e043249769134ee" + }, + { + "m_Id": "2a05de10c9dd443d85ef1cd22f8716f0" + }, + { + "m_Id": "b2daeff43fe44d58870581aa013af1c6" + }, + { + "m_Id": "0bd63fd5aa434960ac233b632826ba40" + }, + { + "m_Id": "ac7420de53a3457b815b078f5cbda3c8" + }, + { + "m_Id": "2d50dfb6554c457bb0bdbb72d420547f" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "e279564ec7814c0bbdb16ed7895c032e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "e6333f5002464c73903cdb3bf53f540b", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e8518b29251546c3a1be26a11fca3668", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -754.4000854492188, + "y": 13.20002269744873, + "width": 161.60003662109376, + "height": 35.199989318847659 + } + }, + "m_Slots": [ + { + "m_Id": "f6a4d65c7d084af9af2ffe0437a2ae5b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ff0b13eaa98e421692c4a70aee8c7954" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f1a30dbd45dc4df98cd1782b90d2312d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "ff0b13eaa98e421692c4a70aee8c7954" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "f6a4d65c7d084af9af2ffe0437a2ae5b", + "m_Id": 0, + "m_DisplayName": "Texture2DHDR", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ff0b13eaa98e421692c4a70aee8c7954", + "m_Guid": { + "m_GuidSerialized": "e775f5c0-2630-4b0f-a565-c1741010e6dd" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Texture2DHDR", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Texture2DHDR", + "m_DefaultReferenceName": "_Texture2DHDR", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"b6b0f404c8e7d7a488e67a68b9c21f45\",\"type\":3}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "useTexelSize": true, + "isHDR": true, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "ff660e2a2c834f718033951e20a37a09", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph.meta new file mode 100644 index 00000000000..9e08db4f07b --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture2DHDRProperty.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: afd7888077e98424487647ce919963b3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph new file mode 100644 index 00000000000..81507a46602 --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph @@ -0,0 +1,820 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "cbb90a03a22c42d5bcba788f953785ac", + "m_Properties": [ + { + "m_Id": "519d7bd06ca9446ab75e84c431c6a77c" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "f1a30dbd45dc4df98cd1782b90d2312d" + } + ], + "m_Nodes": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + }, + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + }, + { + "m_Id": "5f825d83e70b4f2cbc8c74be06743656" + }, + { + "m_Id": "e1792906c74244c59b4adf458d097e21" + }, + { + "m_Id": "aa5edf0a69c948df957b471ff31327c3" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5f825d83e70b4f2cbc8c74be06743656" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e1792906c74244c59b4adf458d097e21" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "aa5edf0a69c948df957b471ff31327c3" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e1792906c74244c59b4adf458d097e21" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e1792906c74244c59b4adf458d097e21" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": -101.0, + "y": -59.0 + }, + "m_Blocks": [ + { + "m_Id": "133647787a96485f9b2cd5fcd6b62dff" + }, + { + "m_Id": "019813b21b3741f29e4b5402a7a326d5" + }, + { + "m_Id": "bdafcb6cf5124f4a89caef86b4189145" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": -101.0, + "y": 141.0 + }, + "m_Blocks": [ + { + "m_Id": "33f3ade4f3e04a2aa924997cfb0e764a" + }, + { + "m_Id": "3c0c08ea40414a87ac25f5ab55fb9ec7" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graph Tests/Input/Texture", + "m_GraphPrecision": 0, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "223f4985cc484287baf6a49af81858e4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "019813b21b3741f29e4b5402a7a326d5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ff660e2a2c834f718033951e20a37a09" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "133647787a96485f9b2cd5fcd6b62dff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e6333f5002464c73903cdb3bf53f540b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "223f4985cc484287baf6a49af81858e4", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "767557cbb5ba4f549e0b18f9dd7869d9" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2d19580c1a384e3f84584a022906ad36", + "m_Id": 5, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture3DInputMaterialSlot", + "m_ObjectId": "31e9b6848441409e838add9d8be7b360", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "33f3ade4f3e04a2aa924997cfb0e764a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e279564ec7814c0bbdb16ed7895c032e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "36111ab258394a1fb0035c5de9618cf0", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3c0c08ea40414a87ac25f5ab55fb9ec7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "93f3c2977f864ebcbcf2501b4aa1a01b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture3DShaderProperty", + "m_ObjectId": "519d7bd06ca9446ab75e84c431c6a77c", + "m_Guid": { + "m_GuidSerialized": "6a47331a-c08a-49a6-a42a-e072c6dab8eb" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "HDRTexture3D", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "HDRTexture3D", + "m_DefaultReferenceName": "_HDRTexture3D", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":11700000,\"guid\":\"9d4384f5fdf185443b5a5fabbe208b7c\",\"type\":3}}", + "m_Guid": "" + }, + "isHDR": true, + "m_Modifiable": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "5f825d83e70b4f2cbc8c74be06743656", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -731.6000366210938, + "y": 65.99996948242188, + "width": 162.0, + "height": 35.20001220703125 + } + }, + "m_Slots": [ + { + "m_Id": "6c12b76299a1417c995f16e630dfeb2b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "519d7bd06ca9446ab75e84c431c6a77c" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "61316c7770c242e6b1473a5c7a5b65d3", + "m_Id": 6, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "663be1f9ca624d8f8ed0f185345e8545", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture3DMaterialSlot", + "m_ObjectId": "6c12b76299a1417c995f16e630dfeb2b", + "m_Id": 0, + "m_DisplayName": "HDRTexture3D", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "767557cbb5ba4f549e0b18f9dd7869d9", + "m_KeepLightingVariants": false, + "m_DefaultDecalBlending": true, + "m_DefaultSSAO": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "77dfef58902e4a24abbf9f594dec185b", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "7d2c5a5ec3ca4fe681a9f4903f7dbd91", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "93f3c2977f864ebcbcf2501b4aa1a01b", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "963713fa2a0e4fa7bee0e0a964950604", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "aa5edf0a69c948df957b471ff31327c3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -731.6000366210938, + "y": 143.19998168945313, + "width": 146.4000244140625, + "height": 129.60000610351563 + } + }, + "m_Slots": [ + { + "m_Id": "963713fa2a0e4fa7bee0e0a964950604" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b96d99b061084eb6a9bb1f21176f64b2", + "m_Id": 7, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bdafcb6cf5124f4a89caef86b4189145", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "663be1f9ca624d8f8ed0f185345e8545" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture3DNode", + "m_ObjectId": "e1792906c74244c59b4adf458d097e21", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 3D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -515.6000366210938, + "y": 85.19999694824219, + "width": 208.80001831054688, + "height": 375.20001220703127 + } + }, + "m_Slots": [ + { + "m_Id": "36111ab258394a1fb0035c5de9618cf0" + }, + { + "m_Id": "2d19580c1a384e3f84584a022906ad36" + }, + { + "m_Id": "61316c7770c242e6b1473a5c7a5b65d3" + }, + { + "m_Id": "b96d99b061084eb6a9bb1f21176f64b2" + }, + { + "m_Id": "fa63a6fbd0034affa983891dfa81a930" + }, + { + "m_Id": "31e9b6848441409e838add9d8be7b360" + }, + { + "m_Id": "7d2c5a5ec3ca4fe681a9f4903f7dbd91" + }, + { + "m_Id": "77dfef58902e4a24abbf9f594dec185b" + } + ], + "synonyms": [ + "volume", + "tex3d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "e279564ec7814c0bbdb16ed7895c032e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "e6333f5002464c73903cdb3bf53f540b", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f1a30dbd45dc4df98cd1782b90d2312d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "519d7bd06ca9446ab75e84c431c6a77c" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fa63a6fbd0034affa983891dfa81a930", + "m_Id": 8, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "ff660e2a2c834f718033951e20a37a09", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph.meta new file mode 100644 index 00000000000..258c5406d9b --- /dev/null +++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/Input/Texture/SampleTexture3DHDRProperty.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ecd5a5a17ce8bba44b98141a1fb3737e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}