warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Streamlines gump compilation (#969)

Browse source 
Changes gump compilation to use string interpolation. .NET 6 uses code generation and compile time tricks to speed up string interpolation between 15 and 30% and reduce allocations dramatically.
This commit is contained in:
Kamron Batman 2022-03-22 23:46:10 -07:00 • committed by GitHub
parent 14b63ca48e
commit c166e113b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 853 additions and 2258 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Projects/Server/Gumps/GumpImage.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team *
* Copyright (C) 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: GumpImage.cs *
* *
@ -16,60 +16,41 @@
using System.Buffers;
using Server.Collections;
namespace Server.Gumps
namespace Server.Gumps;
public class GumpImage : GumpEntry
{
public class GumpImage : GumpEntry
public GumpImage(int x, int y, int gumpID, int hue = 0, string cls = null)
{
public static readonly byte[] LayoutName = Gump.StringToBuffer("gumppic");
public static readonly byte[] HueEquals = Gump.StringToBuffer(" hue=");
public static readonly byte[] ClassEquals = Gump.StringToBuffer(" class=");
X = x;
Y = y;
GumpID = gumpID;
Hue = hue;
Class = cls;
}
public GumpImage(int x, int y, int gumpID, int hue = 0, string cls = null)
{
X = x;
Y = y;
GumpID = gumpID;
Hue = hue;
Class = cls;
}
public int X { get; set; }
public int X { get; set; }
public int Y { get; set; }
public int Y { get; set; }
public int GumpID { get; set; }
public int GumpID { get; set; }
public int Hue { get; set; }
public int Hue { get; set; }
public string Class { get; set; }
public string Class { get; set; }
public override string Compile(OrderedHashSet<string> strings) =>
$"{{ gumppic {X} {Y} {GumpID}{(Hue == 0 ? "" : $"hue={Hue}")}{(string.IsNullOrEmpty(Class) ? "" : $"class={Class}")} }}";
public override void AppendTo(ref SpanWriter writer, OrderedHashSet<string> strings, ref int entries, ref int switches)
{
writer.Write((ushort)0x7B20); // "{ "
writer.Write(LayoutName);
writer.WriteAscii(' ');
writer.WriteAscii(X.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Y.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(GumpID.ToString());
if (Hue != 0)
public override void AppendTo(ref SpanWriter writer, OrderedHashSet<string> strings, ref int entries, ref int switches)
{
var hasHue = Hue != 0;
var hasClass = !string.IsNullOrEmpty(Class);
writer.WriteAscii(
hasHue switch
{
writer.Write(HueEquals);
writer.WriteAscii(Hue.ToString());
true when hasClass => $"{{ gumppic {X} {Y} {GumpID} hue={Hue} class={Class} }}",
true => $"{{ gumppic {X} {Y} {GumpID} hue={Hue} }}",
false when hasClass => $"{{ gumppic {X} {Y} {GumpID} class={Class} }}",
false => $"{{ gumppic {X} {Y} {GumpID} }}",
}
if (!string.IsNullOrWhiteSpace(Class))
{
writer.Write(ClassEquals);
writer.WriteAscii(Class);
}
writer.Write((ushort)0x207D); // " }"
}
);
}
}