From 752957a81946fb2ab1d70b0d8730e636a61f2870 Mon Sep 17 00:00:00 2001 From: Mora <46364955+TrixxedHeart@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:08:06 -0500 Subject: [PATCH] Switch HSV to the default colorspace for character customization (#38434) * Made HSV default for character editor * Adds/fixes comments to HSV defaulting * Added dropbox fix, potentially cursed * Revert "Added dropbox fix, potentially cursed" This reverts commit a709883366fbee813e839742125e70844672af29. --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> --- Content.Client/Humanoid/EyeColorPicker.cs | 1 + Content.Client/Humanoid/MarkingPicker.xaml.cs | 1 + Content.Client/Humanoid/SingleMarkingPicker.xaml.cs | 3 ++- Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Client/Humanoid/EyeColorPicker.cs b/Content.Client/Humanoid/EyeColorPicker.cs index 1c864b1082..8a21b5e8b3 100644 --- a/Content.Client/Humanoid/EyeColorPicker.cs +++ b/Content.Client/Humanoid/EyeColorPicker.cs @@ -27,6 +27,7 @@ public sealed class EyeColorPicker : Control AddChild(vBox); vBox.AddChild(_colorSelectors = new ColorSelectorSliders()); + _colorSelectors.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV _colorSelectors.OnColorChanged += ColorValueChanged; } diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs index 629f379f71..5a571942b8 100644 --- a/Content.Client/Humanoid/MarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs @@ -416,6 +416,7 @@ public sealed partial class MarkingPicker : Control CMarkingColors.AddChild(colorContainer); ColorSelectorSliders colorSelector = new ColorSelectorSliders(); + colorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV colorSliders.Add(colorSelector); colorContainer.AddChild(new Label { Text = $"{stateNames[i]} color:" }); diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs index 50a6036c8b..822768893e 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs @@ -15,7 +15,7 @@ public sealed partial class SingleMarkingPicker : BoxContainer [Dependency] private readonly IEntityManager _entityManager = default!; private readonly SpriteSystem _sprite; - + /// /// What happens if a marking is selected. /// It will send the 'slot' (marking index) @@ -231,6 +231,7 @@ public sealed partial class SingleMarkingPicker : BoxContainer HorizontalExpand = true }; selector.Color = marking.MarkingColors[i]; + selector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV var colorIndex = i; selector.OnColorChanged += color => diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index aa18751db0..f22d1416ca 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -240,6 +240,7 @@ namespace Content.Client.Lobby.UI }; RgbSkinColorContainer.AddChild(_rgbSkinColorSelector = new ColorSelectorSliders()); + _rgbSkinColorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV _rgbSkinColorSelector.OnColorChanged += _ => { OnSkinColorOnValueChanged(); -- 2.51.2