Skip to content

Add warning in probe volumes for when no subdivision information is retrievable from a profile #5595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 12, 2021
Merged

Add warning in probe volumes for when no subdivision information is retrievable from a profile #5595

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7f5e7c
Add warning.
FrancescoC-unity Sep 9, 2021
9af1ca6
Merge branch 'master' into HDRP/message-error-when-no-profile-defined
FrancescoC-unity Sep 10, 2021
06b5fdc
merge master
sebastienlagarde Sep 12, 2021
371718d
fix compilation issue
sebastienlagarde Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeUI.Drawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,12 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
return;
}

ProbeVolume pv = (serialized.serializedObject.targetObject as ProbeVolume);

bool hasProfile = (ProbeReferenceVolume.instance.sceneData?.GetProfileForScene(pv.gameObject.scene) != null);

EditorGUI.BeginChangeCheck();
if ((serialized.serializedObject.targetObject as ProbeVolume).mightNeedRebaking)
if (pv.mightNeedRebaking)
{
var helpBoxRect = GUILayoutUtility.GetRect(new GUIContent(Styles.s_ProbeVolumeChangedMessage, EditorGUIUtility.IconContent("Warning@2x").image), EditorStyles.helpBox);
EditorGUI.HelpBox(helpBoxRect, Styles.s_ProbeVolumeChangedMessage, MessageType.Warning);
Expand All @@ -137,6 +141,13 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
if (!serialized.globalVolume.boolValue)
EditorGUILayout.PropertyField(serialized.size, Styles.s_Size);

if (!hasProfile)
{
EditorGUILayout.HelpBox("No profile information is set for the scene that owns this probe volume so no subdivision information can be retrieved.", MessageType.Warning);
}

EditorGUI.BeginDisabledGroup(!hasProfile);

var rect = EditorGUILayout.GetControlRect(true);
EditorGUI.BeginProperty(rect, Styles.s_HighestSubdivLevel, serialized.highestSubdivisionLevelOverride);
EditorGUI.BeginProperty(rect, Styles.s_LowestSubdivLevel, serialized.lowestSubdivisionLevelOverride);
Expand All @@ -148,8 +159,6 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
{
if (ProbeReferenceVolume.instance.sceneData != null)
{
ProbeVolume pv = (serialized.serializedObject.targetObject as ProbeVolume);

var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(pv.gameObject.scene);

if (profile != null)
Expand Down Expand Up @@ -182,7 +191,10 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
int maxSubdivInVolume = serialized.highestSubdivisionLevelOverride.intValue;
EditorGUI.indentLevel--;

EditorGUILayout.HelpBox($"The distance between probes will fluctuate between : {ProbeReferenceVolume.instance.GetDistanceBetweenProbes(maxSubdiv - maxSubdivInVolume)}m and {ProbeReferenceVolume.instance.GetDistanceBetweenProbes(maxSubdiv - minSubdivInVolume)}m", MessageType.Info);
if (hasProfile)
EditorGUILayout.HelpBox($"The distance between probes will fluctuate between : {ProbeReferenceVolume.instance.GetDistanceBetweenProbes(maxSubdivInVolume)}m and {ProbeReferenceVolume.instance.GetDistanceBetweenProbes(minSubdivInVolume)}m", MessageType.Info);

EditorGUI.EndDisabledGroup();

if (EditorGUI.EndChangeCheck())
{
Expand Down