From b3a25ffa61f322987483ca200285b58b9a8939df Mon Sep 17 00:00:00 2001 From: Anis Benyoub Date: Wed, 21 Oct 2020 10:40:38 +0200 Subject: [PATCH 1/2] - Now the DXR wizard displays the name of the target asset that needs to be changed. - The DXR wizard displays asset changes as warnings and default frame settings as infos. - Added the status check of default camera frame settings in the DXR wizard. --- .../ProjectSettings/ProjectSettings.asset | 98 +++++++++---------- .../CHANGELOG.md | 2 + .../Editor/USS/Wizard.uss | 4 +- .../Editor/Wizard/HDWizard.Configuration.cs | 70 +++++++++++-- .../Editor/Wizard/HDWizard.Window.cs | 44 +++++++-- 5 files changed, 145 insertions(+), 73 deletions(-) diff --git a/TestProjects/HDRP_DXR_Tests/ProjectSettings/ProjectSettings.asset b/TestProjects/HDRP_DXR_Tests/ProjectSettings/ProjectSettings.asset index 9155c13664f..104d47fd624 100644 --- a/TestProjects/HDRP_DXR_Tests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/HDRP_DXR_Tests/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 21 productGUID: 504231709d29f6341950ddd13dd16f85 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -113,8 +113,14 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -129,31 +135,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 0 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -164,8 +145,13 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Standalone: com.DefaultCompany.HDRPDXRTests + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -192,22 +178,6 @@ PlayerSettings: uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -235,8 +205,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -244,6 +214,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -253,9 +224,17 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 7aaaa0dc1bd27d24f84a19b5893c8bae templatePackageId: com.unity.template.hd@3.5.0-preview templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -273,13 +252,16 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 100 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: - m_BuildTarget: Standalone - m_StaticBatching: 1 + m_StaticBatching: 0 m_DynamicBatching: 0 - m_BuildTarget: tvOS m_StaticBatching: 1 @@ -334,7 +316,7 @@ PlayerSettings: m_Automatic: 1 - m_BuildTarget: AppleTVSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 @@ -368,6 +350,7 @@ PlayerSettings: - m_BuildTarget: Windows Store Apps m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -509,6 +492,7 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -535,6 +519,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -560,6 +545,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -576,6 +562,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: - libc.prx @@ -606,17 +594,23 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 scriptingDefineSymbols: 1: UNITY_HDRP_DXR_TESTS_DEFINE;ENABLE_RAYTRACING + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -676,10 +670,8 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -694,12 +686,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 virtualTexturingSupportEnabled: 0 diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index c3d62dddd05..b200d899510 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Added a rough distortion frame setting and and info box on distortion materials. - Adding support of 4 channel tex coords for ray tracing (case 1265309). +- Added the status check of default camera frame settings in the DXR wizard. ### Fixed - Fixed an issue where the Exposure Shader Graph node had clipped text. (case 1265057) @@ -20,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Combined occlusion meshes into one to reduce draw calls and state changes with XR single-pass. +- Now the DXR wizard displays the name of the target asset that needs to be changed. ## [10.1.0] - 2020-10-12 diff --git a/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss b/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss index 1b285aa03b5..de39bea3f84 100644 --- a/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss +++ b/com.unity.render-pipelines.high-definition/Editor/USS/Wizard.uss @@ -3,7 +3,7 @@ width: 12px; height: 12px; position: absolute; - left: 180px; + left: 325px; } #DefaultResourceFolder > Label, #NewScene > Label, #NewDXRScene > Label @@ -13,7 +13,7 @@ #TestLabel { - width: 180px; + width: 325px; } #Resolver diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 04181ba6c87..5f77883e485 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -126,15 +126,18 @@ struct Entry public readonly int indent; public readonly bool forceDisplayCheck; public readonly bool skipErrorIcon; - public Entry(InclusiveScope scope, Style.ConfigStyle configStyle, Checker check, Fixer fix, bool forceDisplayCheck = false, bool skipErrorIcon = false) + public readonly bool displayAssetName; + + public Entry(InclusiveScope scope, Style.ConfigStyle configStyle, Checker check, Fixer fix, bool forceDisplayCheck = false, bool skipErrorIcon = false, bool displayAssetName = false) { this.scope = scope; this.configStyle = configStyle; this.check = check; this.fix = fix; this.forceDisplayCheck = forceDisplayCheck; - indent = scope == InclusiveScope.HDRPAsset || scope == InclusiveScope.XRManagement || scope == InclusiveScope.DXROptional ? 1 : 0; + indent = scope == InclusiveScope.HDRPAsset || scope == InclusiveScope.XRManagement ? 1 : 0; this.skipErrorIcon = skipErrorIcon; + this.displayAssetName = displayAssetName; } } @@ -177,11 +180,14 @@ Entry[] entries new Entry(InclusiveScope.DXR, Style.dxrResources, IsDXRAssetCorrect, FixDXRAsset), // Optional checks - new Entry(InclusiveScope.DXROptional, Style.dxrScreenSpaceShadow, IsDXRScreenSpaceShadowCorrect, null, forceDisplayCheck: true, skipErrorIcon: true), - new Entry(InclusiveScope.DXROptional, Style.dxrReflections, IsDXRReflectionsCorrect, null, forceDisplayCheck: true, skipErrorIcon: true), - new Entry(InclusiveScope.DXROptional, Style.dxrTransparentReflections, IsDXRTransparentReflectionsCorrect, null, forceDisplayCheck: true, skipErrorIcon: true), - new Entry(InclusiveScope.DXROptional, Style.dxrGI, IsDXRGICorrect, null, forceDisplayCheck: true, skipErrorIcon: true), - + new Entry(InclusiveScope.DXROptional, Style.dxrScreenSpaceShadow, IsDXRScreenSpaceShadowCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrScreenSpaceShadowFS, IsDXRScreenSpaceShadowFSCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrReflections, IsDXRReflectionsCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrReflectionsFS, IsDXRReflectionsFSCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrTransparentReflections, IsDXRTransparentReflectionsCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrTransparentReflectionsFS, IsDXRTransparentReflectionsFSCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrGI, IsDXRGICorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), + new Entry(InclusiveScope.DXROptional, Style.dxrGIFS, IsDXRGIFSCorrect, null, forceDisplayCheck: true, skipErrorIcon: true, displayAssetName: true), }; return m_Entries; } @@ -652,19 +658,67 @@ bool IsDXRScreenSpaceShadowCorrect() => HDRenderPipeline.currentAsset != null && HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.supportScreenSpaceShadows; + bool IsDXRScreenSpaceShadowFSCorrect() + { + HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + if (hdrpAsset != null) + { + FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + return defaultCameraFS.IsEnabled(FrameSettingsField.ScreenSpaceShadows); + } + else + return false; + } + bool IsDXRReflectionsCorrect() => HDRenderPipeline.currentAsset != null && HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.supportSSR; + bool IsDXRReflectionsFSCorrect() + { + HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + if (hdrpAsset != null) + { + FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + return defaultCameraFS.IsEnabled(FrameSettingsField.SSR); + } + else + return false; + } + bool IsDXRTransparentReflectionsCorrect() => HDRenderPipeline.currentAsset != null && HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.supportSSRTransparent; + bool IsDXRTransparentReflectionsFSCorrect() + { + HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + if (hdrpAsset != null) + { + FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + return defaultCameraFS.IsEnabled(FrameSettingsField.TransparentSSR); + } + else + return false; + } + bool IsDXRGICorrect() => HDRenderPipeline.currentAsset != null && HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.supportSSGI; - bool IsArchitecture64Bits() + bool IsDXRGIFSCorrect() + { + HDRenderPipelineAsset hdrpAsset = HDRenderPipeline.currentAsset; + if (hdrpAsset != null) + { + FrameSettings defaultCameraFS = hdrpAsset.GetDefaultFrameSettings(FrameSettingsRenderType.Camera); + return defaultCameraFS.IsEnabled(FrameSettingsField.SSGI); + } + else + return false; + } + + bool IsArchitecture64Bits() => EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64; void FixArchitecture64Bits(bool fromAsyncUnused) { diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs index ab43e5fc1f5..f629ba3168a 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.Rendering.HighDefinition; using System.Runtime.InteropServices; using UnityEngine.UIElements; using UnityEditor.UIElements; @@ -137,18 +138,30 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT label: "Direct3D 12", error: "Direct3D 12 is needed! (Editor restart is required)"); public static readonly ConfigStyle dxrScreenSpaceShadow = new ConfigStyle( - label: "Screen Space Shadow", - error: "Screen Space Shadows are disabled in the current HDRP asset. You will not be able to toggle ray traced shadows on the lights in your scene. You can enable the feature in the HDRP asset under Lighting -> Shadows -> Screen Space Shadows", messageType: MessageType.Info); + label: "Screen Space Shadows (Asset)", + error: "Screen Space Shadows are disabled in the current HDRP asset. You will not be able to toggle ray traced shadows on the lights in your scene. You can enable the feature in the HDRP asset under Lighting > Shadows > Screen Space Shadows", messageType: MessageType.Warning); + public static readonly ConfigStyle dxrScreenSpaceShadowFS = new ConfigStyle( + label: "Screen Space Shadows (Default Camera Frame Setting)", + error: "Screen Space Shadows are disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Shadows", messageType: MessageType.Info); public static readonly ConfigStyle dxrReflections = new ConfigStyle( - label: "Reflections", - error: "Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Screen Space Reflections", messageType: MessageType.Info); + label: "Reflection (Asset)", + error: "Screen Space Reflection is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections though your volume components. You can enable the feature in the HDRP asset under Lighting > Reflections > Screen Space Reflections", messageType: MessageType.Warning); + public static readonly ConfigStyle dxrReflectionsFS = new ConfigStyle( + label: "Reflection (Default Camera Frame Setting)", + error: "Screen Space Reflection is disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Reflections", messageType: MessageType.Info); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( - label: "Transparent Reflections", - error: "Transparent Screen Space Reflections are disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting -> Reflections -> Transparent Screen Space Reflections", messageType: MessageType.Info); + label: "Transparent Reflection (Asset)", + error: "Transparent Screen Space Reflection is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting > Reflections > Transparent Screen Space Reflections", messageType: MessageType.Warning); + public static readonly ConfigStyle dxrTransparentReflectionsFS = new ConfigStyle( + label: "Transparent Reflection (Default Camera Frame Setting)", + error: "Transparent Screen Space Reflection is disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > On Transparent", messageType: MessageType.Info); public static readonly ConfigStyle dxrGI = new ConfigStyle( - label: "Global Illumination", - error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Info); - public static readonly ConfigStyle dxr64bits = new ConfigStyle( + label: "Global Illumination (Asset)", + error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Warning); + public static readonly ConfigStyle dxrGIFS = new ConfigStyle( + label: "Global Illumination (Default Camera Frame Setting)", + error: "Screen Space Global Illumination is disabledin the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Global Illumination", messageType: MessageType.Info); + public static readonly ConfigStyle dxr64bits = new ConfigStyle( label: "Architecture 64 bits", error: "To build your Project to a Unity Player, ray tracing requires that the build uses 64 bit architecture."); public static readonly ConfigStyle dxrStaticBatching = new ConfigStyle( @@ -481,9 +494,19 @@ void UpdateDisplayOfConfigPackageArea(ConfigPackageState state) void GroupEntriesForDisplay(VisualElement container, InclusiveScope filter) { foreach (var entry in entries.Where(e => filter.Contains(e.scope))) + { + string error = entry.configStyle.error; + + // If it is necessary, append tht name of the current asset. + var hdrpAsset = HDRenderPipeline.currentAsset; + if (entry.displayAssetName && hdrpAsset != null) + { + error += " (" + hdrpAsset.name +")."; + } + container.Add(new ConfigInfoLine( entry.configStyle.label, - entry.configStyle.error, + error, entry.configStyle.messageType, entry.configStyle.button, () => entry.check(), @@ -491,6 +514,7 @@ void GroupEntriesForDisplay(VisualElement container, InclusiveScope filter) entry.indent, entry.configStyle.messageType == MessageType.Error || entry.forceDisplayCheck, entry.skipErrorIcon)); + } } void AddHDRPConfigInfo(VisualElement container) From 4289d20376f820a7bc93b6911e85b7ae33e51821 Mon Sep 17 00:00:00 2001 From: Anis Benyoub Date: Wed, 21 Oct 2020 16:06:43 +0200 Subject: [PATCH 2/2] review corrections --- .../Editor/Wizard/HDWizard.Window.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs index f629ba3168a..dfa8ab52429 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Window.cs @@ -139,28 +139,28 @@ public ConfigStyle(string label, string error, string button = resolve, MessageT error: "Direct3D 12 is needed! (Editor restart is required)"); public static readonly ConfigStyle dxrScreenSpaceShadow = new ConfigStyle( label: "Screen Space Shadows (Asset)", - error: "Screen Space Shadows are disabled in the current HDRP asset. You will not be able to toggle ray traced shadows on the lights in your scene. You can enable the feature in the HDRP asset under Lighting > Shadows > Screen Space Shadows", messageType: MessageType.Warning); + error: "Screen Space Shadows are disabled in the current HDRP Asset which means you cannot enable ray-traced shadows for lights in your scene. To enable this feature, open your HDRP Asset, go to Lighting > Shadows, and enable Screen Space Shadows", messageType: MessageType.Warning); public static readonly ConfigStyle dxrScreenSpaceShadowFS = new ConfigStyle( label: "Screen Space Shadows (Default Camera Frame Setting)", - error: "Screen Space Shadows are disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Shadows", messageType: MessageType.Info); + error: "Screen Space Shadows are disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced shadows. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Shadows", messageType: MessageType.Info); public static readonly ConfigStyle dxrReflections = new ConfigStyle( label: "Reflection (Asset)", - error: "Screen Space Reflection is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections though your volume components. You can enable the feature in the HDRP asset under Lighting > Reflections > Screen Space Reflections", messageType: MessageType.Warning); + error: "Screen Space Reflection is disabled in the current HDRP Asset which means you cannot enable ray-traced reflections in Volume components. To enable this feature, open your HDRP Asset, go to Lighting > Reflections, and enable Screen Space Reflections", messageType: MessageType.Warning); public static readonly ConfigStyle dxrReflectionsFS = new ConfigStyle( label: "Reflection (Default Camera Frame Setting)", - error: "Screen Space Reflection is disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Reflections", messageType: MessageType.Info); + error: "Screen Space Reflection is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Reflections", messageType: MessageType.Info); public static readonly ConfigStyle dxrTransparentReflections = new ConfigStyle( label: "Transparent Reflection (Asset)", - error: "Transparent Screen Space Reflection is disabled in the current HDRP asset. You will not be able to toggle ray traced reflections on transparent objects though your volume components. You can enable the feature in the HDRP asset under Lighting > Reflections > Transparent Screen Space Reflections", messageType: MessageType.Warning); + error: "Transparent Screen Space Reflection is disabled in the current HDRP Asset which means you cannot enable ray-traced reflections for transparent GameObjects from Volume components. To enable this feature, open your HDRP Asset, go to Lighting > Reflections, and enable Transparent Screen Space Reflections", messageType: MessageType.Warning); public static readonly ConfigStyle dxrTransparentReflectionsFS = new ConfigStyle( label: "Transparent Reflection (Default Camera Frame Setting)", - error: "Transparent Screen Space Reflection is disabled in the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > On Transparent", messageType: MessageType.Info); + error: "Transparent Screen Space Reflection is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced reflections for transparent GameObjects. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable On Transparent", messageType: MessageType.Info); public static readonly ConfigStyle dxrGI = new ConfigStyle( label: "Global Illumination (Asset)", - error: "Screen Space Global Illumination is disabled in the current HDRP asset. You will not be able to toggle ray global illumination though your volume components. You can enable the feature in the HDRP asset under Lighting -> Screen Space Global Illumination", messageType: MessageType.Warning); + error: "Screen Space Global Illumination is disabled in the current HDRP asset which means you cannot enable ray-traced global illumination in Volume components. To enable this feature, open your HDRP Asset, go to Lighting and enable Screen Space Global Illumination", messageType: MessageType.Warning); public static readonly ConfigStyle dxrGIFS = new ConfigStyle( label: "Global Illumination (Default Camera Frame Setting)", - error: "Screen Space Global Illumination is disabledin the default Camera Frame setting. You can enable the feature in Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting > Screen Space Global Illumination", messageType: MessageType.Info); + error: "Screen Space Global Illumination is disabled in the default Camera Frame Settings. This means Cameras that use these Frame Settings do not render ray-traced global illumination. To enable this feature, go to Project Settings > HDRP Default Settings > Frame Settings > Default Frame Settings For Camera > Lighting and enable Screen Space Global Illumination", messageType: MessageType.Info); public static readonly ConfigStyle dxr64bits = new ConfigStyle( label: "Architecture 64 bits", error: "To build your Project to a Unity Player, ray tracing requires that the build uses 64 bit architecture.");