feat: load presets partially and append to existing instance

This commit is contained in:
mob-sakai
2025-03-11 16:44:52 +09:00
parent 3db94e00f8
commit 6542543422
5 changed files with 190 additions and 93 deletions
+76 -16
View File
@@ -12,8 +12,13 @@ namespace Coffee.UIEffects.Editors
/// </summary>
[CustomEditor(typeof(UIEffect), true)]
[CanEditMultipleObjects]
public class UIEffect2Editor : Editor
public class UIEffectEditor : Editor
{
private class UIEffectEditorSettings : ScriptableSingleton<UIEffectEditorSettings>
{
public bool m_ExpandOthers = true;
}
private static readonly PropertyInfo s_PiGradient = typeof(SerializedProperty)
.GetProperty("gradientValue", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
@@ -95,9 +100,14 @@ namespace Coffee.UIEffects.Editors
private SerializedProperty _edgeShinyAutoPlaySpeed;
private SerializedProperty _patternArea;
private bool _expandOthers = true;
private SerializedProperty _allowToModifyMeshShape;
private static bool expandOthers
{
set => UIEffectEditorSettings.instance.m_ExpandOthers = value;
get => UIEffectEditorSettings.instance.m_ExpandOthers;
}
private void OnEnable()
{
if (target == null) return;
@@ -398,8 +408,8 @@ namespace Coffee.UIEffects.Editors
}
DrawSeparator();
_expandOthers = EditorGUILayout.BeginFoldoutHeaderGroup(_expandOthers, "Others");
if (_expandOthers)
expandOthers = EditorGUILayout.BeginFoldoutHeaderGroup(expandOthers, "Others");
if (expandOthers)
{
EditorGUILayout.PropertyField(_samplingScale);
EditorGUILayout.PropertyField(_allowToModifyMeshShape);
@@ -544,26 +554,38 @@ namespace Coffee.UIEffects.Editors
private static void DrawPresetMenu(Object[] targets)
{
var r = EditorGUILayout.GetControlRect();
r.width /= 2;
r.width = (r.width - 185) / 2;
if (GUI.Button(r, EditorGUIUtility.TrTempContent("Load"), "MiniPopup"))
{
var menu = new GenericMenu();
foreach (var preset in UIEffectProjectSettings.LoadEditorPresets())
DropDownPreset(r, null, p =>
{
var path = UIEffectProjectSettings.GetPresetPath(preset);
menu.AddItem(new GUIContent(path), false, () =>
Undo.RecordObjects(targets, "Load UIEffect Preset");
Array.ForEach(targets.OfType<UIEffect>().ToArray(), t =>
{
Array.ForEach(targets.OfType<UIEffect>().ToArray(), t =>
{
t.LoadPreset(preset);
});
t.LoadPreset(p, false);
});
}
menu.DropDown(r);
});
}
r.x += r.width;
if (GUI.Button(r, EditorGUIUtility.TrTempContent("Append"), "MiniPopup"))
{
DropDownPreset(r, null, p =>
{
Undo.RecordObjects(targets, "Append UIEffect Preset");
Array.ForEach(targets.OfType<UIEffect>().ToArray(), t =>
{
t.LoadPreset(p, true);
});
});
}
r.x += r.width;
r.width = 15;
GUI.Label(r, GUIContent.none, "BreadcrumbsSeparator");
r.x += r.width;
r.width = 100;
if (GUI.Button(r, EditorGUIUtility.TrTempContent("Save As New"), "MiniButton"))
{
EditorApplication.delayCall += () =>
@@ -571,6 +593,44 @@ namespace Coffee.UIEffects.Editors
UIEffectProjectSettings.SaveAsNewPreset(targets.OfType<UIEffect>().FirstOrDefault());
};
}
r.x += r.width;
r.width = 15;
GUI.Label(r, GUIContent.none, "BreadcrumbsSeparator");
r.x += r.width;
r.width = 55;
if (GUI.Button(r, EditorGUIUtility.TrTempContent("Clear"), "MiniButton"))
{
Array.ForEach(targets.OfType<UIEffect>().ToArray(), Unsupported.SmartReset);
}
}
public static void DropDownPreset(Rect r, Predicate<(string path, bool builtin, UIEffect preset)> valid,
Action<UIEffect> callback)
{
var menu = new GenericMenu();
var separatorAdded = false;
foreach (var preset in UIEffectProjectSettings.LoadEditorPresets())
{
var (path, builtin) = UIEffectProjectSettings.GetPresetPath(preset);
if (valid != null && valid.Invoke((path, builtin, preset)) == false) continue;
if (builtin)
{
if (!separatorAdded)
{
separatorAdded = true;
menu.AddSeparator(string.Empty);
}
path = path.Substring(6).Replace(" - ", "/");
}
menu.AddItem(new GUIContent(path), false, x => callback(x as UIEffect), preset);
}
menu.DropDown(r);
}
}
}
@@ -36,19 +36,9 @@ namespace Coffee.UIEffects.Editors
};
_reorderableList.onAddDropdownCallback = (rect, list) =>
{
var menu = new GenericMenu();
foreach (var preset in UIEffectProjectSettings.LoadEditorPresets())
{
if (UIEffectProjectSettings.instance.m_RuntimePresets.Contains(preset)) continue;
var path = UIEffectProjectSettings.GetPresetPath(preset);
menu.AddItem(new GUIContent(path), false, x =>
{
UIEffectProjectSettings.RegisterRuntimePreset(x as UIEffect);
}, preset);
}
menu.DropDown(rect);
UIEffectEditor.DropDownPreset(rect,
x => !x.builtin && !UIEffectProjectSettings.instance.m_RuntimePresets.Contains(x.preset),
UIEffectProjectSettings.RegisterRuntimePreset);
};
_isInitialized = true;
+1 -1
View File
@@ -36,7 +36,7 @@ namespace Coffee.UIEffects.Editors
EditorGUI.BeginDisabledGroup(true);
CreateCachedEditor(_target.objectReferenceValue, null, ref _uiEffectEditor);
EditorGUILayout.BeginVertical(EditorStyles.helpBox);
(_uiEffectEditor as UIEffect2Editor)?.DrawProperties();
(_uiEffectEditor as UIEffectEditor)?.DrawProperties();
EditorGUILayout.EndVertical();
EditorGUI.EndDisabledGroup();
}
+106 -61
View File
@@ -1129,84 +1129,129 @@ namespace Coffee.UIEffects
/// </summary>
public void LoadPreset(string presetName)
{
LoadPreset(UIEffectProjectSettings.LoadRuntimePreset(presetName));
LoadPreset(presetName, false);
}
/// <summary>
/// Load preset settings.
/// </summary>
public void LoadPreset(string presetName, bool append)
{
LoadPreset(UIEffectProjectSettings.LoadRuntimePreset(presetName), append);
}
/// <summary>
/// Load preset settings.
/// </summary>
public void LoadPreset(UIEffect preset)
{
LoadPreset(preset, false);
}
/// <summary>
/// Load preset settings.
/// </summary>
public void LoadPreset(UIEffect preset, bool append)
{
if (!preset) return;
m_ToneFilter = preset.m_ToneFilter;
m_ToneIntensity = preset.m_ToneIntensity;
m_ToneParams = preset.m_ToneParams;
if (!append || preset.m_ToneFilter != ToneFilter.None)
{
m_ToneFilter = preset.m_ToneFilter;
m_ToneIntensity = preset.m_ToneIntensity;
m_ToneParams = preset.m_ToneParams;
}
m_ColorFilter = preset.m_ColorFilter;
m_Color = preset.m_Color;
m_ColorIntensity = preset.m_ColorIntensity;
m_ColorGlow = preset.m_ColorGlow;
if (!append || preset.m_ColorFilter != ColorFilter.None)
{
m_ColorFilter = preset.m_ColorFilter;
m_Color = preset.m_Color;
m_ColorIntensity = preset.m_ColorIntensity;
m_ColorGlow = preset.m_ColorGlow;
}
m_SamplingFilter = preset.m_SamplingFilter;
m_SamplingIntensity = preset.m_SamplingIntensity;
m_SamplingWidth = preset.m_SamplingWidth;
if (!append || preset.m_SamplingFilter != SamplingFilter.None)
{
m_SamplingFilter = preset.m_SamplingFilter;
m_SamplingIntensity = preset.m_SamplingIntensity;
m_SamplingWidth = preset.m_SamplingWidth;
}
m_TransitionFilter = preset.m_TransitionFilter;
m_TransitionRate = preset.m_TransitionRate;
m_TransitionReverse = preset.m_TransitionReverse;
m_TransitionTex = preset.m_TransitionTex;
m_TransitionTexScale = preset.m_TransitionTexScale;
m_TransitionTexOffset = preset.m_TransitionTexOffset;
m_TransitionRotation = preset.m_TransitionRotation;
m_TransitionKeepAspectRatio = preset.m_TransitionKeepAspectRatio;
m_TransitionWidth = preset.m_TransitionWidth;
m_TransitionSoftness = preset.m_TransitionSoftness;
m_TransitionRange = preset.m_TransitionRange;
m_TransitionColorFilter = preset.m_TransitionColorFilter;
m_TransitionColor = preset.m_TransitionColor;
m_TransitionColorGlow = preset.m_TransitionColorGlow;
m_TransitionPatternReverse = preset.m_TransitionPatternReverse;
m_TransitionAutoPlaySpeed = preset.m_TransitionAutoPlaySpeed;
if (!append || preset.m_TransitionFilter != TransitionFilter.None)
{
m_TransitionFilter = preset.m_TransitionFilter;
m_TransitionRate = preset.m_TransitionRate;
m_TransitionReverse = preset.m_TransitionReverse;
m_TransitionTex = preset.m_TransitionTex;
m_TransitionTexScale = preset.m_TransitionTexScale;
m_TransitionTexOffset = preset.m_TransitionTexOffset;
m_TransitionRotation = preset.m_TransitionRotation;
m_TransitionKeepAspectRatio = preset.m_TransitionKeepAspectRatio;
m_TransitionWidth = preset.m_TransitionWidth;
m_TransitionSoftness = preset.m_TransitionSoftness;
m_TransitionRange = preset.m_TransitionRange;
m_TransitionColorFilter = preset.m_TransitionColorFilter;
m_TransitionColor = preset.m_TransitionColor;
m_TransitionColorGlow = preset.m_TransitionColorGlow;
m_TransitionPatternReverse = preset.m_TransitionPatternReverse;
m_TransitionAutoPlaySpeed = preset.m_TransitionAutoPlaySpeed;
}
m_TargetMode = preset.m_TargetMode;
m_TargetColor = preset.m_TargetColor;
m_TargetRange = preset.m_TargetRange;
m_TargetSoftness = preset.m_TargetSoftness;
if (!append || preset.m_TargetMode != TargetMode.None)
{
m_TargetMode = preset.m_TargetMode;
m_TargetColor = preset.m_TargetColor;
m_TargetRange = preset.m_TargetRange;
m_TargetSoftness = preset.m_TargetSoftness;
}
m_BlendType = preset.m_BlendType;
(m_SrcBlendMode, m_DstBlendMode) = (m_BlendType, preset.m_SrcBlendMode, preset.m_DstBlendMode).Convert();
m_ShadowMode = preset.m_ShadowMode;
m_ShadowDistance = preset.m_ShadowDistance;
m_ShadowIteration = preset.m_ShadowIteration;
m_ShadowFade = preset.m_ShadowFade;
m_ShadowMirrorScale = preset.m_ShadowMirrorScale;
m_ShadowBlurIntensity = preset.m_ShadowBlurIntensity;
m_ShadowColorFilter = preset.m_ShadowColorFilter;
m_ShadowColor = preset.m_ShadowColor;
m_ShadowColorGlow = preset.m_ShadowColorGlow;
if (!append || preset.m_BlendType != BlendType.AlphaBlend)
{
m_BlendType = preset.m_BlendType;
(m_SrcBlendMode, m_DstBlendMode) =
(m_BlendType, preset.m_SrcBlendMode, preset.m_DstBlendMode).Convert();
}
m_EdgeMode = preset.m_EdgeMode;
m_EdgeShinyRate = preset.m_EdgeShinyRate;
m_EdgeWidth = preset.m_EdgeWidth;
m_EdgeColorFilter = preset.m_EdgeColorFilter;
m_EdgeColor = preset.m_EdgeColor;
m_EdgeShinyWidth = preset.m_EdgeShinyWidth;
m_EdgeShinyAutoPlaySpeed = preset.m_EdgeShinyAutoPlaySpeed;
m_PatternArea = preset.m_PatternArea;
if (!append || preset.m_ShadowMode != ShadowMode.None)
{
m_ShadowMode = preset.m_ShadowMode;
m_ShadowDistance = preset.m_ShadowDistance;
m_ShadowIteration = preset.m_ShadowIteration;
m_ShadowFade = preset.m_ShadowFade;
m_ShadowMirrorScale = preset.m_ShadowMirrorScale;
m_ShadowBlurIntensity = preset.m_ShadowBlurIntensity;
m_ShadowColorFilter = preset.m_ShadowColorFilter;
m_ShadowColor = preset.m_ShadowColor;
m_ShadowColorGlow = preset.m_ShadowColorGlow;
}
m_GradationMode = preset.m_GradationMode;
m_GradationColor1 = preset.m_GradationColor1;
m_GradationColor2 = preset.m_GradationColor2;
m_GradationColor3 = preset.m_GradationColor3;
m_GradationColor4 = preset.m_GradationColor4;
m_GradationGradient = new Gradient();
m_GradationGradient.SetKeys(preset.m_GradationGradient.colorKeys, preset.m_GradationGradient.alphaKeys);
m_GradationGradient.mode = preset.m_GradationGradient.mode;
m_GradationOffset = preset.m_GradationOffset;
m_GradationScale = preset.m_GradationScale;
m_GradationRotation = preset.m_GradationRotation;
if (!append || preset.m_EdgeMode != EdgeMode.None)
{
m_EdgeMode = preset.m_EdgeMode;
m_EdgeShinyRate = preset.m_EdgeShinyRate;
m_EdgeWidth = preset.m_EdgeWidth;
m_EdgeColorFilter = preset.m_EdgeColorFilter;
m_EdgeColor = preset.m_EdgeColor;
m_EdgeShinyWidth = preset.m_EdgeShinyWidth;
m_EdgeShinyAutoPlaySpeed = preset.m_EdgeShinyAutoPlaySpeed;
m_PatternArea = preset.m_PatternArea;
}
if (!append || preset.m_GradationMode != GradationMode.None)
{
m_GradationMode = preset.m_GradationMode;
m_GradationColor1 = preset.m_GradationColor1;
m_GradationColor2 = preset.m_GradationColor2;
m_GradationColor3 = preset.m_GradationColor3;
m_GradationColor4 = preset.m_GradationColor4;
m_GradationGradient = new Gradient();
m_GradationGradient.SetKeys(preset.m_GradationGradient.colorKeys, preset.m_GradationGradient.alphaKeys);
m_GradationGradient.mode = preset.m_GradationGradient.mode;
m_GradationOffset = preset.m_GradationOffset;
m_GradationScale = preset.m_GradationScale;
m_GradationRotation = preset.m_GradationRotation;
}
UpdateContext(context);
SetVerticesDirty();
@@ -159,6 +159,7 @@ namespace Coffee.UIEffects
var dirs = AssetDatabase.FindAssets(k_PresetDir + " t:folder")
.Select(AssetDatabase.GUIDToAssetPath)
.Where(x => Path.GetFileName(x) == k_PresetDir)
.OrderBy(x => x.StartsWith("Packages/com.coffee.ui-effect/"))
.ToArray();
return AssetDatabase.FindAssets("t:prefab", dirs)
.Select(AssetDatabase.GUIDToAssetPath)
@@ -194,11 +195,12 @@ namespace Coffee.UIEffects
return new PreloadedProjectSettingsProvider("Project/UI/UI Effect");
}
internal static string GetPresetPath(UIEffect preset)
internal static (string path, bool builtin) GetPresetPath(UIEffect preset)
{
var assetPath = AssetDatabase.GetAssetPath(preset);
var builtin = assetPath.StartsWith("Packages/com.coffee.ui-effect/");
var m = Regex.Match(assetPath, k_PresetPathPattern);
return m.Success ? m.Groups[1].Value : Path.GetFileNameWithoutExtension(assetPath);
return (m.Success ? m.Groups[1].Value : Path.GetFileNameWithoutExtension(assetPath), builtin);
}
private class Postprocessor : AssetPostprocessor