GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UTF8 and UTF32 in favor of UTF16 strings to be consistent with C++ API

Browse Source
This commit is contained in:
Damian Korczowski
2021-06-21 21:34:21 +02:00
parent 7692aaf547
commit d9aa9d1832
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Engine/Networking/NetworkMessage.cs
View File

@@ -250,8 +250,10 @@ namespace FlaxEngine.Networking
/// </summary>
public void WriteString(string value)
{
var data = Encoding.UTF8.GetBytes(value);
WriteUInt16((ushort)data.Length);
// Note: Make sure that this is consistent with the C++ message API!
var data = Encoding.Unicode.GetBytes(value);
WriteUInt16((ushort)data.Length); // TODO: Use 1-byte length when possible
WriteBytes(data, data.Length);
}
@@ -260,37 +262,15 @@ namespace FlaxEngine.Networking
/// </summary>
public string ReadString()
{
// Note: Make sure that this is consistent with the C++ message API!
var stringLength = ReadUInt16();
var bytes = new byte[stringLength];
fixed (byte* bytesPtr = bytes)
{
ReadBytes(bytesPtr, stringLength);
}
return Encoding.UTF8.GetString(bytes);
}
/// <summary>
/// Writes data of type <see cref="string"/> into the message. UTF-32 encoded.
/// </summary>
public void WriteString32(string value)
{
var data = Encoding.UTF32.GetBytes(value);
WriteUInt16((ushort)data.Length);
WriteBytes(data, data.Length);
}
/// <summary>
/// Reads and returns data of type <see cref="string"/> from the message. UTF-32 encoded.
/// </summary>
public string ReadString32()
{
var stringLength = ReadUInt16();
var bytes = new byte[stringLength];
fixed (byte* bytesPtr = bytes)
{
ReadBytes(bytesPtr, stringLength);
}
return Encoding.UTF32.GetString(bytes);
return Encoding.Unicode.GetString(bytes);
}
/// <summary>