sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-07 22:57:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use PrimitiveObjectFormatter to simplify code

Browse Source
This commit is contained in:
Dean Herbert 2021-02-03 20:19:27 +09:00
parent d3f056f188
commit 1380717ebb
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
View File

@ -15,6 +15,8 @@ namespace osu.Game.Online.API
{ {
int startOffset = offset; int startOffset = offset;
var primitiveFormatter = PrimitiveObjectFormatter.Instance;
offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count); offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
foreach (var kvp in value) foreach (var kvp in value)
@ -24,15 +26,15 @@ namespace osu.Game.Online.API
switch (kvp.Value) switch (kvp.Value)
{ {
case Bindable<double> d: case Bindable<double> d:
offset += MessagePackBinary.WriteDouble(ref bytes, offset, d.Value); offset += primitiveFormatter.Serialize(ref bytes, offset, d.Value, formatterResolver);
break; break;
case Bindable<float> f: case Bindable<float> f:
offset += MessagePackBinary.WriteSingle(ref bytes, offset, f.Value); offset += primitiveFormatter.Serialize(ref bytes, offset, f.Value, formatterResolver);
break; break;
case Bindable<bool> b: case Bindable<bool> b:
offset += MessagePackBinary.WriteBoolean(ref bytes, offset, b.Value); offset += primitiveFormatter.Serialize(ref bytes, offset, b.Value, formatterResolver);
break; break;
default: default:
@ -57,39 +59,8 @@ namespace osu.Game.Online.API
var key = MessagePackBinary.ReadString(bytes, offset, out readSize); var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
offset += readSize; offset += readSize;
switch (MessagePackBinary.GetMessagePackType(bytes, offset)) output[key] = PrimitiveObjectFormatter.Instance.Deserialize(bytes, offset, formatterResolver, out readSize);
{ offset += readSize;
case MessagePackType.Float:
{
// could be either float or double...
// see https://github.com/msgpack/msgpack/blob/master/spec.md#serialization-type-to-format-conversion
switch (MessagePackCode.ToFormatName(bytes[offset]))
{
case "float 32":
output[key] = MessagePackBinary.ReadSingle(bytes, offset, out readSize);
offset += readSize;
break;
case "float 64":
output[key] = MessagePackBinary.ReadDouble(bytes, offset, out readSize);
offset += readSize;
break;
default:
throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
}
break;
}
case MessagePackType.Boolean:
output[key] = MessagePackBinary.ReadBoolean(bytes, offset, out readSize);
offset += readSize;
break;
default:
throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
}
} }
readSize = offset - startOffset; readSize = offset - startOffset;