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

Fix decal sorting ignoring colors (#16553)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-18 19:27:59 +10:00
committed by GitHub
parent a1715666f0
commit 37ca1fe9fe
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
View File

@@ -133,7 +133,6 @@ namespace Content.Shared.Decals
} }
} }
var lookupIndex = 0;
var lookupNodes = lookup.Keys.ToList(); var lookupNodes = lookup.Keys.ToList();
lookupNodes.Sort(); lookupNodes.Sort();
@@ -223,6 +222,16 @@ namespace Content.Shared.Decals
if (idComparison != 0) if (idComparison != 0)
return idComparison; return idComparison;
var colorComparison = string.Compare(Color?.ToHex(), other.Color?.ToHex(), StringComparison.Ordinal);
if (colorComparison != 0)
return colorComparison;
var angleComparison = Angle.Theta.CompareTo(other.Angle.Theta);
if (angleComparison != 0)
return angleComparison;
var zIndexComparison = ZIndex.CompareTo(other.ZIndex); var zIndexComparison = ZIndex.CompareTo(other.ZIndex);
if (zIndexComparison != 0) if (zIndexComparison != 0)
return zIndexComparison; return zIndexComparison;