Skip to content

[HDRP] Layer drawer used in ray/path tracing now matches 100% with the Camera one #5956

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 1 commit into from
Oct 19, 2021
Merged

[HDRP] Layer drawer used in ray/path tracing now matches 100% with the Camera one #5956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 38 additions & 2 deletions com.unity.render-pipelines.core/Editor/Volume/Drawers/IntParameterDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,51 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
[VolumeParameterDrawer(typeof(LayerMaskParameter))]
sealed class LayerMaskParameterDrawer : VolumeParameterDrawer
{
private static int FieldToLayerMask(int field)
{
int mask = 0;
var layers = InternalEditorUtility.layers;
bool everything = true;
for (int c = 0; c < layers.Length; c++)
{
if ((field & (1 << c)) != 0)
mask |= 1 << LayerMask.NameToLayer(layers[c]);
else
{
mask &= ~(1 << LayerMask.NameToLayer(layers[c]));
everything = false;
}
}

return everything ? -1 : mask;
}

private static int LayerMaskToField(int mask)
{
int field = 0;
var layers = InternalEditorUtility.layers;
bool everything = true;
for (int c = 0; c < layers.Length; c++)
{
if ((mask & (1 << LayerMask.NameToLayer(layers[c]))) != 0)
field |= 1 << c;
else
everything = false;
}

return everything ? -1 : field;
}

public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
{
var value = parameter.value;

if (value.propertyType != SerializedPropertyType.LayerMask)
return false;

value.intValue = InternalEditorUtility.ConcatenatedLayersMaskToLayerMask(
EditorGUILayout.MaskField(title, InternalEditorUtility.LayerMaskToConcatenatedLayersMask(value.intValue), InternalEditorUtility.layers));
value.intValue = FieldToLayerMask(
EditorGUILayout.MaskField(title, LayerMaskToField(value.intValue), InternalEditorUtility.layers));

return true;
}
}
Expand Down