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

Make color equality exact (#5253)

Browse Source
This commit is contained in:
Leon Friedrich
2024-07-10 11:43:12 +12:00
committed by GitHub
parent 7fbcfeaa8f
commit 7fdd5c9d1c
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@@ -35,7 +35,7 @@ END TEMPLATE-->
### Breaking changes
*None yet*
* The `Color` struct's equality methods now check for exact equality. Use `MathHelper.CloseToPercent(Color, Color)` for the previous functionality.
### New features

7
Robust.Shared.Maths/Color.cs
View File

@@ -997,12 +997,7 @@ namespace Robust.Shared.Maths
/// <param name="other">The Color structure to compare to.</param>
/// <returns>True if both Color structures contain the same components; false otherwise.</returns>
public readonly bool Equals(Color other)
{
// TODO COLOR why is this approximate
// This method literally doesn't do what its docstring says it does.
// If people wanted approximate equality, they can check that manually.
return MathHelper.CloseToPercent(this, other);
}
=> RGBA == other.RGBA;
[PublicAPI]
public enum BlendFactor : byte

12
Robust.UnitTesting/Shared/Maths/Color_Test.cs
View File

@@ -344,7 +344,7 @@ namespace Robust.UnitTesting.Shared.Maths
var controlColor = new Color(rf, gf, bf, af);
var color = Color.FromSrgb(Color.ToSrgb(controlColor));
Assert.That(color, Is.EqualTo(controlColor));
Assert.That(MathHelper.CloseToPercent(color, controlColor));
}
[Test]
@@ -355,7 +355,7 @@ namespace Robust.UnitTesting.Shared.Maths
var controlColor = new Color(rf, gf, bf, af);
var color = Color.FromHsl(Color.ToHsl(controlColor));
Assert.That(color, Is.EqualTo(controlColor));
Assert.That(MathHelper.CloseToPercent(color, controlColor));
}
[Test]
@@ -366,7 +366,7 @@ namespace Robust.UnitTesting.Shared.Maths
var controlColor = new Color(rf, gf, bf, af);
var color = Color.FromHsv(Color.ToHsv(controlColor));
Assert.That(color, Is.EqualTo(controlColor));
Assert.That(MathHelper.CloseToPercent(color, controlColor));
}
[Test]
@@ -393,7 +393,7 @@ namespace Robust.UnitTesting.Shared.Maths
var controlColor = new Color(rf, gf, bf, af);
var color = Color.FromYcbcr(Color.ToYcbcr(controlColor));
Assert.That(color, Is.EqualTo(controlColor));
Assert.That(MathHelper.CloseToPercent(color, controlColor));
}
[Test]
@@ -404,7 +404,7 @@ namespace Robust.UnitTesting.Shared.Maths
var controlColor = new Color(rf, gf, bf, af);
var color = Color.FromHcy(Color.ToHcy(controlColor));
Assert.That(color, Is.EqualTo(controlColor));
Assert.That(MathHelper.CloseToPercent(color, controlColor));
}
static IEnumerable<float> InterpolationValues => new float[]
@@ -430,7 +430,7 @@ namespace Robust.UnitTesting.Shared.Maths
var interColor = Color.InterpolateBetween(color1, color2, interpolation);
var inverseInterColor = Color.InterpolateBetween(color2, color1, 1 - interpolation);
Assert.That(interColor, Is.EqualTo(inverseInterColor));
Assert.That(MathHelper.CloseToPercent(interColor, inverseInterColor));
}
[Test]