space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix color naming crash (#6102)

Browse Source
This commit is contained in:
pathetic meowmeow
2025-08-02 11:15:49 -04:00
committed by GitHub
parent 7d9a039252
commit bc4b4d3e6f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Locale/en-US/color-naming.ftl
View File

@@ -21,6 +21,7 @@ color-brown = brown
color-white = white
color-gray = gray
color-black = black
color-unknown = unknown color, you should not see this
color-pink-color-red = pinkish red
color-red-color-orange = reddish orange

9
Robust.Shared/ColorNaming/ColorNaming.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Numerics;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
namespace Robust.Shared.ColorNaming;
@@ -21,7 +22,8 @@ public static class ColorNaming
(float.DegreesToRadians(285f), "color-purple"),
(float.DegreesToRadians(330f), "color-pink"),
};
private static readonly (float Hue, string Loc) HueFallback = (float.DegreesToRadians(360f), "color-pink");
// one past 360 because we're now inclusive on the upper for testing if we're out of bounds
private static readonly (float Hue, string Loc) HueFallback = (float.DegreesToRadians(361f), "color-pink");
private const float BrownLightnessThreshold = 0.675f;
private static readonly LocId OrangeString = "color-orange";
@@ -63,7 +65,7 @@ public static class ColorNaming
var prevData = HueNames[i];
var nextData = i+1 < HueNames.Length ? HueNames[i+1] : HueFallback;
if (prevData.Hue >= hue || hue > nextData.Hue)
if (prevData.Hue > hue || hue >= nextData.Hue)
continue;
var loc = prevData.Loc;
@@ -85,7 +87,8 @@ public static class ColorNaming
return (localization.GetString(loc), adjustedLightness);
}
throw new ArgumentOutOfRangeException("oklch", $"colour ({oklch}) hue {hue} is outside of expected bounds");
DebugTools.Assert($"colour ({oklch}) hue {hue} is outside of expected bounds");
return (localization.GetString("color-unknown"), lightness);
}
private static string? DescribeChroma(Vector4 oklch, ILocalizationManager localization)