feat: add Use HDR Color Picker option for project settings (editor)

close #290
This commit is contained in:
fumiko
2025-01-07 16:12:24 +09:00
committed by mob-sakai
parent 9799069633
commit 1be0cd45db
4 changed files with 83 additions and 15 deletions
+63 -9
View File
@@ -2,6 +2,7 @@
using UnityEngine; using UnityEngine;
using System.Linq; using System.Linq;
using System; using System;
using System.Reflection;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
namespace Coffee.UIEffects.Editors namespace Coffee.UIEffects.Editors
@@ -13,6 +14,17 @@ namespace Coffee.UIEffects.Editors
[CanEditMultipleObjects] [CanEditMultipleObjects]
public class UIEffect2Editor : Editor public class UIEffect2Editor : Editor
{ {
private static readonly PropertyInfo s_PiGradient = typeof(SerializedProperty)
.GetProperty("gradientValue", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
private static readonly Func<SerializedProperty, Gradient> s_GetGradient =
(Func<SerializedProperty, Gradient>)Delegate.CreateDelegate(typeof(Func<SerializedProperty, Gradient>),
s_PiGradient.GetMethod);
private static readonly Action<SerializedProperty, Gradient> s_SetGradient =
(Action<SerializedProperty, Gradient>)Delegate.CreateDelegate(typeof(Action<SerializedProperty, Gradient>),
s_PiGradient.SetMethod);
private SerializedProperty _toneFilter; private SerializedProperty _toneFilter;
private SerializedProperty _toneIntensity; private SerializedProperty _toneIntensity;
@@ -162,7 +174,7 @@ namespace Coffee.UIEffects.Editors
{ {
EditorGUI.indentLevel++; EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(_colorIntensity); EditorGUILayout.PropertyField(_colorIntensity);
DrawColor(_colorFilter, _color, prevColorFilter); DrawColor(_colorFilter, _color, prevColorFilter, false);
EditorGUILayout.PropertyField(_colorGlow); EditorGUILayout.PropertyField(_colorGlow);
EditorGUI.indentLevel--; EditorGUI.indentLevel--;
} }
@@ -260,7 +272,7 @@ namespace Coffee.UIEffects.Editors
} }
EditorGUILayout.PropertyField(_shadowColorFilter); EditorGUILayout.PropertyField(_shadowColorFilter);
EditorGUILayout.PropertyField(_shadowColor); DrawColorPickerField(_shadowColor, false);
EditorGUILayout.PropertyField(_shadowColorGlow); EditorGUILayout.PropertyField(_shadowColorGlow);
EditorGUILayout.PropertyField(_shadowFade); EditorGUILayout.PropertyField(_shadowFade);
@@ -286,15 +298,16 @@ namespace Coffee.UIEffects.Editors
case GradationMode.HorizontalGradient: case GradationMode.HorizontalGradient:
case GradationMode.VerticalGradient: case GradationMode.VerticalGradient:
case GradationMode.AngleGradient: case GradationMode.AngleGradient:
EditorGUILayout.PropertyField(_gradationGradient); DrawGradientField(_gradationGradient);
break; break;
default: default:
EditorGUILayout.PropertyField(_gradationColor1); DrawColorPickerField(_gradationColor1);
var r = EditorGUILayout.GetControlRect(); var r = EditorGUILayout.GetControlRect();
r.width -= 20; r.width -= 24;
EditorGUI.PropertyField(r, _gradationColor2); r.height = EditorGUIUtility.singleLineHeight;
DrawColorPickerField(r, _gradationColor2);
r.x += r.width; r.x += r.width + 4;
r.width = 20; r.width = 20;
// Swap colors // Swap colors
if (GUI.Button(r, EditorGUIUtility.IconContent("preaudioloopoff"), "iconbutton")) if (GUI.Button(r, EditorGUIUtility.IconContent("preaudioloopoff"), "iconbutton"))
@@ -326,7 +339,48 @@ namespace Coffee.UIEffects.Editors
} }
} }
private static void DrawColor(SerializedProperty filter, SerializedProperty color, ColorFilter prevFilter) private static void DrawColorPickerField(SerializedProperty color, bool showAlpha = true)
{
var r = EditorGUILayout.GetControlRect();
r.height = EditorGUIUtility.singleLineHeight;
DrawColorPickerField(r, color, showAlpha);
}
private static void DrawColorPickerField(Rect rect, SerializedProperty color, bool showAlpha = true)
{
var label = EditorGUIUtility.TrTempContent(color.displayName);
label.tooltip = color.tooltip;
var hdr = UIEffectProjectSettings.useHdrColorPicker;
EditorGUI.showMixedValue = color.hasMultipleDifferentValues;
EditorGUI.BeginChangeCheck();
var colorValue = EditorGUI.ColorField(rect, label, color.colorValue, true, showAlpha, hdr);
if (EditorGUI.EndChangeCheck())
{
color.colorValue = colorValue;
}
}
private static void DrawGradientField(SerializedProperty gradient)
{
var r = EditorGUILayout.GetControlRect();
r.height = EditorGUIUtility.singleLineHeight;
var label = EditorGUIUtility.TrTempContent(gradient.displayName);
label.tooltip = gradient.tooltip;
var hdr = UIEffectProjectSettings.useHdrColorPicker;
EditorGUI.showMixedValue = gradient.hasMultipleDifferentValues;
EditorGUI.BeginChangeCheck();
var gradientValue = EditorGUI.GradientField(r, label, s_GetGradient(gradient), hdr);
if (EditorGUI.EndChangeCheck())
{
s_SetGradient(gradient, gradientValue);
}
}
private static void DrawColor(SerializedProperty filter, SerializedProperty color, ColorFilter prevFilter,
bool showAlpha = true)
{ {
if (filter.intValue == (int)ColorFilter.None) if (filter.intValue == (int)ColorFilter.None)
{ {
@@ -361,7 +415,7 @@ namespace Coffee.UIEffects.Editors
color.colorValue = Color.white; color.colorValue = Color.white;
} }
EditorGUILayout.PropertyField(color); DrawColorPickerField(color, showAlpha);
} }
} }
@@ -9,6 +9,7 @@ namespace Coffee.UIEffects.Editors
public class UIEffectProjectSettingsEditor : Editor public class UIEffectProjectSettingsEditor : Editor
{ {
private ReorderableList _reorderableList; private ReorderableList _reorderableList;
private SerializedProperty _useHDRColorPicker;
private SerializedProperty _transformSensitivity; private SerializedProperty _transformSensitivity;
private bool _isInitialized; private bool _isInitialized;
private ShaderVariantRegistryEditor _shaderVariantRegistryEditor; private ShaderVariantRegistryEditor _shaderVariantRegistryEditor;
@@ -18,6 +19,7 @@ namespace Coffee.UIEffects.Editors
if (_isInitialized) return; if (_isInitialized) return;
_transformSensitivity = serializedObject.FindProperty("m_TransformSensitivity"); _transformSensitivity = serializedObject.FindProperty("m_TransformSensitivity");
_useHDRColorPicker = serializedObject.FindProperty("m_UseHDRColorPicker");
var runtimePresets = serializedObject.FindProperty("m_RuntimePresets"); var runtimePresets = serializedObject.FindProperty("m_RuntimePresets");
_reorderableList = new ReorderableList(serializedObject, runtimePresets, true, true, true, true); _reorderableList = new ReorderableList(serializedObject, runtimePresets, true, true, true, true);
_reorderableList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "Runtime Presets"); _reorderableList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "Runtime Presets");
@@ -63,9 +65,17 @@ namespace Coffee.UIEffects.Editors
InitializeIfNeeded(); InitializeIfNeeded();
// Settings // Settings
// Transform sensitivity.
EditorGUILayout.PropertyField(_transformSensitivity); EditorGUILayout.PropertyField(_transformSensitivity);
// Runtime Presets
_reorderableList.DoLayoutList(); _reorderableList.DoLayoutList();
// Editor
// Use HDR color pickers.
EditorGUILayout.PropertyField(_useHDRColorPicker);
// Shader
// Shader registry // Shader registry
EditorGUILayout.Space(); EditorGUILayout.Space();
EditorGUILayout.LabelField("Shader", EditorStyles.boldLabel); EditorGUILayout.LabelField("Shader", EditorStyles.boldLabel);
-6
View File
@@ -26,7 +26,6 @@ namespace Coffee.UIEffects
[SerializeField] [SerializeField]
protected float m_ColorIntensity = 1; protected float m_ColorIntensity = 1;
[ColorUsage(false, true)]
[SerializeField] [SerializeField]
protected Color m_Color = Color.white; protected Color m_Color = Color.white;
@@ -81,7 +80,6 @@ namespace Coffee.UIEffects
[SerializeField] [SerializeField]
protected ColorFilter m_TransitionColorFilter = ColorFilter.MultiplyAdditive; protected ColorFilter m_TransitionColorFilter = ColorFilter.MultiplyAdditive;
[ColorUsage(true, true)]
[SerializeField] [SerializeField]
protected Color m_TransitionColor = new Color(0f, 0.5f, 1.0f, 1.0f); protected Color m_TransitionColor = new Color(0f, 0.5f, 1.0f, 1.0f);
@@ -91,7 +89,6 @@ namespace Coffee.UIEffects
[SerializeField] [SerializeField]
protected TargetMode m_TargetMode = TargetMode.None; protected TargetMode m_TargetMode = TargetMode.None;
[ColorUsage(false, false)]
[SerializeField] [SerializeField]
protected Color m_TargetColor = Color.white; protected Color m_TargetColor = Color.white;
@@ -137,7 +134,6 @@ namespace Coffee.UIEffects
[SerializeField] [SerializeField]
protected ColorFilter m_ShadowColorFilter = ColorFilter.Replace; protected ColorFilter m_ShadowColorFilter = ColorFilter.Replace;
[ColorUsage(false, true)]
[SerializeField] [SerializeField]
protected Color m_ShadowColor = Color.white; protected Color m_ShadowColor = Color.white;
@@ -148,11 +144,9 @@ namespace Coffee.UIEffects
protected GradationMode m_GradationMode = GradationMode.None; protected GradationMode m_GradationMode = GradationMode.None;
[SerializeField] [SerializeField]
[ColorUsage(true, true)]
protected Color m_GradationColor1 = Color.white; protected Color m_GradationColor1 = Color.white;
[SerializeField] [SerializeField]
[ColorUsage(true, true)]
protected Color m_GradationColor2 = Color.white; protected Color m_GradationColor2 = Color.white;
[SerializeField] [SerializeField]
@@ -20,6 +20,10 @@ namespace Coffee.UIEffects
[SerializeField] [SerializeField]
internal List<UIEffect> m_RuntimePresets = new List<UIEffect>(); internal List<UIEffect> m_RuntimePresets = new List<UIEffect>();
[Header("Editor")]
[Tooltip("Use HDR color pickers on color fields.")]
[SerializeField] private bool m_UseHDRColorPicker = true;
[HideInInspector] [HideInInspector]
[SerializeField] [SerializeField]
internal ShaderVariantCollection m_ShaderVariantCollection; internal ShaderVariantCollection m_ShaderVariantCollection;
@@ -38,6 +42,12 @@ namespace Coffee.UIEffects
set => instance.m_TransformSensitivity = value; set => instance.m_TransformSensitivity = value;
} }
public static bool useHdrColorPicker
{
get => instance.m_UseHDRColorPicker;
set => instance.m_UseHDRColorPicker = value;
}
public static void RegisterRuntimePreset(UIEffect effect) public static void RegisterRuntimePreset(UIEffect effect)
{ {
// Already registered. // Already registered.