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

96
Projects/Server/Gumps/GumpButton.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: GumpButton.cs *
* *
@ -16,68 +16,46 @@
using System.Buffers;
using Server.Collections;
namespace Server.Gumps
namespace Server.Gumps;
public enum GumpButtonType
{
public enum GumpButtonType
Page = 0,
Reply = 1
}
public class GumpButton : GumpEntry
{
public GumpButton(
int x, int y, int normalID, int pressedID, int buttonID,
GumpButtonType type = GumpButtonType.Reply, int param = 0
)
{
Page = 0,
Reply = 1
X = x;
Y = y;
NormalID = normalID;
PressedID = pressedID;
ButtonID = buttonID;
Type = type;
Param = param;
}
public class GumpButton : GumpEntry
public int X { get; set; }
public int Y { get; set; }
public int NormalID { get; set; }
public int PressedID { get; set; }
public int ButtonID { get; set; }
public GumpButtonType Type { get; set; }
public int Param { get; set; }
public override void AppendTo(ref SpanWriter writer, OrderedHashSet<string> strings, ref int entries, ref int switches)
{
public static readonly byte[] LayoutName = Gump.StringToBuffer("button");
public GumpButton(
int x, int y, int normalID, int pressedID, int buttonID,
GumpButtonType type = GumpButtonType.Reply, int param = 0
)
{
X = x;
Y = y;
NormalID = normalID;
PressedID = pressedID;
ButtonID = buttonID;
Type = type;
Param = param;
}
public int X { get; set; }
public int Y { get; set; }
public int NormalID { get; set; }
public int PressedID { get; set; }
public int ButtonID { get; set; }
public GumpButtonType Type { get; set; }
public int Param { get; set; }
public override string Compile(OrderedHashSet<string> strings) =>
$"{{ button {X} {Y} {NormalID} {PressedID} {(int)Type} {Param} {ButtonID} }}";
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(NormalID.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(PressedID.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(((int)Type).ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Param.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(ButtonID.ToString());
writer.Write((ushort)0x207D); // " }"
}
writer.WriteAscii($"{{ button {X} {Y} {NormalID} {PressedID} {(int)Type} {Param} {ButtonID} }}");
}
}