tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch HSV to the default colorspace for character customization (#38434)

Browse Source 
* 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>
This commit is contained in:
Mora
2025-07-02 20:08:06 -05:00
committed by GitHub
parent 4116006390
commit 752957a819
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Humanoid/EyeColorPicker.cs
View File

@@ -27,6 +27,7 @@ public sealed class EyeColorPicker : Control
AddChild(vBox); AddChild(vBox);
vBox.AddChild(_colorSelectors = new ColorSelectorSliders()); vBox.AddChild(_colorSelectors = new ColorSelectorSliders());
_colorSelectors.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
_colorSelectors.OnColorChanged += ColorValueChanged; _colorSelectors.OnColorChanged += ColorValueChanged;
} }

1
Content.Client/Humanoid/MarkingPicker.xaml.cs
View File

@@ -416,6 +416,7 @@ public sealed partial class MarkingPicker : Control
CMarkingColors.AddChild(colorContainer); CMarkingColors.AddChild(colorContainer);
ColorSelectorSliders colorSelector = new ColorSelectorSliders(); ColorSelectorSliders colorSelector = new ColorSelectorSliders();
colorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
colorSliders.Add(colorSelector); colorSliders.Add(colorSelector);
colorContainer.AddChild(new Label { Text = $"{stateNames[i]} color:" }); colorContainer.AddChild(new Label { Text = $"{stateNames[i]} color:" });

3
Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
View File

@@ -15,7 +15,7 @@ public sealed partial class SingleMarkingPicker : BoxContainer
[Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!;
private readonly SpriteSystem _sprite; private readonly SpriteSystem _sprite;
/// <summary> /// <summary>
/// What happens if a marking is selected. /// What happens if a marking is selected.
/// It will send the 'slot' (marking index) /// It will send the 'slot' (marking index)
@@ -231,6 +231,7 @@ public sealed partial class SingleMarkingPicker : BoxContainer
HorizontalExpand = true HorizontalExpand = true
}; };
selector.Color = marking.MarkingColors[i]; selector.Color = marking.MarkingColors[i];
selector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
var colorIndex = i; var colorIndex = i;
selector.OnColorChanged += color => selector.OnColorChanged += color =>

1
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -240,6 +240,7 @@ namespace Content.Client.Lobby.UI
}; };
RgbSkinColorContainer.AddChild(_rgbSkinColorSelector = new ColorSelectorSliders()); RgbSkinColorContainer.AddChild(_rgbSkinColorSelector = new ColorSelectorSliders());
_rgbSkinColorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV
_rgbSkinColorSelector.OnColorChanged += _ => _rgbSkinColorSelector.OnColorChanged += _ =>
{ {
OnSkinColorOnValueChanged(); OnSkinColorOnValueChanged();