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

217
Projects/Server/Gumps/GumpHtmlLocalized.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: GumpHtmlLocalized.cs *
* *
@ -16,95 +16,94 @@
using System.Buffers;
using Server.Collections;
namespace Server.Gumps
namespace Server.Gumps;
public enum GumpHtmlLocalizedType
{
public enum GumpHtmlLocalizedType
Plain,
Color,
Args
}
public class GumpHtmlLocalized : GumpEntry
{
public GumpHtmlLocalized(
int x, int y, int width, int height, int number,
bool background = false, bool scrollbar = false
)
{
Plain,
Color,
Args
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Background = background;
Scrollbar = scrollbar;
Type = GumpHtmlLocalizedType.Plain;
}
public class GumpHtmlLocalized : GumpEntry
public GumpHtmlLocalized(
int x, int y, int width, int height, int number, int color,
bool background = false, bool scrollbar = false
)
{
public static readonly byte[] LayoutNamePlain = Gump.StringToBuffer("xmfhtmlgump");
public static readonly byte[] LayoutNameColor = Gump.StringToBuffer("xmfhtmlgumpcolor");
public static readonly byte[] LayoutNameArgs = Gump.StringToBuffer("xmfhtmltok");
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Color = color;
Background = background;
Scrollbar = scrollbar;
public GumpHtmlLocalized(
int x, int y, int width, int height, int number,
bool background = false, bool scrollbar = false
)
{
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Background = background;
Scrollbar = scrollbar;
Type = GumpHtmlLocalizedType.Color;
}
Type = GumpHtmlLocalizedType.Plain;
}
public GumpHtmlLocalized(
int x, int y, int width, int height, int number, string args, int color,
bool background = false, bool scrollbar = false
)
{
// Are multiple arguments unsupported? And what about non ASCII arguments?
public GumpHtmlLocalized(
int x, int y, int width, int height, int number, int color,
bool background = false, bool scrollbar = false
)
{
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Color = color;
Background = background;
Scrollbar = scrollbar;
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Args = args;
Color = color;
Background = background;
Scrollbar = scrollbar;
Type = GumpHtmlLocalizedType.Color;
}
Type = GumpHtmlLocalizedType.Args;
}
public GumpHtmlLocalized(
int x, int y, int width, int height, int number, string args, int color,
bool background = false, bool scrollbar = false
)
{
// Are multiple arguments unsupported? And what about non ASCII arguments?
public int X { get; set; }
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Args = args;
Color = color;
Background = background;
Scrollbar = scrollbar;
public int Y { get; set; }
Type = GumpHtmlLocalizedType.Args;
}
public int Width { get; set; }
public int X { get; set; }
public int Height { get; set; }
public int Y { get; set; }
public int Number { get; set; }
public int Width { get; set; }
public string Args { get; set; }
public int Height { get; set; }
public int Color { get; set; }
public int Number { get; set; }
public bool Background { get; set; }
public string Args { get; set; }
public bool Scrollbar { get; set; }
public int Color { get; set; }
public GumpHtmlLocalizedType Type { get; set; }
public bool Background { get; set; }
public bool Scrollbar { get; set; }
public GumpHtmlLocalizedType Type { get; set; }
public override string Compile(OrderedHashSet<string> strings) =>
public override void AppendTo(ref SpanWriter writer, OrderedHashSet<string> strings, ref int entries, ref int switches)
{
writer.WriteAscii(
Type switch
{
GumpHtmlLocalizedType.Plain =>
@ -113,85 +112,7 @@ namespace Server.Gumps
$"{{ xmfhtmlgumpcolor {X} {Y} {Width} {Height} {Number} {(Background ? 1 : 0)} {(Scrollbar ? 1 : 0)} {Color} }}",
_ =>
$"{{ xmfhtmltok {X} {Y} {Width} {Height} {(Background ? 1 : 0)} {(Scrollbar ? 1 : 0)} {Color} {Number} @{Args}@ }}"
};
public override void AppendTo(ref SpanWriter writer, OrderedHashSet<string> strings, ref int entries, ref int switches)
{
writer.Write((ushort)0x7B20); // "{ "
switch (Type)
{
case GumpHtmlLocalizedType.Plain:
{
writer.Write(LayoutNamePlain);
writer.WriteAscii(' ');
writer.WriteAscii(X.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Y.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Width.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Height.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Number.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Background ? '1' : '0');
writer.WriteAscii(' ');
writer.WriteAscii(Scrollbar ? '1' : '0');
break;
}
case GumpHtmlLocalizedType.Color:
{
writer.Write(LayoutNameColor);
writer.WriteAscii(' ');
writer.WriteAscii(X.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Y.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Width.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Height.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Number.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Background ? '1' : '0');
writer.WriteAscii(' ');
writer.WriteAscii(Scrollbar ? '1' : '0');
writer.WriteAscii(' ');
writer.WriteAscii(Color.ToString());
break;
}
case GumpHtmlLocalizedType.Args:
{
writer.Write(LayoutNameArgs);
writer.WriteAscii(' ');
writer.WriteAscii(X.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Y.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Width.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Height.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Background ? '1' : '0');
writer.WriteAscii(' ');
writer.WriteAscii(Scrollbar ? '1' : '0');
writer.WriteAscii(' ');
writer.WriteAscii(Color.ToString());
writer.WriteAscii(' ');
writer.WriteAscii(Number.ToString());
writer.WriteAscii(' ');
writer.WriteAscii('@');
writer.WriteAscii(Args ?? "");
writer.WriteAscii('@');
break;
}
}
writer.Write((ushort)0x207D); // " }"
}
);
}
}