diff --git a/Assets/dll/faust.wbx.zst b/Assets/dll/faust.wbx.zst index bf95e04b27..16f41e012a 100644 Binary files a/Assets/dll/faust.wbx.zst and b/Assets/dll/faust.wbx.zst differ diff --git a/Assets/dll/hyper.wbx.zst b/Assets/dll/hyper.wbx.zst index 4672e2183e..31448757a5 100644 Binary files a/Assets/dll/hyper.wbx.zst and b/Assets/dll/hyper.wbx.zst differ diff --git a/Assets/dll/ngp.wbx.zst b/Assets/dll/ngp.wbx.zst index d7243cbcd3..a2a711e1a0 100644 Binary files a/Assets/dll/ngp.wbx.zst and b/Assets/dll/ngp.wbx.zst differ diff --git a/Assets/dll/pcfx.wbx.zst b/Assets/dll/pcfx.wbx.zst index dfbe8549f2..9422bb522e 100644 Binary files a/Assets/dll/pcfx.wbx.zst and b/Assets/dll/pcfx.wbx.zst differ diff --git a/Assets/dll/shock.wbx.zst b/Assets/dll/shock.wbx.zst index 64842682bd..6eb87d99a6 100644 Binary files a/Assets/dll/shock.wbx.zst and b/Assets/dll/shock.wbx.zst differ diff --git a/Assets/dll/ss.wbx.zst b/Assets/dll/ss.wbx.zst index 3a47be5069..73d04f9b93 100644 Binary files a/Assets/dll/ss.wbx.zst and b/Assets/dll/ss.wbx.zst differ diff --git a/Assets/dll/turbo.wbx.zst b/Assets/dll/turbo.wbx.zst index 324f4b2518..2da491f71e 100644 Binary files a/Assets/dll/turbo.wbx.zst and b/Assets/dll/turbo.wbx.zst differ diff --git a/Assets/dll/vb.wbx.zst b/Assets/dll/vb.wbx.zst index 606150d16e..aaba7457be 100644 Binary files a/Assets/dll/vb.wbx.zst and b/Assets/dll/vb.wbx.zst differ diff --git a/Directory.Packages.props b/Directory.Packages.props index e0ae8350be..6df7ad2457 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,7 +2,7 @@ - + diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/DeviceFlags.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/DeviceFlags.cs index 2039f26a8f..8041e29223 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/DeviceFlags.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/DeviceFlags.cs @@ -9,6 +9,7 @@ namespace NymaTypes public enum DeviceFlags : byte { Keyboard = 1, + Unique = 2, }; diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/EnumValue.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/EnumValue.cs index 8467561e98..478f90cfc3 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/EnumValue.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/EnumValue.cs @@ -13,7 +13,7 @@ public struct EnumValue : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static EnumValue GetRootAsEnumValue(ByteBuffer _bb) { return GetRootAsEnumValue(_bb, new EnumValue()); } public static EnumValue GetRootAsEnumValue(ByteBuffer _bb, EnumValue obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -53,9 +53,9 @@ public struct EnumValue : IFlatbufferObject } public static void StartEnumValue(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddName(FlatBufferBuilder builder, StringOffset NameOffset) { builder.AddOffset(0, NameOffset.Value, 0); } - public static void AddDescription(FlatBufferBuilder builder, StringOffset DescriptionOffset) { builder.AddOffset(1, DescriptionOffset.Value, 0); } - public static void AddValue(FlatBufferBuilder builder, StringOffset ValueOffset) { builder.AddOffset(2, ValueOffset.Value, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(0, nameOffset.Value, 0); } + public static void AddDescription(FlatBufferBuilder builder, StringOffset descriptionOffset) { builder.AddOffset(1, descriptionOffset.Value, 0); } + public static void AddValue(FlatBufferBuilder builder, StringOffset valueOffset) { builder.AddOffset(2, valueOffset.Value, 0); } public static Offset EndEnumValue(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -97,4 +97,16 @@ public class EnumValueT } +static public class EnumValueVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*Name*/, false) + && verifier.VerifyString(tablePos, 6 /*Description*/, false) + && verifier.VerifyString(tablePos, 8 /*Value*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/InputType.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/InputType.cs index 1f16c5f3a4..ad3b0c1a63 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/InputType.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/InputType.cs @@ -7,19 +7,20 @@ namespace NymaTypes public enum InputType : byte { - Padding = 0, - Button = 1, - ButtonCanRapid = 2, - Switch = 3, - Status = 4, - Axis = 5, - PointerX = 6, - PointerY = 7, - AxisRel = 8, - ByteSpecial = 9, - ResetButton = 10, - ButtonAnalog = 11, - Rumble = 12, + Padding0 = 0, + Padding1 = 1, + Button = 2, + ButtonCanRapid = 3, + Switch = 4, + Status = 5, + Axis = 6, + PointerX = 7, + PointerY = 8, + AxisRel = 9, + ByteSpecial = 10, + ResetButton = 11, + ButtonAnalog = 12, + Rumble = 13, }; diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NAxisInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NAxisInfo.cs index 8c55f9990f..fa18aa1831 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NAxisInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NAxisInfo.cs @@ -13,7 +13,7 @@ public struct NAxisInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NAxisInfo GetRootAsNAxisInfo(ByteBuffer _bb) { return GetRootAsNAxisInfo(_bb, new NAxisInfo()); } public static NAxisInfo GetRootAsNAxisInfo(ByteBuffer _bb, NAxisInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -62,10 +62,10 @@ public struct NAxisInfo : IFlatbufferObject } public static void StartNAxisInfo(FlatBufferBuilder builder) { builder.StartTable(4); } - public static void AddSettingsNameNeg(FlatBufferBuilder builder, StringOffset SettingsNameNegOffset) { builder.AddOffset(0, SettingsNameNegOffset.Value, 0); } - public static void AddSettingsNamePos(FlatBufferBuilder builder, StringOffset SettingsNamePosOffset) { builder.AddOffset(1, SettingsNamePosOffset.Value, 0); } - public static void AddNameNeg(FlatBufferBuilder builder, StringOffset NameNegOffset) { builder.AddOffset(2, NameNegOffset.Value, 0); } - public static void AddNamePos(FlatBufferBuilder builder, StringOffset NamePosOffset) { builder.AddOffset(3, NamePosOffset.Value, 0); } + public static void AddSettingsNameNeg(FlatBufferBuilder builder, StringOffset settingsNameNegOffset) { builder.AddOffset(0, settingsNameNegOffset.Value, 0); } + public static void AddSettingsNamePos(FlatBufferBuilder builder, StringOffset settingsNamePosOffset) { builder.AddOffset(1, settingsNamePosOffset.Value, 0); } + public static void AddNameNeg(FlatBufferBuilder builder, StringOffset nameNegOffset) { builder.AddOffset(2, nameNegOffset.Value, 0); } + public static void AddNamePos(FlatBufferBuilder builder, StringOffset namePosOffset) { builder.AddOffset(3, namePosOffset.Value, 0); } public static Offset EndNAxisInfo(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -112,4 +112,17 @@ public class NAxisInfoT } +static public class NAxisInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*SettingsNameNeg*/, false) + && verifier.VerifyString(tablePos, 6 /*SettingsNamePos*/, false) + && verifier.VerifyString(tablePos, 8 /*NameNeg*/, false) + && verifier.VerifyString(tablePos, 10 /*NamePos*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NButtonInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NButtonInfo.cs index fa06829570..6dd9ca0ab0 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NButtonInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NButtonInfo.cs @@ -13,7 +13,7 @@ public struct NButtonInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NButtonInfo GetRootAsNButtonInfo(ByteBuffer _bb) { return GetRootAsNButtonInfo(_bb, new NButtonInfo()); } public static NButtonInfo GetRootAsNButtonInfo(ByteBuffer _bb, NButtonInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -35,7 +35,7 @@ public struct NButtonInfo : IFlatbufferObject } public static void StartNButtonInfo(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddExcludeName(FlatBufferBuilder builder, StringOffset ExcludeNameOffset) { builder.AddOffset(0, ExcludeNameOffset.Value, 0); } + public static void AddExcludeName(FlatBufferBuilder builder, StringOffset excludeNameOffset) { builder.AddOffset(0, excludeNameOffset.Value, 0); } public static Offset EndNButtonInfo(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -67,4 +67,14 @@ public class NButtonInfoT } +static public class NButtonInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*ExcludeName*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NDeviceInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NDeviceInfo.cs index a4298ccfb4..4bb0ea77d2 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NDeviceInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NDeviceInfo.cs @@ -13,7 +13,7 @@ public struct NDeviceInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NDeviceInfo GetRootAsNDeviceInfo(ByteBuffer _bb) { return GetRootAsNDeviceInfo(_bb, new NDeviceInfo()); } public static NDeviceInfo GetRootAsNDeviceInfo(ByteBuffer _bb, NDeviceInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -63,12 +63,12 @@ public struct NDeviceInfo : IFlatbufferObject } public static void StartNDeviceInfo(FlatBufferBuilder builder) { builder.StartTable(6); } - public static void AddShortName(FlatBufferBuilder builder, StringOffset ShortNameOffset) { builder.AddOffset(0, ShortNameOffset.Value, 0); } - public static void AddFullName(FlatBufferBuilder builder, StringOffset FullNameOffset) { builder.AddOffset(1, FullNameOffset.Value, 0); } - public static void AddDescription(FlatBufferBuilder builder, StringOffset DescriptionOffset) { builder.AddOffset(2, DescriptionOffset.Value, 0); } - public static void AddFlags(FlatBufferBuilder builder, NymaTypes.DeviceFlags Flags) { builder.AddByte(3, (byte)Flags, 0); } - public static void AddByteLength(FlatBufferBuilder builder, uint ByteLength) { builder.AddUint(4, ByteLength, 0); } - public static void AddInputs(FlatBufferBuilder builder, VectorOffset InputsOffset) { builder.AddOffset(5, InputsOffset.Value, 0); } + public static void AddShortName(FlatBufferBuilder builder, StringOffset shortNameOffset) { builder.AddOffset(0, shortNameOffset.Value, 0); } + public static void AddFullName(FlatBufferBuilder builder, StringOffset fullNameOffset) { builder.AddOffset(1, fullNameOffset.Value, 0); } + public static void AddDescription(FlatBufferBuilder builder, StringOffset descriptionOffset) { builder.AddOffset(2, descriptionOffset.Value, 0); } + public static void AddFlags(FlatBufferBuilder builder, NymaTypes.DeviceFlags flags) { builder.AddByte(3, (byte)flags, 0); } + public static void AddByteLength(FlatBufferBuilder builder, uint byteLength) { builder.AddUint(4, byteLength, 0); } + public static void AddInputs(FlatBufferBuilder builder, VectorOffset inputsOffset) { builder.AddOffset(5, inputsOffset.Value, 0); } public static VectorOffset CreateInputsVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateInputsVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateInputsVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -134,4 +134,19 @@ public class NDeviceInfoT } +static public class NDeviceInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*ShortName*/, false) + && verifier.VerifyString(tablePos, 6 /*FullName*/, false) + && verifier.VerifyString(tablePos, 8 /*Description*/, false) + && verifier.VerifyField(tablePos, 10 /*Flags*/, 1 /*NymaTypes.DeviceFlags*/, 1, false) + && verifier.VerifyField(tablePos, 12 /*ByteLength*/, 4 /*uint*/, 4, false) + && verifier.VerifyVectorOfTables(tablePos, 14 /*Inputs*/, NymaTypes.NInputInfoVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputExtra.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputExtra.cs index 15a5b98f97..8d22b9cdf0 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputExtra.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputExtra.cs @@ -45,4 +45,32 @@ public class NInputExtraUnion { } + +static public class NInputExtraVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, byte typeId, uint tablePos) + { + bool result = true; + switch((NInputExtra)typeId) + { + case NInputExtra.Button: + result = NymaTypes.NButtonInfoVerify.Verify(verifier, tablePos); + break; + case NInputExtra.Axis: + result = NymaTypes.NAxisInfoVerify.Verify(verifier, tablePos); + break; + case NInputExtra.Switch: + result = NymaTypes.NSwitchInfoVerify.Verify(verifier, tablePos); + break; + case NInputExtra.Status: + result = NymaTypes.NStatusInfoVerify.Verify(verifier, tablePos); + break; + default: result = true; + break; + } + return result; + } +} + + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputInfo.cs index 4e815b2d20..46823b51a5 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NInputInfo.cs @@ -13,7 +13,7 @@ public struct NInputInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NInputInfo GetRootAsNInputInfo(ByteBuffer _bb) { return GetRootAsNInputInfo(_bb, new NInputInfo()); } public static NInputInfo GetRootAsNInputInfo(ByteBuffer _bb, NInputInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -35,7 +35,7 @@ public struct NInputInfo : IFlatbufferObject public byte[] GetNameArray() { return __p.__vector_as_array(6); } public short ConfigOrder { get { int o = __p.__offset(8); return o != 0 ? __p.bb.GetShort(o + __p.bb_pos) : (short)0; } } public ushort BitOffset { get { int o = __p.__offset(10); return o != 0 ? __p.bb.GetUshort(o + __p.bb_pos) : (ushort)0; } } - public NymaTypes.InputType Type { get { int o = __p.__offset(12); return o != 0 ? (NymaTypes.InputType)__p.bb.Get(o + __p.bb_pos) : NymaTypes.InputType.Padding; } } + public NymaTypes.InputType Type { get { int o = __p.__offset(12); return o != 0 ? (NymaTypes.InputType)__p.bb.Get(o + __p.bb_pos) : NymaTypes.InputType.Padding0; } } public NymaTypes.AxisFlags Flags { get { int o = __p.__offset(14); return o != 0 ? (NymaTypes.AxisFlags)__p.bb.Get(o + __p.bb_pos) : 0; } } public byte BitSize { get { int o = __p.__offset(16); return o != 0 ? __p.bb.Get(o + __p.bb_pos) : (byte)0; } } public NymaTypes.NInputExtra ExtraType { get { int o = __p.__offset(18); return o != 0 ? (NymaTypes.NInputExtra)__p.bb.Get(o + __p.bb_pos) : NymaTypes.NInputExtra.NONE; } } @@ -50,7 +50,7 @@ public struct NInputInfo : IFlatbufferObject StringOffset NameOffset = default(StringOffset), short ConfigOrder = 0, ushort BitOffset = 0, - NymaTypes.InputType Type = NymaTypes.InputType.Padding, + NymaTypes.InputType Type = NymaTypes.InputType.Padding0, NymaTypes.AxisFlags Flags = 0, byte BitSize = 0, NymaTypes.NInputExtra Extra_type = NymaTypes.NInputExtra.NONE, @@ -69,15 +69,15 @@ public struct NInputInfo : IFlatbufferObject } public static void StartNInputInfo(FlatBufferBuilder builder) { builder.StartTable(9); } - public static void AddSettingName(FlatBufferBuilder builder, StringOffset SettingNameOffset) { builder.AddOffset(0, SettingNameOffset.Value, 0); } - public static void AddName(FlatBufferBuilder builder, StringOffset NameOffset) { builder.AddOffset(1, NameOffset.Value, 0); } - public static void AddConfigOrder(FlatBufferBuilder builder, short ConfigOrder) { builder.AddShort(2, ConfigOrder, 0); } - public static void AddBitOffset(FlatBufferBuilder builder, ushort BitOffset) { builder.AddUshort(3, BitOffset, 0); } - public static void AddType(FlatBufferBuilder builder, NymaTypes.InputType Type) { builder.AddByte(4, (byte)Type, 0); } - public static void AddFlags(FlatBufferBuilder builder, NymaTypes.AxisFlags Flags) { builder.AddByte(5, (byte)Flags, 0); } - public static void AddBitSize(FlatBufferBuilder builder, byte BitSize) { builder.AddByte(6, BitSize, 0); } - public static void AddExtraType(FlatBufferBuilder builder, NymaTypes.NInputExtra ExtraType) { builder.AddByte(7, (byte)ExtraType, 0); } - public static void AddExtra(FlatBufferBuilder builder, int ExtraOffset) { builder.AddOffset(8, ExtraOffset, 0); } + public static void AddSettingName(FlatBufferBuilder builder, StringOffset settingNameOffset) { builder.AddOffset(0, settingNameOffset.Value, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } + public static void AddConfigOrder(FlatBufferBuilder builder, short configOrder) { builder.AddShort(2, configOrder, 0); } + public static void AddBitOffset(FlatBufferBuilder builder, ushort bitOffset) { builder.AddUshort(3, bitOffset, 0); } + public static void AddType(FlatBufferBuilder builder, NymaTypes.InputType type) { builder.AddByte(4, (byte)type, 0); } + public static void AddFlags(FlatBufferBuilder builder, NymaTypes.AxisFlags flags) { builder.AddByte(5, (byte)flags, 0); } + public static void AddBitSize(FlatBufferBuilder builder, byte bitSize) { builder.AddByte(6, bitSize, 0); } + public static void AddExtraType(FlatBufferBuilder builder, NymaTypes.NInputExtra extraType) { builder.AddByte(7, (byte)extraType, 0); } + public static void AddExtra(FlatBufferBuilder builder, int extraOffset) { builder.AddOffset(8, extraOffset, 0); } public static Offset EndNInputInfo(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -149,7 +149,7 @@ public class NInputInfoT this.Name = null; this.ConfigOrder = 0; this.BitOffset = 0; - this.Type = NymaTypes.InputType.Padding; + this.Type = NymaTypes.InputType.Padding0; this.Flags = 0; this.BitSize = 0; this.Extra = null; @@ -157,4 +157,22 @@ public class NInputInfoT } +static public class NInputInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*SettingName*/, false) + && verifier.VerifyString(tablePos, 6 /*Name*/, false) + && verifier.VerifyField(tablePos, 8 /*ConfigOrder*/, 2 /*short*/, 2, false) + && verifier.VerifyField(tablePos, 10 /*BitOffset*/, 2 /*ushort*/, 2, false) + && verifier.VerifyField(tablePos, 12 /*Type*/, 1 /*NymaTypes.InputType*/, 1, false) + && verifier.VerifyField(tablePos, 14 /*Flags*/, 1 /*NymaTypes.AxisFlags*/, 1, false) + && verifier.VerifyField(tablePos, 16 /*BitSize*/, 1 /*byte*/, 1, false) + && verifier.VerifyField(tablePos, 18 /*ExtraType*/, 1 /*NymaTypes.NInputExtra*/, 1, false) + && verifier.VerifyUnion(tablePos, 18, 20 /*Extra*/, NymaTypes.NInputExtraVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPortInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPortInfo.cs index dcd1165b0d..7475f9c4c7 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPortInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPortInfo.cs @@ -13,7 +13,7 @@ public struct NPortInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NPortInfo GetRootAsNPortInfo(ByteBuffer _bb) { return GetRootAsNPortInfo(_bb, new NPortInfo()); } public static NPortInfo GetRootAsNPortInfo(ByteBuffer _bb, NPortInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -40,27 +40,31 @@ public struct NPortInfo : IFlatbufferObject public ArraySegment? GetDefaultDeviceShortNameBytes() { return __p.__vector_as_arraysegment(8); } #endif public byte[] GetDefaultDeviceShortNameArray() { return __p.__vector_as_array(8); } - public NymaTypes.NDeviceInfo? Devices(int j) { int o = __p.__offset(10); return o != 0 ? (NymaTypes.NDeviceInfo?)(new NymaTypes.NDeviceInfo()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } - public int DevicesLength { get { int o = __p.__offset(10); return o != 0 ? __p.__vector_len(o) : 0; } } + public NymaTypes.PortFlags Flags { get { int o = __p.__offset(10); return o != 0 ? (NymaTypes.PortFlags)__p.bb.Get(o + __p.bb_pos) : 0; } } + public NymaTypes.NDeviceInfo? Devices(int j) { int o = __p.__offset(12); return o != 0 ? (NymaTypes.NDeviceInfo?)(new NymaTypes.NDeviceInfo()).__assign(__p.__indirect(__p.__vector(o) + j * 4), __p.bb) : null; } + public int DevicesLength { get { int o = __p.__offset(12); return o != 0 ? __p.__vector_len(o) : 0; } } public static Offset CreateNPortInfo(FlatBufferBuilder builder, StringOffset ShortNameOffset = default(StringOffset), StringOffset FullNameOffset = default(StringOffset), StringOffset DefaultDeviceShortNameOffset = default(StringOffset), + NymaTypes.PortFlags Flags = 0, VectorOffset DevicesOffset = default(VectorOffset)) { - builder.StartTable(4); + builder.StartTable(5); NPortInfo.AddDevices(builder, DevicesOffset); NPortInfo.AddDefaultDeviceShortName(builder, DefaultDeviceShortNameOffset); NPortInfo.AddFullName(builder, FullNameOffset); NPortInfo.AddShortName(builder, ShortNameOffset); + NPortInfo.AddFlags(builder, Flags); return NPortInfo.EndNPortInfo(builder); } - public static void StartNPortInfo(FlatBufferBuilder builder) { builder.StartTable(4); } - public static void AddShortName(FlatBufferBuilder builder, StringOffset ShortNameOffset) { builder.AddOffset(0, ShortNameOffset.Value, 0); } - public static void AddFullName(FlatBufferBuilder builder, StringOffset FullNameOffset) { builder.AddOffset(1, FullNameOffset.Value, 0); } - public static void AddDefaultDeviceShortName(FlatBufferBuilder builder, StringOffset DefaultDeviceShortNameOffset) { builder.AddOffset(2, DefaultDeviceShortNameOffset.Value, 0); } - public static void AddDevices(FlatBufferBuilder builder, VectorOffset DevicesOffset) { builder.AddOffset(3, DevicesOffset.Value, 0); } + public static void StartNPortInfo(FlatBufferBuilder builder) { builder.StartTable(5); } + public static void AddShortName(FlatBufferBuilder builder, StringOffset shortNameOffset) { builder.AddOffset(0, shortNameOffset.Value, 0); } + public static void AddFullName(FlatBufferBuilder builder, StringOffset fullNameOffset) { builder.AddOffset(1, fullNameOffset.Value, 0); } + public static void AddDefaultDeviceShortName(FlatBufferBuilder builder, StringOffset defaultDeviceShortNameOffset) { builder.AddOffset(2, defaultDeviceShortNameOffset.Value, 0); } + public static void AddFlags(FlatBufferBuilder builder, NymaTypes.PortFlags flags) { builder.AddByte(3, (byte)flags, 0); } + public static void AddDevices(FlatBufferBuilder builder, VectorOffset devicesOffset) { builder.AddOffset(4, devicesOffset.Value, 0); } public static VectorOffset CreateDevicesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateDevicesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateDevicesVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -79,6 +83,7 @@ public struct NPortInfo : IFlatbufferObject _o.ShortName = this.ShortName; _o.FullName = this.FullName; _o.DefaultDeviceShortName = this.DefaultDeviceShortName; + _o.Flags = this.Flags; _o.Devices = new List(); for (var _j = 0; _j < this.DevicesLength; ++_j) {_o.Devices.Add(this.Devices(_j).HasValue ? this.Devices(_j).Value.UnPack() : null);} } @@ -98,6 +103,7 @@ public struct NPortInfo : IFlatbufferObject _ShortName, _FullName, _DefaultDeviceShortName, + _o.Flags, _Devices); } } @@ -107,15 +113,31 @@ public class NPortInfoT public string ShortName { get; set; } public string FullName { get; set; } public string DefaultDeviceShortName { get; set; } + public NymaTypes.PortFlags Flags { get; set; } public List Devices { get; set; } public NPortInfoT() { this.ShortName = null; this.FullName = null; this.DefaultDeviceShortName = null; + this.Flags = 0; this.Devices = null; } } +static public class NPortInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*ShortName*/, false) + && verifier.VerifyString(tablePos, 6 /*FullName*/, false) + && verifier.VerifyString(tablePos, 8 /*DefaultDeviceShortName*/, false) + && verifier.VerifyField(tablePos, 10 /*Flags*/, 1 /*NymaTypes.PortFlags*/, 1, false) + && verifier.VerifyVectorOfTables(tablePos, 12 /*Devices*/, NymaTypes.NDeviceInfoVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPorts.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPorts.cs index 68d073db60..9a79c5fd03 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPorts.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NPorts.cs @@ -13,7 +13,7 @@ public struct NPorts : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NPorts GetRootAsNPorts(ByteBuffer _bb) { return GetRootAsNPorts(_bb, new NPorts()); } public static NPorts GetRootAsNPorts(ByteBuffer _bb, NPorts obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -30,7 +30,7 @@ public struct NPorts : IFlatbufferObject } public static void StartNPorts(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddValues(FlatBufferBuilder builder, VectorOffset ValuesOffset) { builder.AddOffset(0, ValuesOffset.Value, 0); } + public static void AddValues(FlatBufferBuilder builder, VectorOffset valuesOffset) { builder.AddOffset(0, valuesOffset.Value, 0); } public static VectorOffset CreateValuesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateValuesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateValuesVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -73,4 +73,14 @@ public class NPortsT } +static public class NPortsVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyVectorOfTables(tablePos, 4 /*Values*/, NymaTypes.NPortInfoVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusInfo.cs index c677cc9cde..542222e5d4 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusInfo.cs @@ -13,7 +13,7 @@ public struct NStatusInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NStatusInfo GetRootAsNStatusInfo(ByteBuffer _bb) { return GetRootAsNStatusInfo(_bb, new NStatusInfo()); } public static NStatusInfo GetRootAsNStatusInfo(ByteBuffer _bb, NStatusInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -30,7 +30,7 @@ public struct NStatusInfo : IFlatbufferObject } public static void StartNStatusInfo(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddStates(FlatBufferBuilder builder, VectorOffset StatesOffset) { builder.AddOffset(0, StatesOffset.Value, 0); } + public static void AddStates(FlatBufferBuilder builder, VectorOffset statesOffset) { builder.AddOffset(0, statesOffset.Value, 0); } public static VectorOffset CreateStatesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateStatesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateStatesVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -73,4 +73,14 @@ public class NStatusInfoT } +static public class NStatusInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyVectorOfTables(tablePos, 4 /*States*/, NymaTypes.NStatusStateVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusState.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusState.cs index 999145e388..e890c8b5ab 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusState.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NStatusState.cs @@ -13,7 +13,7 @@ public struct NStatusState : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NStatusState GetRootAsNStatusState(ByteBuffer _bb) { return GetRootAsNStatusState(_bb, new NStatusState()); } public static NStatusState GetRootAsNStatusState(ByteBuffer _bb, NStatusState obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -47,9 +47,9 @@ public struct NStatusState : IFlatbufferObject } public static void StartNStatusState(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddShortName(FlatBufferBuilder builder, StringOffset ShortNameOffset) { builder.AddOffset(0, ShortNameOffset.Value, 0); } - public static void AddName(FlatBufferBuilder builder, StringOffset NameOffset) { builder.AddOffset(1, NameOffset.Value, 0); } - public static void AddColor(FlatBufferBuilder builder, int Color) { builder.AddInt(2, Color, 0); } + public static void AddShortName(FlatBufferBuilder builder, StringOffset shortNameOffset) { builder.AddOffset(0, shortNameOffset.Value, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } + public static void AddColor(FlatBufferBuilder builder, int color) { builder.AddInt(2, color, 0); } public static Offset EndNStatusState(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -90,4 +90,16 @@ public class NStatusStateT } +static public class NStatusStateVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*ShortName*/, false) + && verifier.VerifyString(tablePos, 6 /*Name*/, false) + && verifier.VerifyField(tablePos, 8 /*Color*/, 4 /*int*/, 4, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchInfo.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchInfo.cs index 86fa379ce0..511bed16e5 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchInfo.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchInfo.cs @@ -13,7 +13,7 @@ public struct NSwitchInfo : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NSwitchInfo GetRootAsNSwitchInfo(ByteBuffer _bb) { return GetRootAsNSwitchInfo(_bb, new NSwitchInfo()); } public static NSwitchInfo GetRootAsNSwitchInfo(ByteBuffer _bb, NSwitchInfo obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -33,8 +33,8 @@ public struct NSwitchInfo : IFlatbufferObject } public static void StartNSwitchInfo(FlatBufferBuilder builder) { builder.StartTable(2); } - public static void AddDefaultPosition(FlatBufferBuilder builder, uint DefaultPosition) { builder.AddUint(0, DefaultPosition, 0); } - public static void AddPositions(FlatBufferBuilder builder, VectorOffset PositionsOffset) { builder.AddOffset(1, PositionsOffset.Value, 0); } + public static void AddDefaultPosition(FlatBufferBuilder builder, uint defaultPosition) { builder.AddUint(0, defaultPosition, 0); } + public static void AddPositions(FlatBufferBuilder builder, VectorOffset positionsOffset) { builder.AddOffset(1, positionsOffset.Value, 0); } public static VectorOffset CreatePositionsVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreatePositionsVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreatePositionsVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -81,4 +81,15 @@ public class NSwitchInfoT } +static public class NSwitchInfoVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyField(tablePos, 4 /*DefaultPosition*/, 4 /*uint*/, 4, false) + && verifier.VerifyVectorOfTables(tablePos, 6 /*Positions*/, NymaTypes.NSwitchPositionVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchPosition.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchPosition.cs index 8f90e98246..bfa6b220bc 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchPosition.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/NSwitchPosition.cs @@ -13,7 +13,7 @@ public struct NSwitchPosition : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static NSwitchPosition GetRootAsNSwitchPosition(ByteBuffer _bb) { return GetRootAsNSwitchPosition(_bb, new NSwitchPosition()); } public static NSwitchPosition GetRootAsNSwitchPosition(ByteBuffer _bb, NSwitchPosition obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -53,9 +53,9 @@ public struct NSwitchPosition : IFlatbufferObject } public static void StartNSwitchPosition(FlatBufferBuilder builder) { builder.StartTable(3); } - public static void AddSettingName(FlatBufferBuilder builder, StringOffset SettingNameOffset) { builder.AddOffset(0, SettingNameOffset.Value, 0); } - public static void AddName(FlatBufferBuilder builder, StringOffset NameOffset) { builder.AddOffset(1, NameOffset.Value, 0); } - public static void AddDescription(FlatBufferBuilder builder, StringOffset DescriptionOffset) { builder.AddOffset(2, DescriptionOffset.Value, 0); } + public static void AddSettingName(FlatBufferBuilder builder, StringOffset settingNameOffset) { builder.AddOffset(0, settingNameOffset.Value, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(1, nameOffset.Value, 0); } + public static void AddDescription(FlatBufferBuilder builder, StringOffset descriptionOffset) { builder.AddOffset(2, descriptionOffset.Value, 0); } public static Offset EndNSwitchPosition(FlatBufferBuilder builder) { int o = builder.EndTable(); return new Offset(o); @@ -97,4 +97,16 @@ public class NSwitchPositionT } +static public class NSwitchPositionVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*SettingName*/, false) + && verifier.VerifyString(tablePos, 6 /*Name*/, false) + && verifier.VerifyString(tablePos, 8 /*Description*/, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/PortFlags.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/PortFlags.cs new file mode 100644 index 0000000000..8b54d6b216 --- /dev/null +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/PortFlags.cs @@ -0,0 +1,15 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace NymaTypes +{ + +[System.FlagsAttribute] +public enum PortFlags : byte +{ + NoUserSelect = 1, +}; + + +} diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Setting.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Setting.cs index a3abbcab2e..97c24e3690 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Setting.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Setting.cs @@ -13,7 +13,7 @@ public struct Setting : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static Setting GetRootAsSetting(ByteBuffer _bb) { return GetRootAsSetting(_bb, new Setting()); } public static Setting GetRootAsSetting(ByteBuffer _bb, Setting obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -90,15 +90,15 @@ public struct Setting : IFlatbufferObject } public static void StartSetting(FlatBufferBuilder builder) { builder.StartTable(9); } - public static void AddName(FlatBufferBuilder builder, StringOffset NameOffset) { builder.AddOffset(0, NameOffset.Value, 0); } - public static void AddDescription(FlatBufferBuilder builder, StringOffset DescriptionOffset) { builder.AddOffset(1, DescriptionOffset.Value, 0); } - public static void AddSettingsKey(FlatBufferBuilder builder, StringOffset SettingsKeyOffset) { builder.AddOffset(2, SettingsKeyOffset.Value, 0); } - public static void AddDefaultValue(FlatBufferBuilder builder, StringOffset DefaultValueOffset) { builder.AddOffset(3, DefaultValueOffset.Value, 0); } - public static void AddMin(FlatBufferBuilder builder, StringOffset MinOffset) { builder.AddOffset(4, MinOffset.Value, 0); } - public static void AddMax(FlatBufferBuilder builder, StringOffset MaxOffset) { builder.AddOffset(5, MaxOffset.Value, 0); } - public static void AddFlags(FlatBufferBuilder builder, NymaTypes.SettingsFlags Flags) { builder.AddUint(6, (uint)Flags, 0); } - public static void AddType(FlatBufferBuilder builder, NymaTypes.SettingType Type) { builder.AddInt(7, (int)Type, 0); } - public static void AddSettingEnums(FlatBufferBuilder builder, VectorOffset SettingEnumsOffset) { builder.AddOffset(8, SettingEnumsOffset.Value, 0); } + public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(0, nameOffset.Value, 0); } + public static void AddDescription(FlatBufferBuilder builder, StringOffset descriptionOffset) { builder.AddOffset(1, descriptionOffset.Value, 0); } + public static void AddSettingsKey(FlatBufferBuilder builder, StringOffset settingsKeyOffset) { builder.AddOffset(2, settingsKeyOffset.Value, 0); } + public static void AddDefaultValue(FlatBufferBuilder builder, StringOffset defaultValueOffset) { builder.AddOffset(3, defaultValueOffset.Value, 0); } + public static void AddMin(FlatBufferBuilder builder, StringOffset minOffset) { builder.AddOffset(4, minOffset.Value, 0); } + public static void AddMax(FlatBufferBuilder builder, StringOffset maxOffset) { builder.AddOffset(5, maxOffset.Value, 0); } + public static void AddFlags(FlatBufferBuilder builder, NymaTypes.SettingsFlags flags) { builder.AddUint(6, (uint)flags, 0); } + public static void AddType(FlatBufferBuilder builder, NymaTypes.SettingType type) { builder.AddInt(7, (int)type, 0); } + public static void AddSettingEnums(FlatBufferBuilder builder, VectorOffset settingEnumsOffset) { builder.AddOffset(8, settingEnumsOffset.Value, 0); } public static VectorOffset CreateSettingEnumsVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateSettingEnumsVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateSettingEnumsVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -179,4 +179,22 @@ public class SettingT } +static public class SettingVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyString(tablePos, 4 /*Name*/, false) + && verifier.VerifyString(tablePos, 6 /*Description*/, false) + && verifier.VerifyString(tablePos, 8 /*SettingsKey*/, false) + && verifier.VerifyString(tablePos, 10 /*DefaultValue*/, false) + && verifier.VerifyString(tablePos, 12 /*Min*/, false) + && verifier.VerifyString(tablePos, 14 /*Max*/, false) + && verifier.VerifyField(tablePos, 16 /*Flags*/, 4 /*NymaTypes.SettingsFlags*/, 4, false) + && verifier.VerifyField(tablePos, 18 /*Type*/, 4 /*NymaTypes.SettingType*/, 4, false) + && verifier.VerifyVectorOfTables(tablePos, 20 /*SettingEnums*/, NymaTypes.EnumValueVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Settings.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Settings.cs index faf3032ba4..9ae1f30de5 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Settings.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/Settings.cs @@ -13,7 +13,7 @@ public struct Settings : IFlatbufferObject { private Table __p; public ByteBuffer ByteBuffer { get { return __p.bb; } } - public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_9_24(); } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); } public static Settings GetRootAsSettings(ByteBuffer _bb) { return GetRootAsSettings(_bb, new Settings()); } public static Settings GetRootAsSettings(ByteBuffer _bb, Settings obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } @@ -30,7 +30,7 @@ public struct Settings : IFlatbufferObject } public static void StartSettings(FlatBufferBuilder builder) { builder.StartTable(1); } - public static void AddValues(FlatBufferBuilder builder, VectorOffset ValuesOffset) { builder.AddOffset(0, ValuesOffset.Value, 0); } + public static void AddValues(FlatBufferBuilder builder, VectorOffset valuesOffset) { builder.AddOffset(0, valuesOffset.Value, 0); } public static VectorOffset CreateValuesVector(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); } public static VectorOffset CreateValuesVectorBlock(FlatBufferBuilder builder, Offset[] data) { builder.StartVector(4, data.Length, 4); builder.Add(data); return builder.EndVector(); } public static VectorOffset CreateValuesVectorBlock(FlatBufferBuilder builder, ArraySegment> data) { builder.StartVector(4, data.Count, 4); builder.Add(data); return builder.EndVector(); } @@ -73,4 +73,14 @@ public class SettingsT } +static public class SettingsVerify +{ + static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos) + { + return verifier.VerifyTableStart(tablePos) + && verifier.VerifyVectorOfTables(tablePos, 4 /*Values*/, NymaTypes.SettingVerify.Verify, false) + && verifier.VerifyTableEnd(tablePos); + } +} + } diff --git a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/SettingsFlags.cs b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/SettingsFlags.cs index 9dc57a7528..8159ff208f 100644 --- a/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/SettingsFlags.cs +++ b/ExternalProjects/FlatBuffers.GenOutput/NymaTypes/SettingsFlags.cs @@ -9,25 +9,25 @@ namespace NymaTypes public enum SettingsFlags : uint { /// TODO(cats) - Input = 256, - Sound = 512, - Video = 1024, + Input = 1, + Sound = 2, + Video = 4, /// User-configurable physical->virtual button/axes and hotkey mappings(driver-side code category mainly). - InputMapping = 2048, - Path = 4096, + InputMapping = 8, + Path = 16, /// If the setting affects emulation from the point of view of the emulated program - EmuState = 131072, + EmuState = 256, /// If it's safe for an untrusted source to modify it, probably only used in conjunction with MDFNST_EX_EMU_STATE and network play - UntrustedSafe = 262144, + UntrustedSafe = 512, /// Suppress documentation generation for this setting. - SuppressDoc = 524288, + SuppressDoc = 1024, /// Auto-generated common template setting(like nes.xscale, pce.xscale, vb.xscale, nes.enable, pce.enable, vb.enable) - CommonTemplate = 1048576, + CommonTemplate = 2048, /// Don't save setting in settings file. - NonPersistent = 2097152, + NonPersistent = 4096, /// TODO(in progress) - RequiresReload = 16777216, - RequiresRestart = 33554432, + RequiresReload = 16384, + RequiresRestart = 32768, }; diff --git a/References/FlatBuffers.GenOutput.deps.json b/References/FlatBuffers.GenOutput.deps.json new file mode 100644 index 0000000000..d7769513a7 --- /dev/null +++ b/References/FlatBuffers.GenOutput.deps.json @@ -0,0 +1,132 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.0/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.0": {}, + ".NETStandard,Version=v2.0/": { + "FlatBuffers.GenOutput/1.0.0": { + "dependencies": { + "DotNetAnalyzers.DocumentationAnalyzers": "1.0.0-beta.59", + "Google.FlatBuffers": "23.5.26", + "Menees.Analyzers": "3.0.10", + "Meziantou.Analyzer": "2.0.33", + "NETStandard.Library": "2.0.3", + "Nullable": "1.3.1", + "StyleCop.Analyzers": "1.2.0-beta.435" + }, + "runtime": { + "FlatBuffers.GenOutput.dll": {} + } + }, + "DotNetAnalyzers.DocumentationAnalyzers/1.0.0-beta.59": { + "dependencies": { + "DotNetAnalyzers.DocumentationAnalyzers.Unstable": "1.0.0.59" + } + }, + "DotNetAnalyzers.DocumentationAnalyzers.Unstable/1.0.0.59": {}, + "Google.FlatBuffers/23.5.26": { + "runtime": { + "lib/netstandard2.0/Google.FlatBuffers.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "Menees.Analyzers/3.0.10": {}, + "Meziantou.Analyzer/2.0.33": {}, + "Microsoft.NETCore.Platforms/1.1.0": {}, + "NETStandard.Library/2.0.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Nullable/1.3.1": {}, + "StyleCop.Analyzers/1.2.0-beta.435": { + "dependencies": { + "StyleCop.Analyzers.Unstable": "1.2.0.435" + } + }, + "StyleCop.Analyzers.Unstable/1.2.0.435": {} + } + }, + "libraries": { + "FlatBuffers.GenOutput/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "DotNetAnalyzers.DocumentationAnalyzers/1.0.0-beta.59": { + "type": "package", + "serviceable": true, + "sha512": "sha512-+cjn5bzar9cqDABF2SUsMEof8yoMXSNdHYdpCVNnj/M/cRACbKYHzYpgilSEvFlHGuolzJJ2WN++/EXwBzSsYQ==", + "path": "dotnetanalyzers.documentationanalyzers/1.0.0-beta.59", + "hashPath": "dotnetanalyzers.documentationanalyzers.1.0.0-beta.59.nupkg.sha512" + }, + "DotNetAnalyzers.DocumentationAnalyzers.Unstable/1.0.0.59": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ekGYoPsAGTJs5cFbRdzfHKX2n2DzEATZyowGw3QJnozelzmhQ5tGCJhyolN5NWDq1p/GkBPKgRcQ5QGTKxaGrA==", + "path": "dotnetanalyzers.documentationanalyzers.unstable/1.0.0.59", + "hashPath": "dotnetanalyzers.documentationanalyzers.unstable.1.0.0.59.nupkg.sha512" + }, + "Google.FlatBuffers/23.5.26": { + "type": "package", + "serviceable": true, + "sha512": "sha512-pd/qgndhZl3B421wiffK09MvZ3c7sS2ZNusjzBJudpaJXGM9Gqfe2fYugYNAkN7c48BLo1E0Q4jefkOsaz1dfQ==", + "path": "google.flatbuffers/23.5.26", + "hashPath": "google.flatbuffers.23.5.26.nupkg.sha512" + }, + "Menees.Analyzers/3.0.10": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ZaCxhd3KKxOqgtDv4YL0Tm6+dhlH+HtXyXrolb6zquAHBR8ONwywofNOb6d8UlafQaNiNdiqVQz8tG4+4NdLyw==", + "path": "menees.analyzers/3.0.10", + "hashPath": "menees.analyzers.3.0.10.nupkg.sha512" + }, + "Meziantou.Analyzer/2.0.33": { + "type": "package", + "serviceable": true, + "sha512": "sha512-LslJaY4cjxOjIM8X7JRMRHL2roG7E28m1ZPFxIcvNp4sfiGQJz0jsHCl9HsblRmXS/IX65eu3qZ15Q3FL2EsPg==", + "path": "meziantou.analyzer/2.0.33", + "hashPath": "meziantou.analyzer.2.0.33.nupkg.sha512" + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "path": "microsoft.netcore.platforms/1.1.0", + "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" + }, + "Nullable/1.3.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Mk4ZVDfAORTjvckQprCSehi1XgOAAlk5ez06Va/acRYEloN9t6d6zpzJRn5MEq7+RnagyFIq9r+kbWzLGd+6QA==", + "path": "nullable/1.3.1", + "hashPath": "nullable.1.3.1.nupkg.sha512" + }, + "StyleCop.Analyzers/1.2.0-beta.435": { + "type": "package", + "serviceable": true, + "sha512": "sha512-TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==", + "path": "stylecop.analyzers/1.2.0-beta.435", + "hashPath": "stylecop.analyzers.1.2.0-beta.435.nupkg.sha512" + }, + "StyleCop.Analyzers.Unstable/1.2.0.435": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg==", + "path": "stylecop.analyzers.unstable/1.2.0.435", + "hashPath": "stylecop.analyzers.unstable.1.2.0.435.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/References/FlatBuffers.GenOutput.dll b/References/FlatBuffers.GenOutput.dll index 22bf5437d4..3e8c03a43c 100644 Binary files a/References/FlatBuffers.GenOutput.dll and b/References/FlatBuffers.GenOutput.dll differ diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs index 3feaf61454..42f3c54155 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs @@ -118,7 +118,7 @@ namespace BizHawk.Emulation.Cores.Waterbox foreach (var input in inputs) { - if (input.Type == InputType.Padding) + if (input.Type == InputType.Padding0) continue; var bitSize = (int)input.BitSize; @@ -132,6 +132,27 @@ namespace BizHawk.Emulation.Cores.Waterbox switch (input.Type) { + case InputType.Padding1: + { + // padding with set bits + _thunks.Add((_, b) => + { + var val = (byte)(1 << bitOffset); + var byteOffset = byteStart; + for (var i = 0; i < bitSize; i++) + { + b[byteOffset] |= val; + val <<= 1; + if (val == 0) + { + val = 1; + byteOffset++; + } + } + }); + + break; + } case InputType.ResetButton: case InputType.Button: case InputType.ButtonCanRapid: diff --git a/waterbox/nyma/NymaCore.cpp b/waterbox/nyma/NymaCore.cpp index 94493644e8..20420699bd 100644 --- a/waterbox/nyma/NymaCore.cpp +++ b/waterbox/nyma/NymaCore.cpp @@ -325,6 +325,7 @@ ECL_EXPORT void DumpInputs() MAYBENULL(a->ShortName, x.ShortName); MAYBENULL(a->FullName, x.FullName); MAYBENULL(a->DefaultDeviceShortName, x.DefaultDevice); + a->Flags = (PortFlags)x.Flags; for (auto& y: x.DeviceInfo) { std::unique_ptr b(new NDeviceInfoT()); diff --git a/waterbox/nyma/NymaTypes.fbs b/waterbox/nyma/NymaTypes.fbs index 0ab4d62696..2478e2a42e 100644 --- a/waterbox/nyma/NymaTypes.fbs +++ b/waterbox/nyma/NymaTypes.fbs @@ -2,7 +2,7 @@ namespace NymaTypes; enum SettingType: int32 { /// (signed), int8, int16, int32, int64(saved as) - Int, + Int = 0, /// uint8, uint16, uint32, uint64(saved as) Uint, /// 0 or 1 @@ -19,25 +19,25 @@ enum SettingType: int32 { } enum SettingsFlags: uint32 (bit_flags) { /// TODO(cats) - Input = 8, - Sound = 9, - Video = 10, + Input = 0, + Sound = 1, + Video = 2, /// User-configurable physical->virtual button/axes and hotkey mappings(driver-side code category mainly). - InputMapping = 11, - Path = 12, + InputMapping = 3, + Path = 4, /// If the setting affects emulation from the point of view of the emulated program - EmuState = 17, + EmuState = 8, /// If it's safe for an untrusted source to modify it, probably only used in conjunction with MDFNST_EX_EMU_STATE and network play - UntrustedSafe = 18, + UntrustedSafe = 9, /// Suppress documentation generation for this setting. - SuppressDoc = 19, + SuppressDoc = 10, /// Auto-generated common template setting(like nes.xscale, pce.xscale, vb.xscale, nes.enable, pce.enable, vb.enable) - CommonTemplate = 20, + CommonTemplate = 11, /// Don't save setting in settings file. - NonPersistent = 21, + NonPersistent = 12, /// TODO(in progress) - RequiresReload = 24, - RequiresRestart = 25, + RequiresReload = 14, + RequiresRestart = 15, } table EnumValue { Name: string; @@ -62,7 +62,8 @@ table Settings { enum InputType: uint8 { - Padding = 0, // n-bit, zero + Padding0 = 0, // n-bit, zero + Padding1, // n-bit, one bits Button, // 1-bit ButtonCanRapid, // 1-bit Switch, // ceil(log2(n))-bit @@ -88,6 +89,10 @@ enum AxisFlags: uint8 (bit_flags) { } enum DeviceFlags: uint8 (bit_flags) { Keyboard = 0, + Unique = 1, +} +enum PortFlags: uint8 (bit_flags) { + NoUserSelect = 0, } table NButtonInfo { ExcludeName: string; @@ -144,6 +149,7 @@ table NPortInfo { ShortName: string; FullName: string; DefaultDeviceShortName: string; + Flags: PortFlags; Devices: [NDeviceInfo]; } table NPorts { diff --git a/waterbox/nyma/NymaTypes_generated.h b/waterbox/nyma/NymaTypes_generated.h index 5e9a2c6990..71ef6d0979 100644 --- a/waterbox/nyma/NymaTypes_generated.h +++ b/waterbox/nyma/NymaTypes_generated.h @@ -8,9 +8,9 @@ // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 22 && - FLATBUFFERS_VERSION_MINOR == 9 && - FLATBUFFERS_VERSION_REVISION == 24, +static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && + FLATBUFFERS_VERSION_MINOR == 5 && + FLATBUFFERS_VERSION_REVISION == 26, "Non-compatible flatbuffers version included"); namespace NymaTypes { @@ -117,34 +117,34 @@ inline const char * const *EnumNamesSettingType() { } inline const char *EnumNameSettingType(SettingType e) { - if (flatbuffers::IsOutRange(e, SettingType_Int, SettingType_Alias)) return ""; + if (::flatbuffers::IsOutRange(e, SettingType_Int, SettingType_Alias)) return ""; const size_t index = static_cast(e); return EnumNamesSettingType()[index]; } enum SettingsFlags : uint32_t { /// TODO(cats) - SettingsFlags_Input = 256, - SettingsFlags_Sound = 512, - SettingsFlags_Video = 1024, + SettingsFlags_Input = 1, + SettingsFlags_Sound = 2, + SettingsFlags_Video = 4, /// User-configurable physical->virtual button/axes and hotkey mappings(driver-side code category mainly). - SettingsFlags_InputMapping = 2048, - SettingsFlags_Path = 4096, + SettingsFlags_InputMapping = 8, + SettingsFlags_Path = 16, /// If the setting affects emulation from the point of view of the emulated program - SettingsFlags_EmuState = 131072, + SettingsFlags_EmuState = 256, /// If it's safe for an untrusted source to modify it, probably only used in conjunction with MDFNST_EX_EMU_STATE and network play - SettingsFlags_UntrustedSafe = 262144, + SettingsFlags_UntrustedSafe = 512, /// Suppress documentation generation for this setting. - SettingsFlags_SuppressDoc = 524288, + SettingsFlags_SuppressDoc = 1024, /// Auto-generated common template setting(like nes.xscale, pce.xscale, vb.xscale, nes.enable, pce.enable, vb.enable) - SettingsFlags_CommonTemplate = 1048576, + SettingsFlags_CommonTemplate = 2048, /// Don't save setting in settings file. - SettingsFlags_NonPersistent = 2097152, + SettingsFlags_NonPersistent = 4096, /// TODO(in progress) - SettingsFlags_RequiresReload = 16777216, - SettingsFlags_RequiresRestart = 33554432, + SettingsFlags_RequiresReload = 16384, + SettingsFlags_RequiresRestart = 32768, SettingsFlags_NONE = 0, - SettingsFlags_ANY = 54402816 + SettingsFlags_ANY = 57119 }; inline const SettingsFlags (&EnumValuesSettingsFlags())[12] { @@ -184,26 +184,28 @@ inline const char *EnumNameSettingsFlags(SettingsFlags e) { } enum InputType : uint8_t { - InputType_Padding = 0, - InputType_Button = 1, - InputType_ButtonCanRapid = 2, - InputType_Switch = 3, - InputType_Status = 4, - InputType_Axis = 5, - InputType_PointerX = 6, - InputType_PointerY = 7, - InputType_AxisRel = 8, - InputType_ByteSpecial = 9, - InputType_ResetButton = 10, - InputType_ButtonAnalog = 11, - InputType_Rumble = 12, - InputType_MIN = InputType_Padding, + InputType_Padding0 = 0, + InputType_Padding1 = 1, + InputType_Button = 2, + InputType_ButtonCanRapid = 3, + InputType_Switch = 4, + InputType_Status = 5, + InputType_Axis = 6, + InputType_PointerX = 7, + InputType_PointerY = 8, + InputType_AxisRel = 9, + InputType_ByteSpecial = 10, + InputType_ResetButton = 11, + InputType_ButtonAnalog = 12, + InputType_Rumble = 13, + InputType_MIN = InputType_Padding0, InputType_MAX = InputType_Rumble }; -inline const InputType (&EnumValuesInputType())[13] { +inline const InputType (&EnumValuesInputType())[14] { static const InputType values[] = { - InputType_Padding, + InputType_Padding0, + InputType_Padding1, InputType_Button, InputType_ButtonCanRapid, InputType_Switch, @@ -221,8 +223,9 @@ inline const InputType (&EnumValuesInputType())[13] { } inline const char * const *EnumNamesInputType() { - static const char * const names[14] = { - "Padding", + static const char * const names[15] = { + "Padding0", + "Padding1", "Button", "ButtonCanRapid", "Switch", @@ -241,7 +244,7 @@ inline const char * const *EnumNamesInputType() { } inline const char *EnumNameInputType(InputType e) { - if (flatbuffers::IsOutRange(e, InputType_Padding, InputType_Rumble)) return ""; + if (::flatbuffers::IsOutRange(e, InputType_Padding0, InputType_Rumble)) return ""; const size_t index = static_cast(e); return EnumNamesInputType()[index]; } @@ -274,31 +277,61 @@ inline const char *EnumNameAxisFlags(AxisFlags e) { enum DeviceFlags : uint8_t { DeviceFlags_Keyboard = 1, + DeviceFlags_Unique = 2, DeviceFlags_NONE = 0, - DeviceFlags_ANY = 1 + DeviceFlags_ANY = 3 }; -inline const DeviceFlags (&EnumValuesDeviceFlags())[1] { +inline const DeviceFlags (&EnumValuesDeviceFlags())[2] { static const DeviceFlags values[] = { - DeviceFlags_Keyboard + DeviceFlags_Keyboard, + DeviceFlags_Unique }; return values; } inline const char * const *EnumNamesDeviceFlags() { - static const char * const names[2] = { + static const char * const names[3] = { "Keyboard", + "Unique", nullptr }; return names; } inline const char *EnumNameDeviceFlags(DeviceFlags e) { - if (flatbuffers::IsOutRange(e, DeviceFlags_Keyboard, DeviceFlags_Keyboard)) return ""; + if (::flatbuffers::IsOutRange(e, DeviceFlags_Keyboard, DeviceFlags_Unique)) return ""; const size_t index = static_cast(e) - static_cast(DeviceFlags_Keyboard); return EnumNamesDeviceFlags()[index]; } +enum PortFlags : uint8_t { + PortFlags_NoUserSelect = 1, + PortFlags_NONE = 0, + PortFlags_ANY = 1 +}; + +inline const PortFlags (&EnumValuesPortFlags())[1] { + static const PortFlags values[] = { + PortFlags_NoUserSelect + }; + return values; +} + +inline const char * const *EnumNamesPortFlags() { + static const char * const names[2] = { + "NoUserSelect", + nullptr + }; + return names; +} + +inline const char *EnumNamePortFlags(PortFlags e) { + if (::flatbuffers::IsOutRange(e, PortFlags_NoUserSelect, PortFlags_NoUserSelect)) return ""; + const size_t index = static_cast(e) - static_cast(PortFlags_NoUserSelect); + return EnumNamesPortFlags()[index]; +} + enum NInputExtra : uint8_t { NInputExtra_NONE = 0, NInputExtra_Button = 1, @@ -333,7 +366,7 @@ inline const char * const *EnumNamesNInputExtra() { } inline const char *EnumNameNInputExtra(NInputExtra e) { - if (flatbuffers::IsOutRange(e, NInputExtra_NONE, NInputExtra_Status)) return ""; + if (::flatbuffers::IsOutRange(e, NInputExtra_NONE, NInputExtra_Status)) return ""; const size_t index = static_cast(e); return EnumNamesNInputExtra()[index]; } @@ -405,8 +438,8 @@ struct NInputExtraUnion { } } - static void *UnPack(const void *obj, NInputExtra type, const flatbuffers::resolver_function_t *resolver); - flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const; + static void *UnPack(const void *obj, NInputExtra type, const ::flatbuffers::resolver_function_t *resolver); + ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr) const; NymaTypes::NButtonInfoT *AsButton() { return type == NInputExtra_Button ? @@ -442,17 +475,17 @@ struct NInputExtraUnion { } }; -bool VerifyNInputExtra(flatbuffers::Verifier &verifier, const void *obj, NInputExtra type); -bool VerifyNInputExtraVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector> *values, const flatbuffers::Vector *types); +bool VerifyNInputExtra(::flatbuffers::Verifier &verifier, const void *obj, NInputExtra type); +bool VerifyNInputExtraVector(::flatbuffers::Verifier &verifier, const ::flatbuffers::Vector<::flatbuffers::Offset> *values, const ::flatbuffers::Vector *types); -struct EnumValueT : public flatbuffers::NativeTable { +struct EnumValueT : public ::flatbuffers::NativeTable { typedef EnumValue TableType; std::string Name{}; std::string Description{}; std::string Value{}; }; -struct EnumValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct EnumValue FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef EnumValueT NativeTableType; typedef EnumValueBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -460,16 +493,16 @@ struct EnumValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_DESCRIPTION = 6, VT_VALUE = 8 }; - const flatbuffers::String *Name() const { - return GetPointer(VT_NAME); + const ::flatbuffers::String *Name() const { + return GetPointer(VT_NAME); } - const flatbuffers::String *Description() const { - return GetPointer(VT_DESCRIPTION); + const ::flatbuffers::String *Description() const { + return GetPointer(VT_DESCRIPTION); } - const flatbuffers::String *Value() const { - return GetPointer(VT_VALUE); + const ::flatbuffers::String *Value() const { + return GetPointer(VT_VALUE); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NAME) && verifier.VerifyString(Name()) && @@ -479,40 +512,40 @@ struct EnumValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyString(Value()) && verifier.EndTable(); } - EnumValueT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(EnumValueT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + EnumValueT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(EnumValueT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct EnumValueBuilder { typedef EnumValue Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_Name(flatbuffers::Offset Name) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_Name(::flatbuffers::Offset<::flatbuffers::String> Name) { fbb_.AddOffset(EnumValue::VT_NAME, Name); } - void add_Description(flatbuffers::Offset Description) { + void add_Description(::flatbuffers::Offset<::flatbuffers::String> Description) { fbb_.AddOffset(EnumValue::VT_DESCRIPTION, Description); } - void add_Value(flatbuffers::Offset Value) { + void add_Value(::flatbuffers::Offset<::flatbuffers::String> Value) { fbb_.AddOffset(EnumValue::VT_VALUE, Value); } - explicit EnumValueBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit EnumValueBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateEnumValue( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset Name = 0, - flatbuffers::Offset Description = 0, - flatbuffers::Offset Value = 0) { +inline ::flatbuffers::Offset CreateEnumValue( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> Name = 0, + ::flatbuffers::Offset<::flatbuffers::String> Description = 0, + ::flatbuffers::Offset<::flatbuffers::String> Value = 0) { EnumValueBuilder builder_(_fbb); builder_.add_Value(Value); builder_.add_Description(Description); @@ -520,8 +553,8 @@ inline flatbuffers::Offset CreateEnumValue( return builder_.Finish(); } -inline flatbuffers::Offset CreateEnumValueDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateEnumValueDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *Name = nullptr, const char *Description = nullptr, const char *Value = nullptr) { @@ -535,9 +568,9 @@ inline flatbuffers::Offset CreateEnumValueDirect( Value__); } -flatbuffers::Offset CreateEnumValue(flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateEnumValue(::flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct SettingT : public flatbuffers::NativeTable { +struct SettingT : public ::flatbuffers::NativeTable { typedef Setting TableType; std::string Name{}; std::string Description{}; @@ -554,7 +587,7 @@ struct SettingT : public flatbuffers::NativeTable { SettingT &operator=(SettingT o) FLATBUFFERS_NOEXCEPT; }; -struct Setting FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct Setting FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SettingT NativeTableType; typedef SettingBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -568,23 +601,23 @@ struct Setting FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_TYPE = 18, VT_SETTINGENUMS = 20 }; - const flatbuffers::String *Name() const { - return GetPointer(VT_NAME); + const ::flatbuffers::String *Name() const { + return GetPointer(VT_NAME); } - const flatbuffers::String *Description() const { - return GetPointer(VT_DESCRIPTION); + const ::flatbuffers::String *Description() const { + return GetPointer(VT_DESCRIPTION); } - const flatbuffers::String *SettingsKey() const { - return GetPointer(VT_SETTINGSKEY); + const ::flatbuffers::String *SettingsKey() const { + return GetPointer(VT_SETTINGSKEY); } - const flatbuffers::String *DefaultValue() const { - return GetPointer(VT_DEFAULTVALUE); + const ::flatbuffers::String *DefaultValue() const { + return GetPointer(VT_DEFAULTVALUE); } - const flatbuffers::String *Min() const { - return GetPointer(VT_MIN); + const ::flatbuffers::String *Min() const { + return GetPointer(VT_MIN); } - const flatbuffers::String *Max() const { - return GetPointer(VT_MAX); + const ::flatbuffers::String *Max() const { + return GetPointer(VT_MAX); } NymaTypes::SettingsFlags Flags() const { return static_cast(GetField(VT_FLAGS, 0)); @@ -592,10 +625,10 @@ struct Setting FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { NymaTypes::SettingType Type() const { return static_cast(GetField(VT_TYPE, 0)); } - const flatbuffers::Vector> *SettingEnums() const { - return GetPointer> *>(VT_SETTINGENUMS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *SettingEnums() const { + return GetPointer> *>(VT_SETTINGENUMS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NAME) && verifier.VerifyString(Name()) && @@ -616,31 +649,31 @@ struct Setting FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyVectorOfTables(SettingEnums()) && verifier.EndTable(); } - SettingT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(SettingT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const SettingT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + SettingT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(SettingT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SettingT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct SettingBuilder { typedef Setting Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_Name(flatbuffers::Offset Name) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_Name(::flatbuffers::Offset<::flatbuffers::String> Name) { fbb_.AddOffset(Setting::VT_NAME, Name); } - void add_Description(flatbuffers::Offset Description) { + void add_Description(::flatbuffers::Offset<::flatbuffers::String> Description) { fbb_.AddOffset(Setting::VT_DESCRIPTION, Description); } - void add_SettingsKey(flatbuffers::Offset SettingsKey) { + void add_SettingsKey(::flatbuffers::Offset<::flatbuffers::String> SettingsKey) { fbb_.AddOffset(Setting::VT_SETTINGSKEY, SettingsKey); } - void add_DefaultValue(flatbuffers::Offset DefaultValue) { + void add_DefaultValue(::flatbuffers::Offset<::flatbuffers::String> DefaultValue) { fbb_.AddOffset(Setting::VT_DEFAULTVALUE, DefaultValue); } - void add_Min(flatbuffers::Offset Min) { + void add_Min(::flatbuffers::Offset<::flatbuffers::String> Min) { fbb_.AddOffset(Setting::VT_MIN, Min); } - void add_Max(flatbuffers::Offset Max) { + void add_Max(::flatbuffers::Offset<::flatbuffers::String> Max) { fbb_.AddOffset(Setting::VT_MAX, Max); } void add_Flags(NymaTypes::SettingsFlags Flags) { @@ -649,31 +682,31 @@ struct SettingBuilder { void add_Type(NymaTypes::SettingType Type) { fbb_.AddElement(Setting::VT_TYPE, static_cast(Type), 0); } - void add_SettingEnums(flatbuffers::Offset>> SettingEnums) { + void add_SettingEnums(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> SettingEnums) { fbb_.AddOffset(Setting::VT_SETTINGENUMS, SettingEnums); } - explicit SettingBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SettingBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSetting( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset Name = 0, - flatbuffers::Offset Description = 0, - flatbuffers::Offset SettingsKey = 0, - flatbuffers::Offset DefaultValue = 0, - flatbuffers::Offset Min = 0, - flatbuffers::Offset Max = 0, +inline ::flatbuffers::Offset CreateSetting( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> Name = 0, + ::flatbuffers::Offset<::flatbuffers::String> Description = 0, + ::flatbuffers::Offset<::flatbuffers::String> SettingsKey = 0, + ::flatbuffers::Offset<::flatbuffers::String> DefaultValue = 0, + ::flatbuffers::Offset<::flatbuffers::String> Min = 0, + ::flatbuffers::Offset<::flatbuffers::String> Max = 0, NymaTypes::SettingsFlags Flags = static_cast(0), NymaTypes::SettingType Type = NymaTypes::SettingType_Int, - flatbuffers::Offset>> SettingEnums = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> SettingEnums = 0) { SettingBuilder builder_(_fbb); builder_.add_SettingEnums(SettingEnums); builder_.add_Type(Type); @@ -687,8 +720,8 @@ inline flatbuffers::Offset CreateSetting( return builder_.Finish(); } -inline flatbuffers::Offset CreateSettingDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateSettingDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *Name = nullptr, const char *Description = nullptr, const char *SettingsKey = nullptr, @@ -697,14 +730,14 @@ inline flatbuffers::Offset CreateSettingDirect( const char *Max = nullptr, NymaTypes::SettingsFlags Flags = static_cast(0), NymaTypes::SettingType Type = NymaTypes::SettingType_Int, - const std::vector> *SettingEnums = nullptr) { + const std::vector<::flatbuffers::Offset> *SettingEnums = nullptr) { auto Name__ = Name ? _fbb.CreateString(Name) : 0; auto Description__ = Description ? _fbb.CreateString(Description) : 0; auto SettingsKey__ = SettingsKey ? _fbb.CreateString(SettingsKey) : 0; auto DefaultValue__ = DefaultValue ? _fbb.CreateString(DefaultValue) : 0; auto Min__ = Min ? _fbb.CreateString(Min) : 0; auto Max__ = Max ? _fbb.CreateString(Max) : 0; - auto SettingEnums__ = SettingEnums ? _fbb.CreateVector>(*SettingEnums) : 0; + auto SettingEnums__ = SettingEnums ? _fbb.CreateVector<::flatbuffers::Offset>(*SettingEnums) : 0; return NymaTypes::CreateSetting( _fbb, Name__, @@ -718,9 +751,9 @@ inline flatbuffers::Offset CreateSettingDirect( SettingEnums__); } -flatbuffers::Offset CreateSetting(flatbuffers::FlatBufferBuilder &_fbb, const SettingT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateSetting(::flatbuffers::FlatBufferBuilder &_fbb, const SettingT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct SettingsT : public flatbuffers::NativeTable { +struct SettingsT : public ::flatbuffers::NativeTable { typedef Settings TableType; std::vector> Values{}; SettingsT() = default; @@ -729,117 +762,117 @@ struct SettingsT : public flatbuffers::NativeTable { SettingsT &operator=(SettingsT o) FLATBUFFERS_NOEXCEPT; }; -struct Settings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct Settings FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef SettingsT NativeTableType; typedef SettingsBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VALUES = 4 }; - const flatbuffers::Vector> *Values() const { - return GetPointer> *>(VT_VALUES); + const ::flatbuffers::Vector<::flatbuffers::Offset> *Values() const { + return GetPointer> *>(VT_VALUES); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_VALUES) && verifier.VerifyVector(Values()) && verifier.VerifyVectorOfTables(Values()) && verifier.EndTable(); } - SettingsT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(SettingsT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const SettingsT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + SettingsT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(SettingsT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SettingsT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct SettingsBuilder { typedef Settings Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_Values(flatbuffers::Offset>> Values) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_Values(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Values) { fbb_.AddOffset(Settings::VT_VALUES, Values); } - explicit SettingsBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit SettingsBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateSettings( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> Values = 0) { +inline ::flatbuffers::Offset CreateSettings( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Values = 0) { SettingsBuilder builder_(_fbb); builder_.add_Values(Values); return builder_.Finish(); } -inline flatbuffers::Offset CreateSettingsDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *Values = nullptr) { - auto Values__ = Values ? _fbb.CreateVector>(*Values) : 0; +inline ::flatbuffers::Offset CreateSettingsDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *Values = nullptr) { + auto Values__ = Values ? _fbb.CreateVector<::flatbuffers::Offset>(*Values) : 0; return NymaTypes::CreateSettings( _fbb, Values__); } -flatbuffers::Offset CreateSettings(flatbuffers::FlatBufferBuilder &_fbb, const SettingsT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateSettings(::flatbuffers::FlatBufferBuilder &_fbb, const SettingsT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NButtonInfoT : public flatbuffers::NativeTable { +struct NButtonInfoT : public ::flatbuffers::NativeTable { typedef NButtonInfo TableType; std::string ExcludeName{}; }; -struct NButtonInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NButtonInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NButtonInfoT NativeTableType; typedef NButtonInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_EXCLUDENAME = 4 }; - const flatbuffers::String *ExcludeName() const { - return GetPointer(VT_EXCLUDENAME); + const ::flatbuffers::String *ExcludeName() const { + return GetPointer(VT_EXCLUDENAME); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_EXCLUDENAME) && verifier.VerifyString(ExcludeName()) && verifier.EndTable(); } - NButtonInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NButtonInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NButtonInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NButtonInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NButtonInfoBuilder { typedef NButtonInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ExcludeName(flatbuffers::Offset ExcludeName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ExcludeName(::flatbuffers::Offset<::flatbuffers::String> ExcludeName) { fbb_.AddOffset(NButtonInfo::VT_EXCLUDENAME, ExcludeName); } - explicit NButtonInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NButtonInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNButtonInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ExcludeName = 0) { +inline ::flatbuffers::Offset CreateNButtonInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ExcludeName = 0) { NButtonInfoBuilder builder_(_fbb); builder_.add_ExcludeName(ExcludeName); return builder_.Finish(); } -inline flatbuffers::Offset CreateNButtonInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNButtonInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ExcludeName = nullptr) { auto ExcludeName__ = ExcludeName ? _fbb.CreateString(ExcludeName) : 0; return NymaTypes::CreateNButtonInfo( @@ -847,9 +880,9 @@ inline flatbuffers::Offset CreateNButtonInfoDirect( ExcludeName__); } -flatbuffers::Offset CreateNButtonInfo(flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNButtonInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NAxisInfoT : public flatbuffers::NativeTable { +struct NAxisInfoT : public ::flatbuffers::NativeTable { typedef NAxisInfo TableType; std::string SettingsNameNeg{}; std::string SettingsNamePos{}; @@ -857,7 +890,7 @@ struct NAxisInfoT : public flatbuffers::NativeTable { std::string NamePos{}; }; -struct NAxisInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NAxisInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NAxisInfoT NativeTableType; typedef NAxisInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -866,19 +899,19 @@ struct NAxisInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_NAMENEG = 8, VT_NAMEPOS = 10 }; - const flatbuffers::String *SettingsNameNeg() const { - return GetPointer(VT_SETTINGSNAMENEG); + const ::flatbuffers::String *SettingsNameNeg() const { + return GetPointer(VT_SETTINGSNAMENEG); } - const flatbuffers::String *SettingsNamePos() const { - return GetPointer(VT_SETTINGSNAMEPOS); + const ::flatbuffers::String *SettingsNamePos() const { + return GetPointer(VT_SETTINGSNAMEPOS); } - const flatbuffers::String *NameNeg() const { - return GetPointer(VT_NAMENEG); + const ::flatbuffers::String *NameNeg() const { + return GetPointer(VT_NAMENEG); } - const flatbuffers::String *NamePos() const { - return GetPointer(VT_NAMEPOS); + const ::flatbuffers::String *NamePos() const { + return GetPointer(VT_NAMEPOS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SETTINGSNAMENEG) && verifier.VerifyString(SettingsNameNeg()) && @@ -890,44 +923,44 @@ struct NAxisInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyString(NamePos()) && verifier.EndTable(); } - NAxisInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NAxisInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NAxisInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NAxisInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NAxisInfoBuilder { typedef NAxisInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_SettingsNameNeg(flatbuffers::Offset SettingsNameNeg) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_SettingsNameNeg(::flatbuffers::Offset<::flatbuffers::String> SettingsNameNeg) { fbb_.AddOffset(NAxisInfo::VT_SETTINGSNAMENEG, SettingsNameNeg); } - void add_SettingsNamePos(flatbuffers::Offset SettingsNamePos) { + void add_SettingsNamePos(::flatbuffers::Offset<::flatbuffers::String> SettingsNamePos) { fbb_.AddOffset(NAxisInfo::VT_SETTINGSNAMEPOS, SettingsNamePos); } - void add_NameNeg(flatbuffers::Offset NameNeg) { + void add_NameNeg(::flatbuffers::Offset<::flatbuffers::String> NameNeg) { fbb_.AddOffset(NAxisInfo::VT_NAMENEG, NameNeg); } - void add_NamePos(flatbuffers::Offset NamePos) { + void add_NamePos(::flatbuffers::Offset<::flatbuffers::String> NamePos) { fbb_.AddOffset(NAxisInfo::VT_NAMEPOS, NamePos); } - explicit NAxisInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NAxisInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNAxisInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset SettingsNameNeg = 0, - flatbuffers::Offset SettingsNamePos = 0, - flatbuffers::Offset NameNeg = 0, - flatbuffers::Offset NamePos = 0) { +inline ::flatbuffers::Offset CreateNAxisInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> SettingsNameNeg = 0, + ::flatbuffers::Offset<::flatbuffers::String> SettingsNamePos = 0, + ::flatbuffers::Offset<::flatbuffers::String> NameNeg = 0, + ::flatbuffers::Offset<::flatbuffers::String> NamePos = 0) { NAxisInfoBuilder builder_(_fbb); builder_.add_NamePos(NamePos); builder_.add_NameNeg(NameNeg); @@ -936,8 +969,8 @@ inline flatbuffers::Offset CreateNAxisInfo( return builder_.Finish(); } -inline flatbuffers::Offset CreateNAxisInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNAxisInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *SettingsNameNeg = nullptr, const char *SettingsNamePos = nullptr, const char *NameNeg = nullptr, @@ -954,9 +987,9 @@ inline flatbuffers::Offset CreateNAxisInfoDirect( NamePos__); } -flatbuffers::Offset CreateNAxisInfo(flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNAxisInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NSwitchInfoT : public flatbuffers::NativeTable { +struct NSwitchInfoT : public ::flatbuffers::NativeTable { typedef NSwitchInfo TableType; uint32_t DefaultPosition = 0; std::vector> Positions{}; @@ -966,7 +999,7 @@ struct NSwitchInfoT : public flatbuffers::NativeTable { NSwitchInfoT &operator=(NSwitchInfoT o) FLATBUFFERS_NOEXCEPT; }; -struct NSwitchInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NSwitchInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NSwitchInfoT NativeTableType; typedef NSwitchInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -976,10 +1009,10 @@ struct NSwitchInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t DefaultPosition() const { return GetField(VT_DEFAULTPOSITION, 0); } - const flatbuffers::Vector> *Positions() const { - return GetPointer> *>(VT_POSITIONS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *Positions() const { + return GetPointer> *>(VT_POSITIONS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_DEFAULTPOSITION, 4) && VerifyOffset(verifier, VT_POSITIONS) && @@ -987,63 +1020,63 @@ struct NSwitchInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyVectorOfTables(Positions()) && verifier.EndTable(); } - NSwitchInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NSwitchInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NSwitchInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NSwitchInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NSwitchInfoBuilder { typedef NSwitchInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; void add_DefaultPosition(uint32_t DefaultPosition) { fbb_.AddElement(NSwitchInfo::VT_DEFAULTPOSITION, DefaultPosition, 0); } - void add_Positions(flatbuffers::Offset>> Positions) { + void add_Positions(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Positions) { fbb_.AddOffset(NSwitchInfo::VT_POSITIONS, Positions); } - explicit NSwitchInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NSwitchInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNSwitchInfo( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNSwitchInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t DefaultPosition = 0, - flatbuffers::Offset>> Positions = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Positions = 0) { NSwitchInfoBuilder builder_(_fbb); builder_.add_Positions(Positions); builder_.add_DefaultPosition(DefaultPosition); return builder_.Finish(); } -inline flatbuffers::Offset CreateNSwitchInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNSwitchInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, uint32_t DefaultPosition = 0, - const std::vector> *Positions = nullptr) { - auto Positions__ = Positions ? _fbb.CreateVector>(*Positions) : 0; + const std::vector<::flatbuffers::Offset> *Positions = nullptr) { + auto Positions__ = Positions ? _fbb.CreateVector<::flatbuffers::Offset>(*Positions) : 0; return NymaTypes::CreateNSwitchInfo( _fbb, DefaultPosition, Positions__); } -flatbuffers::Offset CreateNSwitchInfo(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNSwitchInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NSwitchPositionT : public flatbuffers::NativeTable { +struct NSwitchPositionT : public ::flatbuffers::NativeTable { typedef NSwitchPosition TableType; std::string SettingName{}; std::string Name{}; std::string Description{}; }; -struct NSwitchPosition FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NSwitchPosition FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NSwitchPositionT NativeTableType; typedef NSwitchPositionBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -1051,16 +1084,16 @@ struct NSwitchPosition FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_NAME = 6, VT_DESCRIPTION = 8 }; - const flatbuffers::String *SettingName() const { - return GetPointer(VT_SETTINGNAME); + const ::flatbuffers::String *SettingName() const { + return GetPointer(VT_SETTINGNAME); } - const flatbuffers::String *Name() const { - return GetPointer(VT_NAME); + const ::flatbuffers::String *Name() const { + return GetPointer(VT_NAME); } - const flatbuffers::String *Description() const { - return GetPointer(VT_DESCRIPTION); + const ::flatbuffers::String *Description() const { + return GetPointer(VT_DESCRIPTION); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SETTINGNAME) && verifier.VerifyString(SettingName()) && @@ -1070,40 +1103,40 @@ struct NSwitchPosition FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyString(Description()) && verifier.EndTable(); } - NSwitchPositionT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NSwitchPositionT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NSwitchPositionT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NSwitchPositionT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NSwitchPositionBuilder { typedef NSwitchPosition Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_SettingName(flatbuffers::Offset SettingName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_SettingName(::flatbuffers::Offset<::flatbuffers::String> SettingName) { fbb_.AddOffset(NSwitchPosition::VT_SETTINGNAME, SettingName); } - void add_Name(flatbuffers::Offset Name) { + void add_Name(::flatbuffers::Offset<::flatbuffers::String> Name) { fbb_.AddOffset(NSwitchPosition::VT_NAME, Name); } - void add_Description(flatbuffers::Offset Description) { + void add_Description(::flatbuffers::Offset<::flatbuffers::String> Description) { fbb_.AddOffset(NSwitchPosition::VT_DESCRIPTION, Description); } - explicit NSwitchPositionBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NSwitchPositionBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNSwitchPosition( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset SettingName = 0, - flatbuffers::Offset Name = 0, - flatbuffers::Offset Description = 0) { +inline ::flatbuffers::Offset CreateNSwitchPosition( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> SettingName = 0, + ::flatbuffers::Offset<::flatbuffers::String> Name = 0, + ::flatbuffers::Offset<::flatbuffers::String> Description = 0) { NSwitchPositionBuilder builder_(_fbb); builder_.add_Description(Description); builder_.add_Name(Name); @@ -1111,8 +1144,8 @@ inline flatbuffers::Offset CreateNSwitchPosition( return builder_.Finish(); } -inline flatbuffers::Offset CreateNSwitchPositionDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNSwitchPositionDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *SettingName = nullptr, const char *Name = nullptr, const char *Description = nullptr) { @@ -1126,9 +1159,9 @@ inline flatbuffers::Offset CreateNSwitchPositionDirect( Description__); } -flatbuffers::Offset CreateNSwitchPosition(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNSwitchPosition(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NStatusInfoT : public flatbuffers::NativeTable { +struct NStatusInfoT : public ::flatbuffers::NativeTable { typedef NStatusInfo TableType; std::vector> States{}; NStatusInfoT() = default; @@ -1137,72 +1170,72 @@ struct NStatusInfoT : public flatbuffers::NativeTable { NStatusInfoT &operator=(NStatusInfoT o) FLATBUFFERS_NOEXCEPT; }; -struct NStatusInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NStatusInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NStatusInfoT NativeTableType; typedef NStatusInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STATES = 4 }; - const flatbuffers::Vector> *States() const { - return GetPointer> *>(VT_STATES); + const ::flatbuffers::Vector<::flatbuffers::Offset> *States() const { + return GetPointer> *>(VT_STATES); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_STATES) && verifier.VerifyVector(States()) && verifier.VerifyVectorOfTables(States()) && verifier.EndTable(); } - NStatusInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NStatusInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NStatusInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NStatusInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NStatusInfoBuilder { typedef NStatusInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_States(flatbuffers::Offset>> States) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_States(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> States) { fbb_.AddOffset(NStatusInfo::VT_STATES, States); } - explicit NStatusInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NStatusInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNStatusInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> States = 0) { +inline ::flatbuffers::Offset CreateNStatusInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> States = 0) { NStatusInfoBuilder builder_(_fbb); builder_.add_States(States); return builder_.Finish(); } -inline flatbuffers::Offset CreateNStatusInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *States = nullptr) { - auto States__ = States ? _fbb.CreateVector>(*States) : 0; +inline ::flatbuffers::Offset CreateNStatusInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *States = nullptr) { + auto States__ = States ? _fbb.CreateVector<::flatbuffers::Offset>(*States) : 0; return NymaTypes::CreateNStatusInfo( _fbb, States__); } -flatbuffers::Offset CreateNStatusInfo(flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNStatusInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NStatusStateT : public flatbuffers::NativeTable { +struct NStatusStateT : public ::flatbuffers::NativeTable { typedef NStatusState TableType; std::string ShortName{}; std::string Name{}; int32_t Color = 0; }; -struct NStatusState FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NStatusState FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NStatusStateT NativeTableType; typedef NStatusStateBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -1210,16 +1243,16 @@ struct NStatusState FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_NAME = 6, VT_COLOR = 8 }; - const flatbuffers::String *ShortName() const { - return GetPointer(VT_SHORTNAME); + const ::flatbuffers::String *ShortName() const { + return GetPointer(VT_SHORTNAME); } - const flatbuffers::String *Name() const { - return GetPointer(VT_NAME); + const ::flatbuffers::String *Name() const { + return GetPointer(VT_NAME); } int32_t Color() const { return GetField(VT_COLOR, 0); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SHORTNAME) && verifier.VerifyString(ShortName()) && @@ -1228,39 +1261,39 @@ struct NStatusState FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyField(verifier, VT_COLOR, 4) && verifier.EndTable(); } - NStatusStateT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NStatusStateT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NStatusStateT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NStatusStateT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NStatusStateBuilder { typedef NStatusState Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ShortName(flatbuffers::Offset ShortName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ShortName(::flatbuffers::Offset<::flatbuffers::String> ShortName) { fbb_.AddOffset(NStatusState::VT_SHORTNAME, ShortName); } - void add_Name(flatbuffers::Offset Name) { + void add_Name(::flatbuffers::Offset<::flatbuffers::String> Name) { fbb_.AddOffset(NStatusState::VT_NAME, Name); } void add_Color(int32_t Color) { fbb_.AddElement(NStatusState::VT_COLOR, Color, 0); } - explicit NStatusStateBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NStatusStateBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNStatusState( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ShortName = 0, - flatbuffers::Offset Name = 0, +inline ::flatbuffers::Offset CreateNStatusState( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ShortName = 0, + ::flatbuffers::Offset<::flatbuffers::String> Name = 0, int32_t Color = 0) { NStatusStateBuilder builder_(_fbb); builder_.add_Color(Color); @@ -1269,8 +1302,8 @@ inline flatbuffers::Offset CreateNStatusState( return builder_.Finish(); } -inline flatbuffers::Offset CreateNStatusStateDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNStatusStateDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ShortName = nullptr, const char *Name = nullptr, int32_t Color = 0) { @@ -1283,21 +1316,21 @@ inline flatbuffers::Offset CreateNStatusStateDirect( Color); } -flatbuffers::Offset CreateNStatusState(flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNStatusState(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NInputInfoT : public flatbuffers::NativeTable { +struct NInputInfoT : public ::flatbuffers::NativeTable { typedef NInputInfo TableType; std::string SettingName{}; std::string Name{}; int16_t ConfigOrder = 0; uint16_t BitOffset = 0; - NymaTypes::InputType Type = NymaTypes::InputType_Padding; + NymaTypes::InputType Type = NymaTypes::InputType_Padding0; NymaTypes::AxisFlags Flags = static_cast(0); uint8_t BitSize = 0; NymaTypes::NInputExtraUnion Extra{}; }; -struct NInputInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NInputInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NInputInfoT NativeTableType; typedef NInputInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -1311,11 +1344,11 @@ struct NInputInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_EXTRA_TYPE = 18, VT_EXTRA = 20 }; - const flatbuffers::String *SettingName() const { - return GetPointer(VT_SETTINGNAME); + const ::flatbuffers::String *SettingName() const { + return GetPointer(VT_SETTINGNAME); } - const flatbuffers::String *Name() const { - return GetPointer(VT_NAME); + const ::flatbuffers::String *Name() const { + return GetPointer(VT_NAME); } int16_t ConfigOrder() const { return GetField(VT_CONFIGORDER, 0); @@ -1351,7 +1384,7 @@ struct NInputInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const NymaTypes::NStatusInfo *Extra_as_Status() const { return Extra_type() == NymaTypes::NInputExtra_Status ? static_cast(Extra()) : nullptr; } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SETTINGNAME) && verifier.VerifyString(SettingName()) && @@ -1367,9 +1400,9 @@ struct NInputInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyNInputExtra(verifier, Extra(), Extra_type()) && verifier.EndTable(); } - NInputInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NInputInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NInputInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NInputInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; template<> inline const NymaTypes::NButtonInfo *NInputInfo::Extra_as() const { @@ -1390,12 +1423,12 @@ template<> inline const NymaTypes::NStatusInfo *NInputInfo::Extra_as SettingName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_SettingName(::flatbuffers::Offset<::flatbuffers::String> SettingName) { fbb_.AddOffset(NInputInfo::VT_SETTINGNAME, SettingName); } - void add_Name(flatbuffers::Offset Name) { + void add_Name(::flatbuffers::Offset<::flatbuffers::String> Name) { fbb_.AddOffset(NInputInfo::VT_NAME, Name); } void add_ConfigOrder(int16_t ConfigOrder) { @@ -1416,31 +1449,31 @@ struct NInputInfoBuilder { void add_Extra_type(NymaTypes::NInputExtra Extra_type) { fbb_.AddElement(NInputInfo::VT_EXTRA_TYPE, static_cast(Extra_type), 0); } - void add_Extra(flatbuffers::Offset Extra) { + void add_Extra(::flatbuffers::Offset Extra) { fbb_.AddOffset(NInputInfo::VT_EXTRA, Extra); } - explicit NInputInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NInputInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNInputInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset SettingName = 0, - flatbuffers::Offset Name = 0, +inline ::flatbuffers::Offset CreateNInputInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> SettingName = 0, + ::flatbuffers::Offset<::flatbuffers::String> Name = 0, int16_t ConfigOrder = 0, uint16_t BitOffset = 0, - NymaTypes::InputType Type = NymaTypes::InputType_Padding, + NymaTypes::InputType Type = NymaTypes::InputType_Padding0, NymaTypes::AxisFlags Flags = static_cast(0), uint8_t BitSize = 0, NymaTypes::NInputExtra Extra_type = NymaTypes::NInputExtra_NONE, - flatbuffers::Offset Extra = 0) { + ::flatbuffers::Offset Extra = 0) { NInputInfoBuilder builder_(_fbb); builder_.add_Extra(Extra); builder_.add_Name(Name); @@ -1454,17 +1487,17 @@ inline flatbuffers::Offset CreateNInputInfo( return builder_.Finish(); } -inline flatbuffers::Offset CreateNInputInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNInputInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *SettingName = nullptr, const char *Name = nullptr, int16_t ConfigOrder = 0, uint16_t BitOffset = 0, - NymaTypes::InputType Type = NymaTypes::InputType_Padding, + NymaTypes::InputType Type = NymaTypes::InputType_Padding0, NymaTypes::AxisFlags Flags = static_cast(0), uint8_t BitSize = 0, NymaTypes::NInputExtra Extra_type = NymaTypes::NInputExtra_NONE, - flatbuffers::Offset Extra = 0) { + ::flatbuffers::Offset Extra = 0) { auto SettingName__ = SettingName ? _fbb.CreateString(SettingName) : 0; auto Name__ = Name ? _fbb.CreateString(Name) : 0; return NymaTypes::CreateNInputInfo( @@ -1480,9 +1513,9 @@ inline flatbuffers::Offset CreateNInputInfoDirect( Extra); } -flatbuffers::Offset CreateNInputInfo(flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNInputInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NDeviceInfoT : public flatbuffers::NativeTable { +struct NDeviceInfoT : public ::flatbuffers::NativeTable { typedef NDeviceInfo TableType; std::string ShortName{}; std::string FullName{}; @@ -1496,7 +1529,7 @@ struct NDeviceInfoT : public flatbuffers::NativeTable { NDeviceInfoT &operator=(NDeviceInfoT o) FLATBUFFERS_NOEXCEPT; }; -struct NDeviceInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NDeviceInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NDeviceInfoT NativeTableType; typedef NDeviceInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -1507,14 +1540,14 @@ struct NDeviceInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_BYTELENGTH = 12, VT_INPUTS = 14 }; - const flatbuffers::String *ShortName() const { - return GetPointer(VT_SHORTNAME); + const ::flatbuffers::String *ShortName() const { + return GetPointer(VT_SHORTNAME); } - const flatbuffers::String *FullName() const { - return GetPointer(VT_FULLNAME); + const ::flatbuffers::String *FullName() const { + return GetPointer(VT_FULLNAME); } - const flatbuffers::String *Description() const { - return GetPointer(VT_DESCRIPTION); + const ::flatbuffers::String *Description() const { + return GetPointer(VT_DESCRIPTION); } NymaTypes::DeviceFlags Flags() const { return static_cast(GetField(VT_FLAGS, 0)); @@ -1522,10 +1555,10 @@ struct NDeviceInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint32_t ByteLength() const { return GetField(VT_BYTELENGTH, 0); } - const flatbuffers::Vector> *Inputs() const { - return GetPointer> *>(VT_INPUTS); + const ::flatbuffers::Vector<::flatbuffers::Offset> *Inputs() const { + return GetPointer> *>(VT_INPUTS); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SHORTNAME) && verifier.VerifyString(ShortName()) && @@ -1540,22 +1573,22 @@ struct NDeviceInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyVectorOfTables(Inputs()) && verifier.EndTable(); } - NDeviceInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NDeviceInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NDeviceInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NDeviceInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NDeviceInfoBuilder { typedef NDeviceInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ShortName(flatbuffers::Offset ShortName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ShortName(::flatbuffers::Offset<::flatbuffers::String> ShortName) { fbb_.AddOffset(NDeviceInfo::VT_SHORTNAME, ShortName); } - void add_FullName(flatbuffers::Offset FullName) { + void add_FullName(::flatbuffers::Offset<::flatbuffers::String> FullName) { fbb_.AddOffset(NDeviceInfo::VT_FULLNAME, FullName); } - void add_Description(flatbuffers::Offset Description) { + void add_Description(::flatbuffers::Offset<::flatbuffers::String> Description) { fbb_.AddOffset(NDeviceInfo::VT_DESCRIPTION, Description); } void add_Flags(NymaTypes::DeviceFlags Flags) { @@ -1564,28 +1597,28 @@ struct NDeviceInfoBuilder { void add_ByteLength(uint32_t ByteLength) { fbb_.AddElement(NDeviceInfo::VT_BYTELENGTH, ByteLength, 0); } - void add_Inputs(flatbuffers::Offset>> Inputs) { + void add_Inputs(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Inputs) { fbb_.AddOffset(NDeviceInfo::VT_INPUTS, Inputs); } - explicit NDeviceInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NDeviceInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNDeviceInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ShortName = 0, - flatbuffers::Offset FullName = 0, - flatbuffers::Offset Description = 0, +inline ::flatbuffers::Offset CreateNDeviceInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ShortName = 0, + ::flatbuffers::Offset<::flatbuffers::String> FullName = 0, + ::flatbuffers::Offset<::flatbuffers::String> Description = 0, NymaTypes::DeviceFlags Flags = static_cast(0), uint32_t ByteLength = 0, - flatbuffers::Offset>> Inputs = 0) { + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Inputs = 0) { NDeviceInfoBuilder builder_(_fbb); builder_.add_Inputs(Inputs); builder_.add_ByteLength(ByteLength); @@ -1596,18 +1629,18 @@ inline flatbuffers::Offset CreateNDeviceInfo( return builder_.Finish(); } -inline flatbuffers::Offset CreateNDeviceInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNDeviceInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ShortName = nullptr, const char *FullName = nullptr, const char *Description = nullptr, NymaTypes::DeviceFlags Flags = static_cast(0), uint32_t ByteLength = 0, - const std::vector> *Inputs = nullptr) { + const std::vector<::flatbuffers::Offset> *Inputs = nullptr) { auto ShortName__ = ShortName ? _fbb.CreateString(ShortName) : 0; auto FullName__ = FullName ? _fbb.CreateString(FullName) : 0; auto Description__ = Description ? _fbb.CreateString(Description) : 0; - auto Inputs__ = Inputs ? _fbb.CreateVector>(*Inputs) : 0; + auto Inputs__ = Inputs ? _fbb.CreateVector<::flatbuffers::Offset>(*Inputs) : 0; return NymaTypes::CreateNDeviceInfo( _fbb, ShortName__, @@ -1618,13 +1651,14 @@ inline flatbuffers::Offset CreateNDeviceInfoDirect( Inputs__); } -flatbuffers::Offset CreateNDeviceInfo(flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNDeviceInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NPortInfoT : public flatbuffers::NativeTable { +struct NPortInfoT : public ::flatbuffers::NativeTable { typedef NPortInfo TableType; std::string ShortName{}; std::string FullName{}; std::string DefaultDeviceShortName{}; + NymaTypes::PortFlags Flags = static_cast(0); std::vector> Devices{}; NPortInfoT() = default; NPortInfoT(const NPortInfoT &o); @@ -1632,28 +1666,32 @@ struct NPortInfoT : public flatbuffers::NativeTable { NPortInfoT &operator=(NPortInfoT o) FLATBUFFERS_NOEXCEPT; }; -struct NPortInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NPortInfo FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NPortInfoT NativeTableType; typedef NPortInfoBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_SHORTNAME = 4, VT_FULLNAME = 6, VT_DEFAULTDEVICESHORTNAME = 8, - VT_DEVICES = 10 + VT_FLAGS = 10, + VT_DEVICES = 12 }; - const flatbuffers::String *ShortName() const { - return GetPointer(VT_SHORTNAME); + const ::flatbuffers::String *ShortName() const { + return GetPointer(VT_SHORTNAME); } - const flatbuffers::String *FullName() const { - return GetPointer(VT_FULLNAME); + const ::flatbuffers::String *FullName() const { + return GetPointer(VT_FULLNAME); } - const flatbuffers::String *DefaultDeviceShortName() const { - return GetPointer(VT_DEFAULTDEVICESHORTNAME); + const ::flatbuffers::String *DefaultDeviceShortName() const { + return GetPointer(VT_DEFAULTDEVICESHORTNAME); } - const flatbuffers::Vector> *Devices() const { - return GetPointer> *>(VT_DEVICES); + NymaTypes::PortFlags Flags() const { + return static_cast(GetField(VT_FLAGS, 0)); } - bool Verify(flatbuffers::Verifier &verifier) const { + const ::flatbuffers::Vector<::flatbuffers::Offset> *Devices() const { + return GetPointer> *>(VT_DEVICES); + } + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_SHORTNAME) && verifier.VerifyString(ShortName()) && @@ -1661,78 +1699,86 @@ struct NPortInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyString(FullName()) && VerifyOffset(verifier, VT_DEFAULTDEVICESHORTNAME) && verifier.VerifyString(DefaultDeviceShortName()) && + VerifyField(verifier, VT_FLAGS, 1) && VerifyOffset(verifier, VT_DEVICES) && verifier.VerifyVector(Devices()) && verifier.VerifyVectorOfTables(Devices()) && verifier.EndTable(); } - NPortInfoT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NPortInfoT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NPortInfoT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NPortInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NPortInfoBuilder { typedef NPortInfo Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_ShortName(flatbuffers::Offset ShortName) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_ShortName(::flatbuffers::Offset<::flatbuffers::String> ShortName) { fbb_.AddOffset(NPortInfo::VT_SHORTNAME, ShortName); } - void add_FullName(flatbuffers::Offset FullName) { + void add_FullName(::flatbuffers::Offset<::flatbuffers::String> FullName) { fbb_.AddOffset(NPortInfo::VT_FULLNAME, FullName); } - void add_DefaultDeviceShortName(flatbuffers::Offset DefaultDeviceShortName) { + void add_DefaultDeviceShortName(::flatbuffers::Offset<::flatbuffers::String> DefaultDeviceShortName) { fbb_.AddOffset(NPortInfo::VT_DEFAULTDEVICESHORTNAME, DefaultDeviceShortName); } - void add_Devices(flatbuffers::Offset>> Devices) { + void add_Flags(NymaTypes::PortFlags Flags) { + fbb_.AddElement(NPortInfo::VT_FLAGS, static_cast(Flags), 0); + } + void add_Devices(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Devices) { fbb_.AddOffset(NPortInfo::VT_DEVICES, Devices); } - explicit NPortInfoBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NPortInfoBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNPortInfo( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset ShortName = 0, - flatbuffers::Offset FullName = 0, - flatbuffers::Offset DefaultDeviceShortName = 0, - flatbuffers::Offset>> Devices = 0) { +inline ::flatbuffers::Offset CreateNPortInfo( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::String> ShortName = 0, + ::flatbuffers::Offset<::flatbuffers::String> FullName = 0, + ::flatbuffers::Offset<::flatbuffers::String> DefaultDeviceShortName = 0, + NymaTypes::PortFlags Flags = static_cast(0), + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Devices = 0) { NPortInfoBuilder builder_(_fbb); builder_.add_Devices(Devices); builder_.add_DefaultDeviceShortName(DefaultDeviceShortName); builder_.add_FullName(FullName); builder_.add_ShortName(ShortName); + builder_.add_Flags(Flags); return builder_.Finish(); } -inline flatbuffers::Offset CreateNPortInfoDirect( - flatbuffers::FlatBufferBuilder &_fbb, +inline ::flatbuffers::Offset CreateNPortInfoDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, const char *ShortName = nullptr, const char *FullName = nullptr, const char *DefaultDeviceShortName = nullptr, - const std::vector> *Devices = nullptr) { + NymaTypes::PortFlags Flags = static_cast(0), + const std::vector<::flatbuffers::Offset> *Devices = nullptr) { auto ShortName__ = ShortName ? _fbb.CreateString(ShortName) : 0; auto FullName__ = FullName ? _fbb.CreateString(FullName) : 0; auto DefaultDeviceShortName__ = DefaultDeviceShortName ? _fbb.CreateString(DefaultDeviceShortName) : 0; - auto Devices__ = Devices ? _fbb.CreateVector>(*Devices) : 0; + auto Devices__ = Devices ? _fbb.CreateVector<::flatbuffers::Offset>(*Devices) : 0; return NymaTypes::CreateNPortInfo( _fbb, ShortName__, FullName__, DefaultDeviceShortName__, + Flags, Devices__); } -flatbuffers::Offset CreateNPortInfo(flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNPortInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -struct NPortsT : public flatbuffers::NativeTable { +struct NPortsT : public ::flatbuffers::NativeTable { typedef NPorts TableType; std::vector> Values{}; NPortsT() = default; @@ -1741,71 +1787,71 @@ struct NPortsT : public flatbuffers::NativeTable { NPortsT &operator=(NPortsT o) FLATBUFFERS_NOEXCEPT; }; -struct NPorts FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { +struct NPorts FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table { typedef NPortsT NativeTableType; typedef NPortsBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_VALUES = 4 }; - const flatbuffers::Vector> *Values() const { - return GetPointer> *>(VT_VALUES); + const ::flatbuffers::Vector<::flatbuffers::Offset> *Values() const { + return GetPointer> *>(VT_VALUES); } - bool Verify(flatbuffers::Verifier &verifier) const { + bool Verify(::flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_VALUES) && verifier.VerifyVector(Values()) && verifier.VerifyVectorOfTables(Values()) && verifier.EndTable(); } - NPortsT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; - void UnPackTo(NPortsT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; - static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const NPortsT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + NPortsT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(NPortsT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const; + static ::flatbuffers::Offset Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NPortsT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); }; struct NPortsBuilder { typedef NPorts Table; - flatbuffers::FlatBufferBuilder &fbb_; - flatbuffers::uoffset_t start_; - void add_Values(flatbuffers::Offset>> Values) { + ::flatbuffers::FlatBufferBuilder &fbb_; + ::flatbuffers::uoffset_t start_; + void add_Values(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Values) { fbb_.AddOffset(NPorts::VT_VALUES, Values); } - explicit NPortsBuilder(flatbuffers::FlatBufferBuilder &_fbb) + explicit NPortsBuilder(::flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); } - flatbuffers::Offset Finish() { + ::flatbuffers::Offset Finish() { const auto end = fbb_.EndTable(start_); - auto o = flatbuffers::Offset(end); + auto o = ::flatbuffers::Offset(end); return o; } }; -inline flatbuffers::Offset CreateNPorts( - flatbuffers::FlatBufferBuilder &_fbb, - flatbuffers::Offset>> Values = 0) { +inline ::flatbuffers::Offset CreateNPorts( + ::flatbuffers::FlatBufferBuilder &_fbb, + ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset>> Values = 0) { NPortsBuilder builder_(_fbb); builder_.add_Values(Values); return builder_.Finish(); } -inline flatbuffers::Offset CreateNPortsDirect( - flatbuffers::FlatBufferBuilder &_fbb, - const std::vector> *Values = nullptr) { - auto Values__ = Values ? _fbb.CreateVector>(*Values) : 0; +inline ::flatbuffers::Offset CreateNPortsDirect( + ::flatbuffers::FlatBufferBuilder &_fbb, + const std::vector<::flatbuffers::Offset> *Values = nullptr) { + auto Values__ = Values ? _fbb.CreateVector<::flatbuffers::Offset>(*Values) : 0; return NymaTypes::CreateNPorts( _fbb, Values__); } -flatbuffers::Offset CreateNPorts(flatbuffers::FlatBufferBuilder &_fbb, const NPortsT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +::flatbuffers::Offset CreateNPorts(::flatbuffers::FlatBufferBuilder &_fbb, const NPortsT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr); -inline EnumValueT *EnumValue::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline EnumValueT *EnumValue::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new EnumValueT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void EnumValue::UnPackTo(EnumValueT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void EnumValue::UnPackTo(EnumValueT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = Name(); if (_e) _o->Name = _e->str(); } @@ -1813,14 +1859,14 @@ inline void EnumValue::UnPackTo(EnumValueT *_o, const flatbuffers::resolver_func { auto _e = Value(); if (_e) _o->Value = _e->str(); } } -inline flatbuffers::Offset EnumValue::Pack(flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset EnumValue::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateEnumValue(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateEnumValue(flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateEnumValue(::flatbuffers::FlatBufferBuilder &_fbb, const EnumValueT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const EnumValueT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const EnumValueT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _Name = _o->Name.empty() ? 0 : _fbb.CreateString(_o->Name); auto _Description = _o->Description.empty() ? 0 : _fbb.CreateString(_o->Description); auto _Value = _o->Value.empty() ? 0 : _fbb.CreateString(_o->Value); @@ -1857,13 +1903,13 @@ inline SettingT &SettingT::operator=(SettingT o) FLATBUFFERS_NOEXCEPT { return *this; } -inline SettingT *Setting::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline SettingT *Setting::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new SettingT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void Setting::UnPackTo(SettingT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void Setting::UnPackTo(SettingT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = Name(); if (_e) _o->Name = _e->str(); } @@ -1874,17 +1920,17 @@ inline void Setting::UnPackTo(SettingT *_o, const flatbuffers::resolver_function { auto _e = Max(); if (_e) _o->Max = _e->str(); } { auto _e = Flags(); _o->Flags = _e; } { auto _e = Type(); _o->Type = _e; } - { auto _e = SettingEnums(); if (_e) { _o->SettingEnums.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->SettingEnums[_i]) { _e->Get(_i)->UnPackTo(_o->SettingEnums[_i].get(), _resolver); } else { _o->SettingEnums[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->SettingEnums.resize(0); } } + { auto _e = SettingEnums(); if (_e) { _o->SettingEnums.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->SettingEnums[_i]) { _e->Get(_i)->UnPackTo(_o->SettingEnums[_i].get(), _resolver); } else { _o->SettingEnums[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->SettingEnums.resize(0); } } } -inline flatbuffers::Offset Setting::Pack(flatbuffers::FlatBufferBuilder &_fbb, const SettingT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset Setting::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SettingT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateSetting(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateSetting(flatbuffers::FlatBufferBuilder &_fbb, const SettingT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateSetting(::flatbuffers::FlatBufferBuilder &_fbb, const SettingT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const SettingT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const SettingT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _Name = _o->Name.empty() ? 0 : _fbb.CreateString(_o->Name); auto _Description = _o->Description.empty() ? 0 : _fbb.CreateString(_o->Description); auto _SettingsKey = _o->SettingsKey.empty() ? 0 : _fbb.CreateString(_o->SettingsKey); @@ -1893,7 +1939,7 @@ inline flatbuffers::Offset CreateSetting(flatbuffers::FlatBufferBuilder auto _Max = _o->Max.empty() ? 0 : _fbb.CreateString(_o->Max); auto _Flags = _o->Flags; auto _Type = _o->Type; - auto _SettingEnums = _o->SettingEnums.size() ? _fbb.CreateVector> (_o->SettingEnums.size(), [](size_t i, _VectorArgs *__va) { return CreateEnumValue(*__va->__fbb, __va->__o->SettingEnums[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _SettingEnums = _o->SettingEnums.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->SettingEnums.size(), [](size_t i, _VectorArgs *__va) { return CreateEnumValue(*__va->__fbb, __va->__o->SettingEnums[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateSetting( _fbb, _Name, @@ -1917,65 +1963,65 @@ inline SettingsT &SettingsT::operator=(SettingsT o) FLATBUFFERS_NOEXCEPT { return *this; } -inline SettingsT *Settings::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline SettingsT *Settings::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new SettingsT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void Settings::UnPackTo(SettingsT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void Settings::UnPackTo(SettingsT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; - { auto _e = Values(); if (_e) { _o->Values.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Values[_i]) { _e->Get(_i)->UnPackTo(_o->Values[_i].get(), _resolver); } else { _o->Values[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Values.resize(0); } } + { auto _e = Values(); if (_e) { _o->Values.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Values[_i]) { _e->Get(_i)->UnPackTo(_o->Values[_i].get(), _resolver); } else { _o->Values[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Values.resize(0); } } } -inline flatbuffers::Offset Settings::Pack(flatbuffers::FlatBufferBuilder &_fbb, const SettingsT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset Settings::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SettingsT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateSettings(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateSettings(flatbuffers::FlatBufferBuilder &_fbb, const SettingsT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateSettings(::flatbuffers::FlatBufferBuilder &_fbb, const SettingsT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const SettingsT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; - auto _Values = _o->Values.size() ? _fbb.CreateVector> (_o->Values.size(), [](size_t i, _VectorArgs *__va) { return CreateSetting(*__va->__fbb, __va->__o->Values[i].get(), __va->__rehasher); }, &_va ) : 0; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const SettingsT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + auto _Values = _o->Values.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->Values.size(), [](size_t i, _VectorArgs *__va) { return CreateSetting(*__va->__fbb, __va->__o->Values[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateSettings( _fbb, _Values); } -inline NButtonInfoT *NButtonInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NButtonInfoT *NButtonInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NButtonInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NButtonInfo::UnPackTo(NButtonInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NButtonInfo::UnPackTo(NButtonInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = ExcludeName(); if (_e) _o->ExcludeName = _e->str(); } } -inline flatbuffers::Offset NButtonInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NButtonInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNButtonInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNButtonInfo(flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNButtonInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NButtonInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NButtonInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NButtonInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _ExcludeName = _o->ExcludeName.empty() ? 0 : _fbb.CreateString(_o->ExcludeName); return NymaTypes::CreateNButtonInfo( _fbb, _ExcludeName); } -inline NAxisInfoT *NAxisInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NAxisInfoT *NAxisInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NAxisInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NAxisInfo::UnPackTo(NAxisInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NAxisInfo::UnPackTo(NAxisInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = SettingsNameNeg(); if (_e) _o->SettingsNameNeg = _e->str(); } @@ -1984,14 +2030,14 @@ inline void NAxisInfo::UnPackTo(NAxisInfoT *_o, const flatbuffers::resolver_func { auto _e = NamePos(); if (_e) _o->NamePos = _e->str(); } } -inline flatbuffers::Offset NAxisInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NAxisInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNAxisInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNAxisInfo(flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNAxisInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NAxisInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NAxisInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NAxisInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _SettingsNameNeg = _o->SettingsNameNeg.empty() ? 0 : _fbb.CreateString(_o->SettingsNameNeg); auto _SettingsNamePos = _o->SettingsNamePos.empty() ? 0 : _fbb.CreateString(_o->SettingsNamePos); auto _NameNeg = _o->NameNeg.empty() ? 0 : _fbb.CreateString(_o->NameNeg); @@ -2016,42 +2062,42 @@ inline NSwitchInfoT &NSwitchInfoT::operator=(NSwitchInfoT o) FLATBUFFERS_NOEXCEP return *this; } -inline NSwitchInfoT *NSwitchInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NSwitchInfoT *NSwitchInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NSwitchInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NSwitchInfo::UnPackTo(NSwitchInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NSwitchInfo::UnPackTo(NSwitchInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = DefaultPosition(); _o->DefaultPosition = _e; } - { auto _e = Positions(); if (_e) { _o->Positions.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Positions[_i]) { _e->Get(_i)->UnPackTo(_o->Positions[_i].get(), _resolver); } else { _o->Positions[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Positions.resize(0); } } + { auto _e = Positions(); if (_e) { _o->Positions.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Positions[_i]) { _e->Get(_i)->UnPackTo(_o->Positions[_i].get(), _resolver); } else { _o->Positions[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Positions.resize(0); } } } -inline flatbuffers::Offset NSwitchInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NSwitchInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNSwitchInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNSwitchInfo(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNSwitchInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NSwitchInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NSwitchInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _DefaultPosition = _o->DefaultPosition; - auto _Positions = _o->Positions.size() ? _fbb.CreateVector> (_o->Positions.size(), [](size_t i, _VectorArgs *__va) { return CreateNSwitchPosition(*__va->__fbb, __va->__o->Positions[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _Positions = _o->Positions.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->Positions.size(), [](size_t i, _VectorArgs *__va) { return CreateNSwitchPosition(*__va->__fbb, __va->__o->Positions[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateNSwitchInfo( _fbb, _DefaultPosition, _Positions); } -inline NSwitchPositionT *NSwitchPosition::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NSwitchPositionT *NSwitchPosition::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NSwitchPositionT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NSwitchPosition::UnPackTo(NSwitchPositionT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NSwitchPosition::UnPackTo(NSwitchPositionT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = SettingName(); if (_e) _o->SettingName = _e->str(); } @@ -2059,14 +2105,14 @@ inline void NSwitchPosition::UnPackTo(NSwitchPositionT *_o, const flatbuffers::r { auto _e = Description(); if (_e) _o->Description = _e->str(); } } -inline flatbuffers::Offset NSwitchPosition::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NSwitchPosition::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNSwitchPosition(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNSwitchPosition(flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNSwitchPosition(::flatbuffers::FlatBufferBuilder &_fbb, const NSwitchPositionT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NSwitchPositionT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NSwitchPositionT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _SettingName = _o->SettingName.empty() ? 0 : _fbb.CreateString(_o->SettingName); auto _Name = _o->Name.empty() ? 0 : _fbb.CreateString(_o->Name); auto _Description = _o->Description.empty() ? 0 : _fbb.CreateString(_o->Description); @@ -2087,39 +2133,39 @@ inline NStatusInfoT &NStatusInfoT::operator=(NStatusInfoT o) FLATBUFFERS_NOEXCEP return *this; } -inline NStatusInfoT *NStatusInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NStatusInfoT *NStatusInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NStatusInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NStatusInfo::UnPackTo(NStatusInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NStatusInfo::UnPackTo(NStatusInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; - { auto _e = States(); if (_e) { _o->States.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->States[_i]) { _e->Get(_i)->UnPackTo(_o->States[_i].get(), _resolver); } else { _o->States[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->States.resize(0); } } + { auto _e = States(); if (_e) { _o->States.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->States[_i]) { _e->Get(_i)->UnPackTo(_o->States[_i].get(), _resolver); } else { _o->States[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->States.resize(0); } } } -inline flatbuffers::Offset NStatusInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NStatusInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNStatusInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNStatusInfo(flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNStatusInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NStatusInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; - auto _States = _o->States.size() ? _fbb.CreateVector> (_o->States.size(), [](size_t i, _VectorArgs *__va) { return CreateNStatusState(*__va->__fbb, __va->__o->States[i].get(), __va->__rehasher); }, &_va ) : 0; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NStatusInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + auto _States = _o->States.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->States.size(), [](size_t i, _VectorArgs *__va) { return CreateNStatusState(*__va->__fbb, __va->__o->States[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateNStatusInfo( _fbb, _States); } -inline NStatusStateT *NStatusState::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NStatusStateT *NStatusState::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NStatusStateT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NStatusState::UnPackTo(NStatusStateT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NStatusState::UnPackTo(NStatusStateT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = ShortName(); if (_e) _o->ShortName = _e->str(); } @@ -2127,14 +2173,14 @@ inline void NStatusState::UnPackTo(NStatusStateT *_o, const flatbuffers::resolve { auto _e = Color(); _o->Color = _e; } } -inline flatbuffers::Offset NStatusState::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NStatusState::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNStatusState(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNStatusState(flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNStatusState(::flatbuffers::FlatBufferBuilder &_fbb, const NStatusStateT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NStatusStateT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NStatusStateT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _ShortName = _o->ShortName.empty() ? 0 : _fbb.CreateString(_o->ShortName); auto _Name = _o->Name.empty() ? 0 : _fbb.CreateString(_o->Name); auto _Color = _o->Color; @@ -2145,13 +2191,13 @@ inline flatbuffers::Offset CreateNStatusState(flatbuffers::FlatBuf _Color); } -inline NInputInfoT *NInputInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NInputInfoT *NInputInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NInputInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NInputInfo::UnPackTo(NInputInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NInputInfo::UnPackTo(NInputInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = SettingName(); if (_e) _o->SettingName = _e->str(); } @@ -2165,14 +2211,14 @@ inline void NInputInfo::UnPackTo(NInputInfoT *_o, const flatbuffers::resolver_fu { auto _e = Extra(); if (_e) _o->Extra.value = NymaTypes::NInputExtraUnion::UnPack(_e, Extra_type(), _resolver); } } -inline flatbuffers::Offset NInputInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NInputInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNInputInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNInputInfo(flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNInputInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NInputInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NInputInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NInputInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _SettingName = _o->SettingName.empty() ? 0 : _fbb.CreateString(_o->SettingName); auto _Name = _o->Name.empty() ? 0 : _fbb.CreateString(_o->Name); auto _ConfigOrder = _o->ConfigOrder; @@ -2215,13 +2261,13 @@ inline NDeviceInfoT &NDeviceInfoT::operator=(NDeviceInfoT o) FLATBUFFERS_NOEXCEP return *this; } -inline NDeviceInfoT *NDeviceInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NDeviceInfoT *NDeviceInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NDeviceInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NDeviceInfo::UnPackTo(NDeviceInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NDeviceInfo::UnPackTo(NDeviceInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = ShortName(); if (_e) _o->ShortName = _e->str(); } @@ -2229,23 +2275,23 @@ inline void NDeviceInfo::UnPackTo(NDeviceInfoT *_o, const flatbuffers::resolver_ { auto _e = Description(); if (_e) _o->Description = _e->str(); } { auto _e = Flags(); _o->Flags = _e; } { auto _e = ByteLength(); _o->ByteLength = _e; } - { auto _e = Inputs(); if (_e) { _o->Inputs.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Inputs[_i]) { _e->Get(_i)->UnPackTo(_o->Inputs[_i].get(), _resolver); } else { _o->Inputs[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Inputs.resize(0); } } + { auto _e = Inputs(); if (_e) { _o->Inputs.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Inputs[_i]) { _e->Get(_i)->UnPackTo(_o->Inputs[_i].get(), _resolver); } else { _o->Inputs[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Inputs.resize(0); } } } -inline flatbuffers::Offset NDeviceInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NDeviceInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNDeviceInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNDeviceInfo(flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNDeviceInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NDeviceInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NDeviceInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NDeviceInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _ShortName = _o->ShortName.empty() ? 0 : _fbb.CreateString(_o->ShortName); auto _FullName = _o->FullName.empty() ? 0 : _fbb.CreateString(_o->FullName); auto _Description = _o->Description.empty() ? 0 : _fbb.CreateString(_o->Description); auto _Flags = _o->Flags; auto _ByteLength = _o->ByteLength; - auto _Inputs = _o->Inputs.size() ? _fbb.CreateVector> (_o->Inputs.size(), [](size_t i, _VectorArgs *__va) { return CreateNInputInfo(*__va->__fbb, __va->__o->Inputs[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _Inputs = _o->Inputs.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->Inputs.size(), [](size_t i, _VectorArgs *__va) { return CreateNInputInfo(*__va->__fbb, __va->__o->Inputs[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateNDeviceInfo( _fbb, _ShortName, @@ -2259,7 +2305,8 @@ inline flatbuffers::Offset CreateNDeviceInfo(flatbuffers::FlatBuffe inline NPortInfoT::NPortInfoT(const NPortInfoT &o) : ShortName(o.ShortName), FullName(o.FullName), - DefaultDeviceShortName(o.DefaultDeviceShortName) { + DefaultDeviceShortName(o.DefaultDeviceShortName), + Flags(o.Flags) { Devices.reserve(o.Devices.size()); for (const auto &Devices_ : o.Devices) { Devices.emplace_back((Devices_) ? new NymaTypes::NDeviceInfoT(*Devices_) : nullptr); } } @@ -2268,42 +2315,46 @@ inline NPortInfoT &NPortInfoT::operator=(NPortInfoT o) FLATBUFFERS_NOEXCEPT { std::swap(ShortName, o.ShortName); std::swap(FullName, o.FullName); std::swap(DefaultDeviceShortName, o.DefaultDeviceShortName); + std::swap(Flags, o.Flags); std::swap(Devices, o.Devices); return *this; } -inline NPortInfoT *NPortInfo::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NPortInfoT *NPortInfo::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NPortInfoT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NPortInfo::UnPackTo(NPortInfoT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NPortInfo::UnPackTo(NPortInfoT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; { auto _e = ShortName(); if (_e) _o->ShortName = _e->str(); } { auto _e = FullName(); if (_e) _o->FullName = _e->str(); } { auto _e = DefaultDeviceShortName(); if (_e) _o->DefaultDeviceShortName = _e->str(); } - { auto _e = Devices(); if (_e) { _o->Devices.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Devices[_i]) { _e->Get(_i)->UnPackTo(_o->Devices[_i].get(), _resolver); } else { _o->Devices[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Devices.resize(0); } } + { auto _e = Flags(); _o->Flags = _e; } + { auto _e = Devices(); if (_e) { _o->Devices.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Devices[_i]) { _e->Get(_i)->UnPackTo(_o->Devices[_i].get(), _resolver); } else { _o->Devices[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Devices.resize(0); } } } -inline flatbuffers::Offset NPortInfo::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NPortInfo::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNPortInfo(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNPortInfo(flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNPortInfo(::flatbuffers::FlatBufferBuilder &_fbb, const NPortInfoT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NPortInfoT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NPortInfoT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; auto _ShortName = _o->ShortName.empty() ? 0 : _fbb.CreateString(_o->ShortName); auto _FullName = _o->FullName.empty() ? 0 : _fbb.CreateString(_o->FullName); auto _DefaultDeviceShortName = _o->DefaultDeviceShortName.empty() ? 0 : _fbb.CreateString(_o->DefaultDeviceShortName); - auto _Devices = _o->Devices.size() ? _fbb.CreateVector> (_o->Devices.size(), [](size_t i, _VectorArgs *__va) { return CreateNDeviceInfo(*__va->__fbb, __va->__o->Devices[i].get(), __va->__rehasher); }, &_va ) : 0; + auto _Flags = _o->Flags; + auto _Devices = _o->Devices.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->Devices.size(), [](size_t i, _VectorArgs *__va) { return CreateNDeviceInfo(*__va->__fbb, __va->__o->Devices[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateNPortInfo( _fbb, _ShortName, _FullName, _DefaultDeviceShortName, + _Flags, _Devices); } @@ -2317,33 +2368,33 @@ inline NPortsT &NPortsT::operator=(NPortsT o) FLATBUFFERS_NOEXCEPT { return *this; } -inline NPortsT *NPorts::UnPack(const flatbuffers::resolver_function_t *_resolver) const { +inline NPortsT *NPorts::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const { auto _o = std::unique_ptr(new NPortsT()); UnPackTo(_o.get(), _resolver); return _o.release(); } -inline void NPorts::UnPackTo(NPortsT *_o, const flatbuffers::resolver_function_t *_resolver) const { +inline void NPorts::UnPackTo(NPortsT *_o, const ::flatbuffers::resolver_function_t *_resolver) const { (void)_o; (void)_resolver; - { auto _e = Values(); if (_e) { _o->Values.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Values[_i]) { _e->Get(_i)->UnPackTo(_o->Values[_i].get(), _resolver); } else { _o->Values[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Values.resize(0); } } + { auto _e = Values(); if (_e) { _o->Values.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->Values[_i]) { _e->Get(_i)->UnPackTo(_o->Values[_i].get(), _resolver); } else { _o->Values[_i] = std::unique_ptr(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->Values.resize(0); } } } -inline flatbuffers::Offset NPorts::Pack(flatbuffers::FlatBufferBuilder &_fbb, const NPortsT* _o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset NPorts::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const NPortsT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) { return CreateNPorts(_fbb, _o, _rehasher); } -inline flatbuffers::Offset CreateNPorts(flatbuffers::FlatBufferBuilder &_fbb, const NPortsT *_o, const flatbuffers::rehasher_function_t *_rehasher) { +inline ::flatbuffers::Offset CreateNPorts(::flatbuffers::FlatBufferBuilder &_fbb, const NPortsT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) { (void)_rehasher; (void)_o; - struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const NPortsT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; - auto _Values = _o->Values.size() ? _fbb.CreateVector> (_o->Values.size(), [](size_t i, _VectorArgs *__va) { return CreateNPortInfo(*__va->__fbb, __va->__o->Values[i].get(), __va->__rehasher); }, &_va ) : 0; + struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const NPortsT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + auto _Values = _o->Values.size() ? _fbb.CreateVector<::flatbuffers::Offset> (_o->Values.size(), [](size_t i, _VectorArgs *__va) { return CreateNPortInfo(*__va->__fbb, __va->__o->Values[i].get(), __va->__rehasher); }, &_va ) : 0; return NymaTypes::CreateNPorts( _fbb, _Values); } -inline bool VerifyNInputExtra(flatbuffers::Verifier &verifier, const void *obj, NInputExtra type) { +inline bool VerifyNInputExtra(::flatbuffers::Verifier &verifier, const void *obj, NInputExtra type) { switch (type) { case NInputExtra_NONE: { return true; @@ -2368,10 +2419,10 @@ inline bool VerifyNInputExtra(flatbuffers::Verifier &verifier, const void *obj, } } -inline bool VerifyNInputExtraVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector> *values, const flatbuffers::Vector *types) { +inline bool VerifyNInputExtraVector(::flatbuffers::Verifier &verifier, const ::flatbuffers::Vector<::flatbuffers::Offset> *values, const ::flatbuffers::Vector *types) { if (!values || !types) return !values && !types; if (values->size() != types->size()) return false; - for (flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { + for (::flatbuffers::uoffset_t i = 0; i < values->size(); ++i) { if (!VerifyNInputExtra( verifier, values->Get(i), types->GetEnum(i))) { return false; @@ -2380,7 +2431,7 @@ inline bool VerifyNInputExtraVector(flatbuffers::Verifier &verifier, const flatb return true; } -inline void *NInputExtraUnion::UnPack(const void *obj, NInputExtra type, const flatbuffers::resolver_function_t *resolver) { +inline void *NInputExtraUnion::UnPack(const void *obj, NInputExtra type, const ::flatbuffers::resolver_function_t *resolver) { (void)resolver; switch (type) { case NInputExtra_Button: { @@ -2403,7 +2454,7 @@ inline void *NInputExtraUnion::UnPack(const void *obj, NInputExtra type, const f } } -inline flatbuffers::Offset NInputExtraUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const { +inline ::flatbuffers::Offset NInputExtraUnion::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const ::flatbuffers::rehasher_function_t *_rehasher) const { (void)_rehasher; switch (type) { case NInputExtra_Button: { diff --git a/waterbox/nyma/common/flatbuffers/allocator.h b/waterbox/nyma/common/flatbuffers/allocator.h index f4ef22db45..30427190b6 100644 --- a/waterbox/nyma/common/flatbuffers/allocator.h +++ b/waterbox/nyma/common/flatbuffers/allocator.h @@ -65,4 +65,4 @@ class Allocator { } // namespace flatbuffers -#endif // FLATBUFFERS_ALLOCATOR_H_ \ No newline at end of file +#endif // FLATBUFFERS_ALLOCATOR_H_ diff --git a/waterbox/nyma/common/flatbuffers/array.h b/waterbox/nyma/common/flatbuffers/array.h index d4b73fc9e1..f4bfbf054c 100644 --- a/waterbox/nyma/common/flatbuffers/array.h +++ b/waterbox/nyma/common/flatbuffers/array.h @@ -17,6 +17,9 @@ #ifndef FLATBUFFERS_ARRAY_H_ #define FLATBUFFERS_ARRAY_H_ +#include +#include + #include "flatbuffers/base.h" #include "flatbuffers/stl_emulation.h" #include "flatbuffers/vector.h" @@ -35,7 +38,7 @@ template class Array { public: typedef uint16_t size_type; typedef typename IndirectHelper::return_type return_type; - typedef VectorIterator const_iterator; + typedef VectorConstIterator const_iterator; typedef VectorReverseIterator const_reverse_iterator; // If T is a LE-scalar or a struct (!scalar_tag::value). @@ -156,11 +159,13 @@ template class Array { // Specialization for Array[struct] with access using Offset pointer. // This specialization used by idl_gen_text.cpp. -template class Array, length> { +template class OffsetT> +class Array, length> { static_assert(flatbuffers::is_same::value, "unexpected type T"); public: typedef const void *return_type; + typedef uint16_t size_type; const uint8_t *Data() const { return data_; } @@ -238,6 +243,14 @@ const Array &CastToArrayOfEnum(const T (&arr)[length]) { return *reinterpret_cast *>(arr); } +template +bool operator==(const Array &lhs, + const Array &rhs) noexcept { + return std::addressof(lhs) == std::addressof(rhs) || + (lhs.size() == rhs.size() && + std::memcmp(lhs.Data(), rhs.Data(), rhs.size() * sizeof(T)) == 0); +} + } // namespace flatbuffers #endif // FLATBUFFERS_ARRAY_H_ diff --git a/waterbox/nyma/common/flatbuffers/base.h b/waterbox/nyma/common/flatbuffers/base.h index 038fc3340f..5c4cae791c 100644 --- a/waterbox/nyma/common/flatbuffers/base.h +++ b/waterbox/nyma/common/flatbuffers/base.h @@ -32,7 +32,7 @@ #include #include -#if defined(ARDUINO) && !defined(ARDUINOSTL_M_H) +#if defined(ARDUINO) && !defined(ARDUINOSTL_M_H) && defined(__AVR__) #include #else #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -138,9 +139,9 @@ #endif #endif // !defined(FLATBUFFERS_LITTLEENDIAN) -#define FLATBUFFERS_VERSION_MAJOR 22 -#define FLATBUFFERS_VERSION_MINOR 9 -#define FLATBUFFERS_VERSION_REVISION 24 +#define FLATBUFFERS_VERSION_MAJOR 23 +#define FLATBUFFERS_VERSION_MINOR 5 +#define FLATBUFFERS_VERSION_REVISION 26 #define FLATBUFFERS_STRING_EXPAND(X) #X #define FLATBUFFERS_STRING(X) FLATBUFFERS_STRING_EXPAND(X) namespace flatbuffers { @@ -233,12 +234,17 @@ namespace flatbuffers { } #define FLATBUFFERS_HAS_STRING_VIEW 1 // Check for absl::string_view - #elif __has_include("absl/strings/string_view.h") - #include "absl/strings/string_view.h" - namespace flatbuffers { - typedef absl::string_view string_view; - } - #define FLATBUFFERS_HAS_STRING_VIEW 1 + #elif __has_include("absl/strings/string_view.h") && \ + __has_include("absl/base/config.h") && \ + (__cplusplus >= 201411) + #include "absl/base/config.h" + #if !defined(ABSL_USES_STD_STRING_VIEW) + #include "absl/strings/string_view.h" + namespace flatbuffers { + typedef absl::string_view string_view; + } + #define FLATBUFFERS_HAS_STRING_VIEW 1 + #endif #endif #endif // __has_include #endif // !FLATBUFFERS_HAS_STRING_VIEW @@ -273,14 +279,14 @@ namespace flatbuffers { #endif // !FLATBUFFERS_LOCALE_INDEPENDENT // Suppress Undefined Behavior Sanitizer (recoverable only). Usage: -// - __suppress_ubsan__("undefined") -// - __suppress_ubsan__("signed-integer-overflow") +// - FLATBUFFERS_SUPPRESS_UBSAN("undefined") +// - FLATBUFFERS_SUPPRESS_UBSAN("signed-integer-overflow") #if defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >=7)) - #define __suppress_ubsan__(type) __attribute__((no_sanitize(type))) + #define FLATBUFFERS_SUPPRESS_UBSAN(type) __attribute__((no_sanitize(type))) #elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 409) - #define __suppress_ubsan__(type) __attribute__((no_sanitize_undefined)) + #define FLATBUFFERS_SUPPRESS_UBSAN(type) __attribute__((no_sanitize_undefined)) #else - #define __suppress_ubsan__(type) + #define FLATBUFFERS_SUPPRESS_UBSAN(type) #endif // This is constexpr function used for checking compile-time constants. @@ -318,9 +324,11 @@ namespace flatbuffers { // Also, using a consistent offset type maintains compatibility of serialized // offset values between 32bit and 64bit systems. typedef uint32_t uoffset_t; +typedef uint64_t uoffset64_t; // Signed offsets for references that can go in both directions. typedef int32_t soffset_t; +typedef int64_t soffset64_t; // Offset/index used in v-tables, can be changed to uint8_t in // format forks to save a bit of space if desired. @@ -329,7 +337,8 @@ typedef uint16_t voffset_t; typedef uintmax_t largest_scalar_t; // In 32bits, this evaluates to 2GB - 1 -#define FLATBUFFERS_MAX_BUFFER_SIZE ((1ULL << (sizeof(::flatbuffers::soffset_t) * 8 - 1)) - 1) +#define FLATBUFFERS_MAX_BUFFER_SIZE std::numeric_limits<::flatbuffers::soffset_t>::max() +#define FLATBUFFERS_MAX_64_BUFFER_SIZE std::numeric_limits<::flatbuffers::soffset64_t>::max() // The minimum size buffer that can be a valid flatbuffer. // Includes the offset to the root table (uoffset_t), the offset to the vtable @@ -413,7 +422,7 @@ template T EndianScalar(T t) { template // UBSAN: C++ aliasing type rules, see std::bit_cast<> for details. -__suppress_ubsan__("alignment") +FLATBUFFERS_SUPPRESS_UBSAN("alignment") T ReadScalar(const void *p) { return EndianScalar(*reinterpret_cast(p)); } @@ -427,13 +436,13 @@ T ReadScalar(const void *p) { template // UBSAN: C++ aliasing type rules, see std::bit_cast<> for details. -__suppress_ubsan__("alignment") +FLATBUFFERS_SUPPRESS_UBSAN("alignment") void WriteScalar(void *p, T t) { *reinterpret_cast(p) = EndianScalar(t); } template struct Offset; -template __suppress_ubsan__("alignment") void WriteScalar(void *p, Offset t) { +template FLATBUFFERS_SUPPRESS_UBSAN("alignment") void WriteScalar(void *p, Offset t) { *reinterpret_cast(p) = EndianScalar(t.o); } @@ -444,7 +453,7 @@ template __suppress_ubsan__("alignment") void WriteScalar(void *p, O // Computes how many bytes you'd have to pad to be able to write an // "scalar_size" scalar if the buffer had grown to "buf_size" (downwards in // memory). -__suppress_ubsan__("unsigned-integer-overflow") +FLATBUFFERS_SUPPRESS_UBSAN("unsigned-integer-overflow") inline size_t PaddingBytes(size_t buf_size, size_t scalar_size) { return ((~buf_size) + 1) & (scalar_size - 1); } diff --git a/waterbox/nyma/common/flatbuffers/bfbs_generator.h b/waterbox/nyma/common/flatbuffers/bfbs_generator.h deleted file mode 100644 index 08faeb3eb5..0000000000 --- a/waterbox/nyma/common/flatbuffers/bfbs_generator.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2021 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FLATBUFFERS_BFBS_GENERATOR_H_ -#define FLATBUFFERS_BFBS_GENERATOR_H_ - -#include - -namespace flatbuffers { - -enum GeneratorStatus { - OK, - FAILED, - FAILED_VERIFICATION, -}; - -// A Flatbuffer Code Generator that receives a binary serialized reflection.fbs -// and generates code from it. -class BfbsGenerator { - public: - virtual ~BfbsGenerator() {} - - // Generate code from the provided `buffer` of given `length`. The buffer is - // a serialized reflection.fbs. - virtual GeneratorStatus Generate(const uint8_t *buffer, int64_t length) = 0; -}; - -} // namespace flatbuffers - -#endif // FLATBUFFERS_BFBS_GENERATOR_H_ diff --git a/waterbox/nyma/common/flatbuffers/buffer.h b/waterbox/nyma/common/flatbuffers/buffer.h index ca005f7157..94d4f7903b 100644 --- a/waterbox/nyma/common/flatbuffers/buffer.h +++ b/waterbox/nyma/common/flatbuffers/buffer.h @@ -17,20 +17,41 @@ #ifndef FLATBUFFERS_BUFFER_H_ #define FLATBUFFERS_BUFFER_H_ +#include + #include "flatbuffers/base.h" namespace flatbuffers { // Wrapper for uoffset_t to allow safe template specialization. // Value is allowed to be 0 to indicate a null object (see e.g. AddOffset). -template struct Offset { - uoffset_t o; +template struct Offset { + // The type of offset to use. + typedef uoffset_t offset_type; + + offset_type o; Offset() : o(0) {} - Offset(uoffset_t _o) : o(_o) {} - Offset Union() const { return Offset(o); } + Offset(const offset_type _o) : o(_o) {} + Offset<> Union() const { return o; } bool IsNull() const { return !o; } }; +// Wrapper for uoffset64_t Offsets. +template struct Offset64 { + // The type of offset to use. + typedef uoffset64_t offset_type; + + offset_type o; + Offset64() : o(0) {} + Offset64(const offset_type offset) : o(offset) {} + Offset64<> Union() const { return o; } + bool IsNull() const { return !o; } +}; + +// Litmus check for ensuring the Offsets are the expected size. +static_assert(sizeof(Offset<>) == 4, "Offset has wrong size"); +static_assert(sizeof(Offset64<>) == 8, "Offset64 has wrong size"); + inline void EndianCheck() { int endiantest = 1; // If this fails, see FLATBUFFERS_LITTLEENDIAN above. @@ -73,25 +94,59 @@ template struct IndirectHelper { typedef T return_type; typedef T mutable_return_type; static const size_t element_stride = sizeof(T); - static return_type Read(const uint8_t *p, uoffset_t i) { + + static return_type Read(const uint8_t *p, const size_t i) { return EndianScalar((reinterpret_cast(p))[i]); } -}; -template struct IndirectHelper> { - typedef const T *return_type; - typedef T *mutable_return_type; - static const size_t element_stride = sizeof(uoffset_t); - static return_type Read(const uint8_t *p, uoffset_t i) { - p += i * sizeof(uoffset_t); - return reinterpret_cast(p + ReadScalar(p)); + static mutable_return_type Read(uint8_t *p, const size_t i) { + return reinterpret_cast( + Read(const_cast(p), i)); } }; + +// For vector of Offsets. +template class OffsetT> +struct IndirectHelper> { + typedef const T *return_type; + typedef T *mutable_return_type; + typedef typename OffsetT::offset_type offset_type; + static const offset_type element_stride = sizeof(offset_type); + + static return_type Read(const uint8_t *const p, const offset_type i) { + // Offsets are relative to themselves, so first update the pointer to + // point to the offset location. + const uint8_t *const offset_location = p + i * element_stride; + + // Then read the scalar value of the offset (which may be 32 or 64-bits) and + // then determine the relative location from the offset location. + return reinterpret_cast( + offset_location + ReadScalar(offset_location)); + } + static mutable_return_type Read(uint8_t *const p, const offset_type i) { + // Offsets are relative to themselves, so first update the pointer to + // point to the offset location. + uint8_t *const offset_location = p + i * element_stride; + + // Then read the scalar value of the offset (which may be 32 or 64-bits) and + // then determine the relative location from the offset location. + return reinterpret_cast( + offset_location + ReadScalar(offset_location)); + } +}; + +// For vector of structs. template struct IndirectHelper { typedef const T *return_type; typedef T *mutable_return_type; static const size_t element_stride = sizeof(T); - static return_type Read(const uint8_t *p, uoffset_t i) { - return reinterpret_cast(p + i * sizeof(T)); + + static return_type Read(const uint8_t *const p, const size_t i) { + // Structs are stored inline, relative to the first struct pointer. + return reinterpret_cast(p + i * element_stride); + } + static mutable_return_type Read(uint8_t *const p, const size_t i) { + // Structs are stored inline, relative to the first struct pointer. + return reinterpret_cast(p + i * element_stride); } }; @@ -118,25 +173,27 @@ inline bool BufferHasIdentifier(const void *buf, const char *identifier, /// @cond FLATBUFFERS_INTERNAL // Helpers to get a typed pointer to the root object contained in the buffer. template T *GetMutableRoot(void *buf) { + if (!buf) return nullptr; EndianCheck(); return reinterpret_cast( reinterpret_cast(buf) + EndianScalar(*reinterpret_cast(buf))); } -template T *GetMutableSizePrefixedRoot(void *buf) { - return GetMutableRoot(reinterpret_cast(buf) + - sizeof(uoffset_t)); +template +T *GetMutableSizePrefixedRoot(void *buf) { + return GetMutableRoot(reinterpret_cast(buf) + sizeof(SizeT)); } template const T *GetRoot(const void *buf) { return GetMutableRoot(const_cast(buf)); } -template const T *GetSizePrefixedRoot(const void *buf) { - return GetRoot(reinterpret_cast(buf) + sizeof(uoffset_t)); +template +const T *GetSizePrefixedRoot(const void *buf) { + return GetRoot(reinterpret_cast(buf) + sizeof(SizeT)); } } // namespace flatbuffers -#endif // FLATBUFFERS_BUFFER_H_ \ No newline at end of file +#endif // FLATBUFFERS_BUFFER_H_ diff --git a/waterbox/nyma/common/flatbuffers/buffer_ref.h b/waterbox/nyma/common/flatbuffers/buffer_ref.h index ce30207330..f70941fc64 100644 --- a/waterbox/nyma/common/flatbuffers/buffer_ref.h +++ b/waterbox/nyma/common/flatbuffers/buffer_ref.h @@ -50,4 +50,4 @@ template struct BufferRef : BufferRefBase { } // namespace flatbuffers -#endif // FLATBUFFERS_BUFFER_REF_H_ \ No newline at end of file +#endif // FLATBUFFERS_BUFFER_REF_H_ diff --git a/waterbox/nyma/common/flatbuffers/code_generator.h b/waterbox/nyma/common/flatbuffers/code_generator.h new file mode 100644 index 0000000000..2971e556ee --- /dev/null +++ b/waterbox/nyma/common/flatbuffers/code_generator.h @@ -0,0 +1,97 @@ +/* + * Copyright 2023 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FLATBUFFERS_CODE_GENERATOR_H_ +#define FLATBUFFERS_CODE_GENERATOR_H_ + +#include + +#include "flatbuffers/idl.h" + +namespace flatbuffers { + +struct CodeGenOptions { + std::string output_path; +}; + +// A code generator interface for producing converting flatbuffer schema into +// code. +class CodeGenerator { + public: + virtual ~CodeGenerator() = default; + + enum Status { + OK = 0, + ERROR = 1, + FAILED_VERIFICATION = 2, + NOT_IMPLEMENTED = 3 + }; + + std::string status_detail; + + // Generate code from the provided `parser`. + // + // DEPRECATED: prefer using the other overload of GenerateCode for bfbs. + virtual Status GenerateCode(const Parser &parser, const std::string &path, + const std::string &filename) = 0; + + // Generate code from the provided `parser` and place it in the output. + virtual Status GenerateCodeString(const Parser &parser, + const std::string &filename, + std::string &output) { + (void)parser; + (void)filename; + (void)output; + return Status::NOT_IMPLEMENTED; + } + + // Generate code from the provided `buffer` of given `length`. The buffer is a + // serialized reflection.fbs. + virtual Status GenerateCode(const uint8_t *buffer, int64_t length, + const CodeGenOptions &options) = 0; + + virtual Status GenerateMakeRule(const Parser &parser, const std::string &path, + const std::string &filename, + std::string &output) = 0; + + virtual Status GenerateGrpcCode(const Parser &parser, const std::string &path, + const std::string &filename) = 0; + + virtual Status GenerateRootFile(const Parser &parser, + const std::string &path) = 0; + + virtual bool IsSchemaOnly() const = 0; + + virtual bool SupportsBfbsGeneration() const = 0; + + virtual bool SupportsRootFileGeneration() const = 0; + + virtual IDLOptions::Language Language() const = 0; + + virtual std::string LanguageName() const = 0; + + protected: + CodeGenerator() = default; + + private: + // Copying is not supported. + CodeGenerator(const CodeGenerator &) = delete; + CodeGenerator &operator=(const CodeGenerator &) = delete; +}; + +} // namespace flatbuffers + +#endif // FLATBUFFERS_CODE_GENERATOR_H_ diff --git a/waterbox/nyma/common/flatbuffers/code_generators.h b/waterbox/nyma/common/flatbuffers/code_generators.h index 727552118f..fc030d4394 100644 --- a/waterbox/nyma/common/flatbuffers/code_generators.h +++ b/waterbox/nyma/common/flatbuffers/code_generators.h @@ -229,6 +229,10 @@ class TypedFloatConstantGenerator : public FloatConstantGenerator { const std::string neg_inf_number_; }; +std::string JavaCSharpMakeRule(const bool java, const Parser &parser, + const std::string &path, + const std::string &file_name); + } // namespace flatbuffers #endif // FLATBUFFERS_CODE_GENERATORS_H_ diff --git a/waterbox/nyma/common/flatbuffers/default_allocator.h b/waterbox/nyma/common/flatbuffers/default_allocator.h index 8b173af11b..d4724122cb 100644 --- a/waterbox/nyma/common/flatbuffers/default_allocator.h +++ b/waterbox/nyma/common/flatbuffers/default_allocator.h @@ -61,4 +61,4 @@ inline uint8_t *ReallocateDownward(Allocator *allocator, uint8_t *old_p, } // namespace flatbuffers -#endif // FLATBUFFERS_DEFAULT_ALLOCATOR_H_ \ No newline at end of file +#endif // FLATBUFFERS_DEFAULT_ALLOCATOR_H_ diff --git a/waterbox/nyma/common/flatbuffers/detached_buffer.h b/waterbox/nyma/common/flatbuffers/detached_buffer.h index 760a088453..5e900baeb5 100644 --- a/waterbox/nyma/common/flatbuffers/detached_buffer.h +++ b/waterbox/nyma/common/flatbuffers/detached_buffer.h @@ -45,7 +45,7 @@ class DetachedBuffer { cur_(cur), size_(sz) {} - DetachedBuffer(DetachedBuffer &&other) + DetachedBuffer(DetachedBuffer &&other) noexcept : allocator_(other.allocator_), own_allocator_(other.own_allocator_), buf_(other.buf_), @@ -55,7 +55,7 @@ class DetachedBuffer { other.reset(); } - DetachedBuffer &operator=(DetachedBuffer &&other) { + DetachedBuffer &operator=(DetachedBuffer &&other) noexcept { if (this == &other) return *this; destroy(); diff --git a/waterbox/nyma/common/flatbuffers/file_manager.h b/waterbox/nyma/common/flatbuffers/file_manager.h new file mode 100644 index 0000000000..069df5b884 --- /dev/null +++ b/waterbox/nyma/common/flatbuffers/file_manager.h @@ -0,0 +1,48 @@ +/* + * Copyright 2023 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FLATBUFFERS_FILE_MANAGER_H_ +#define FLATBUFFERS_FILE_MANAGER_H_ + +#include +#include + +#include "flatbuffers/util.h" + +namespace flatbuffers { + +// A File interface to write data to file by default or +// save only file names +class FileManager { + public: + FileManager() = default; + virtual ~FileManager() = default; + + virtual bool SaveFile(const std::string &absolute_file_name, + const std::string &content) = 0; + + virtual bool LoadFile(const std::string &absolute_file_name, + std::string *buf) = 0; + + private: + // Copying is not supported. + FileManager(const FileManager &) = delete; + FileManager &operator=(const FileManager &) = delete; +}; + +} // namespace flatbuffers + +#endif // FLATBUFFERS_FILE_MANAGER_H_ diff --git a/waterbox/nyma/common/flatbuffers/flatbuffer_builder.h b/waterbox/nyma/common/flatbuffers/flatbuffer_builder.h index 66c33ffccd..0a38b4ac31 100644 --- a/waterbox/nyma/common/flatbuffers/flatbuffer_builder.h +++ b/waterbox/nyma/common/flatbuffers/flatbuffer_builder.h @@ -17,12 +17,16 @@ #ifndef FLATBUFFERS_FLATBUFFER_BUILDER_H_ #define FLATBUFFERS_FLATBUFFER_BUILDER_H_ +#include +#include #include #include +#include #include "flatbuffers/allocator.h" #include "flatbuffers/array.h" #include "flatbuffers/base.h" +#include "flatbuffers/buffer.h" #include "flatbuffers/buffer_ref.h" #include "flatbuffers/default_allocator.h" #include "flatbuffers/detached_buffer.h" @@ -39,8 +43,9 @@ namespace flatbuffers { // Converts a Field ID to a virtual table offset. inline voffset_t FieldIndexToOffset(voffset_t field_id) { // Should correspond to what EndTable() below builds up. - const int fixed_fields = 2; // Vtable size and Object Size. - return static_cast((field_id + fixed_fields) * sizeof(voffset_t)); + const voffset_t fixed_fields = + 2 * sizeof(voffset_t); // Vtable size and Object Size. + return fixed_fields + field_id * sizeof(voffset_t); } template> @@ -67,8 +72,13 @@ T *data(std::vector &v) { /// `PushElement`/`AddElement`/`EndTable`, or the builtin `CreateString`/ /// `CreateVector` functions. Do this is depth-first order to build up a tree to /// the root. `Finish()` wraps up the buffer ready for transport. -class FlatBufferBuilder { +template class FlatBufferBuilderImpl { public: + // This switches the size type of the builder, based on if its 64-bit aware + // (uoffset64_t) or not (uoffset_t). + typedef + typename std::conditional::type SizeT; + /// @brief Default constructor for FlatBufferBuilder. /// @param[in] initial_size The initial size of the buffer, in bytes. Defaults /// to `1024`. @@ -80,13 +90,16 @@ class FlatBufferBuilder { /// minimum alignment upon reallocation. Only needed if you intend to store /// types with custom alignment AND you wish to read the buffer in-place /// directly after creation. - explicit FlatBufferBuilder( + explicit FlatBufferBuilderImpl( size_t initial_size = 1024, Allocator *allocator = nullptr, bool own_allocator = false, size_t buffer_minalign = AlignOf()) - : buf_(initial_size, allocator, own_allocator, buffer_minalign), + : buf_(initial_size, allocator, own_allocator, buffer_minalign, + static_cast(Is64Aware ? FLATBUFFERS_MAX_64_BUFFER_SIZE + : FLATBUFFERS_MAX_BUFFER_SIZE)), num_field_loc(0), max_voffset_(0), + length_of_64_bit_region_(0), nested(false), finished(false), minalign_(1), @@ -97,10 +110,13 @@ class FlatBufferBuilder { } /// @brief Move constructor for FlatBufferBuilder. - FlatBufferBuilder(FlatBufferBuilder &&other) - : buf_(1024, nullptr, false, AlignOf()), + FlatBufferBuilderImpl(FlatBufferBuilderImpl &&other) noexcept + : buf_(1024, nullptr, false, AlignOf(), + static_cast(Is64Aware ? FLATBUFFERS_MAX_64_BUFFER_SIZE + : FLATBUFFERS_MAX_BUFFER_SIZE)), num_field_loc(0), max_voffset_(0), + length_of_64_bit_region_(0), nested(false), finished(false), minalign_(1), @@ -115,18 +131,19 @@ class FlatBufferBuilder { } /// @brief Move assignment operator for FlatBufferBuilder. - FlatBufferBuilder &operator=(FlatBufferBuilder &&other) { + FlatBufferBuilderImpl &operator=(FlatBufferBuilderImpl &&other) noexcept { // Move construct a temporary and swap idiom - FlatBufferBuilder temp(std::move(other)); + FlatBufferBuilderImpl temp(std::move(other)); Swap(temp); return *this; } - void Swap(FlatBufferBuilder &other) { + void Swap(FlatBufferBuilderImpl &other) { using std::swap; buf_.swap(other.buf_); swap(num_field_loc, other.num_field_loc); swap(max_voffset_, other.max_voffset_); + swap(length_of_64_bit_region_, other.length_of_64_bit_region_); swap(nested, other.nested); swap(finished, other.finished); swap(minalign_, other.minalign_); @@ -135,7 +152,7 @@ class FlatBufferBuilder { swap(string_pool, other.string_pool); } - ~FlatBufferBuilder() { + ~FlatBufferBuilderImpl() { if (string_pool) delete string_pool; } @@ -152,12 +169,36 @@ class FlatBufferBuilder { nested = false; finished = false; minalign_ = 1; + length_of_64_bit_region_ = 0; if (string_pool) string_pool->clear(); } /// @brief The current size of the serialized buffer, counting from the end. + /// @return Returns an `SizeT` with the current size of the buffer. + SizeT GetSize() const { return buf_.size(); } + + /// @brief The current size of the serialized buffer relative to the end of + /// the 32-bit region. /// @return Returns an `uoffset_t` with the current size of the buffer. - uoffset_t GetSize() const { return buf_.size(); } + template + // Only enable this method for the 64-bit builder, as only that builder is + // concerned with the 32/64-bit boundary, and should be the one to bare any + // run time costs. + typename std::enable_if::type GetSizeRelative32BitRegion() + const { + //[32-bit region][64-bit region] + // [XXXXXXXXXXXXXXXXXXX] GetSize() + // [YYYYYYYYYYYYY] length_of_64_bit_region_ + // [ZZZZ] return size + return static_cast(GetSize() - length_of_64_bit_region_); + } + + template + // Only enable this method for the 32-bit builder. + typename std::enable_if::type GetSizeRelative32BitRegion() + const { + return static_cast(GetSize()); + } /// @brief Get the serialized buffer (after you call `Finish()`). /// @return Returns an `uint8_t` pointer to the FlatBuffer data inside the @@ -269,14 +310,16 @@ class FlatBufferBuilder { } // Write a single aligned scalar to the buffer - template uoffset_t PushElement(T element) { + template + ReturnT PushElement(T element) { AssertScalarT(); Align(sizeof(T)); buf_.push_small(EndianScalar(element)); - return GetSize(); + return CalculateOffset(); } - template uoffset_t PushElement(Offset off) { + template class OffsetT = Offset> + uoffset_t PushElement(OffsetT off) { // Special case for offsets: see ReferTo below. return PushElement(ReferTo(off.o)); } @@ -306,11 +349,16 @@ class FlatBufferBuilder { AddElement(field, ReferTo(off.o), static_cast(0)); } + template void AddOffset(voffset_t field, Offset64 off) { + if (off.IsNull()) return; // Don't store. + AddElement(field, ReferTo(off.o), static_cast(0)); + } + template void AddStruct(voffset_t field, const T *structptr) { if (!structptr) return; // Default, don't store. Align(AlignOf()); buf_.push_small(*structptr); - TrackField(field, GetSize()); + TrackField(field, CalculateOffset()); } void AddStructOffset(voffset_t field, uoffset_t off) { @@ -321,12 +369,29 @@ class FlatBufferBuilder { // This function converts them to be relative to the current location // in the buffer (when stored here), pointing upwards. uoffset_t ReferTo(uoffset_t off) { - // Align to ensure GetSize() below is correct. + // Align to ensure GetSizeRelative32BitRegion() below is correct. Align(sizeof(uoffset_t)); - // Offset must refer to something already in buffer. - const uoffset_t size = GetSize(); + // 32-bit offsets are relative to the tail of the 32-bit region of the + // buffer. For most cases (without 64-bit entities) this is equivalent to + // size of the whole buffer (e.g. GetSize()) + return ReferTo(off, GetSizeRelative32BitRegion()); + } + + uoffset64_t ReferTo(uoffset64_t off) { + // Align to ensure GetSize() below is correct. + Align(sizeof(uoffset64_t)); + // 64-bit offsets are relative to tail of the whole buffer + return ReferTo(off, GetSize()); + } + + template T ReferTo(const T off, const T2 size) { FLATBUFFERS_ASSERT(off && off <= size); - return size - off + static_cast(sizeof(uoffset_t)); + return size - off + static_cast(sizeof(T)); + } + + template T ReferTo(const T off, const T size) { + FLATBUFFERS_ASSERT(off && off <= size); + return size - off + static_cast(sizeof(T)); } void NotNested() { @@ -348,7 +413,7 @@ class FlatBufferBuilder { uoffset_t StartTable() { NotNested(); nested = true; - return GetSize(); + return GetSizeRelative32BitRegion(); } // This finishes one serialized object by generating the vtable if it's a @@ -359,7 +424,9 @@ class FlatBufferBuilder { FLATBUFFERS_ASSERT(nested); // Write the vtable offset, which is the start of any Table. // We fill its value later. - auto vtableoffsetloc = PushElement(0); + // This is relative to the end of the 32-bit region. + const uoffset_t vtable_offset_loc = + static_cast(PushElement(0)); // Write a vtable, which consists entirely of voffset_t elements. // It starts with the number of offsets, followed by a type id, followed // by the offsets themselves. In reverse: @@ -369,7 +436,7 @@ class FlatBufferBuilder { (std::max)(static_cast(max_voffset_ + sizeof(voffset_t)), FieldIndexToOffset(0)); buf_.fill_big(max_voffset_); - auto table_object_size = vtableoffsetloc - start; + const uoffset_t table_object_size = vtable_offset_loc - start; // Vtable use 16bit offsets. FLATBUFFERS_ASSERT(table_object_size < 0x10000); WriteScalar(buf_.data() + sizeof(voffset_t), @@ -379,7 +446,8 @@ class FlatBufferBuilder { for (auto it = buf_.scratch_end() - num_field_loc * sizeof(FieldLoc); it < buf_.scratch_end(); it += sizeof(FieldLoc)) { auto field_location = reinterpret_cast(it); - auto pos = static_cast(vtableoffsetloc - field_location->off); + const voffset_t pos = + static_cast(vtable_offset_loc - field_location->off); // If this asserts, it means you've set a field twice. FLATBUFFERS_ASSERT( !ReadScalar(buf_.data() + field_location->id)); @@ -388,7 +456,7 @@ class FlatBufferBuilder { ClearOffsets(); auto vt1 = reinterpret_cast(buf_.data()); auto vt1_size = ReadScalar(vt1); - auto vt_use = GetSize(); + auto vt_use = GetSizeRelative32BitRegion(); // See if we already have generated a vtable with this exact same // layout before. If so, make it point to the old one, remove this one. if (dedup_vtables_) { @@ -399,23 +467,24 @@ class FlatBufferBuilder { auto vt2_size = ReadScalar(vt2); if (vt1_size != vt2_size || 0 != memcmp(vt2, vt1, vt1_size)) continue; vt_use = *vt_offset_ptr; - buf_.pop(GetSize() - vtableoffsetloc); + buf_.pop(GetSizeRelative32BitRegion() - vtable_offset_loc); break; } } // If this is a new vtable, remember it. - if (vt_use == GetSize()) { buf_.scratch_push_small(vt_use); } + if (vt_use == GetSizeRelative32BitRegion()) { + buf_.scratch_push_small(vt_use); + } // Fill the vtable offset we created above. - // The offset points from the beginning of the object to where the - // vtable is stored. + // The offset points from the beginning of the object to where the vtable is + // stored. // Offsets default direction is downward in memory for future format // flexibility (storing all vtables at the start of the file). - WriteScalar(buf_.data_at(vtableoffsetloc), + WriteScalar(buf_.data_at(vtable_offset_loc + length_of_64_bit_region_), static_cast(vt_use) - - static_cast(vtableoffsetloc)); - + static_cast(vtable_offset_loc)); nested = false; - return vtableoffsetloc; + return vtable_offset_loc; } FLATBUFFERS_ATTRIBUTE([[deprecated("call the version above instead")]]) @@ -425,14 +494,20 @@ class FlatBufferBuilder { // This checks a required field has been set in a given table that has // just been constructed. - template void Required(Offset table, voffset_t field); + template void Required(Offset table, voffset_t field) { + auto table_ptr = reinterpret_cast(buf_.data_at(table.o)); + bool ok = table_ptr->GetOptionalFieldOffset(field) != 0; + // If this fails, the caller will show what field needs to be set. + FLATBUFFERS_ASSERT(ok); + (void)ok; + } uoffset_t StartStruct(size_t alignment) { Align(alignment); - return GetSize(); + return GetSizeRelative32BitRegion(); } - uoffset_t EndStruct() { return GetSize(); } + uoffset_t EndStruct() { return GetSizeRelative32BitRegion(); } void ClearOffsets() { buf_.scratch_pop(num_field_loc * sizeof(FieldLoc)); @@ -441,15 +516,18 @@ class FlatBufferBuilder { } // Aligns such that when "len" bytes are written, an object can be written - // after it with "alignment" without padding. + // after it (forward in the buffer) with "alignment" without padding. void PreAlign(size_t len, size_t alignment) { if (len == 0) return; TrackMinAlign(alignment); buf_.fill(PaddingBytes(GetSize() + len, alignment)); } - template void PreAlign(size_t len) { - AssertScalarT(); - PreAlign(len, AlignOf()); + + // Aligns such than when "len" bytes are written, an object of type `AlignT` + // can be written after it (forward in the buffer) without padding. + template void PreAlign(size_t len) { + AssertScalarT(); + PreAlign(len, AlignOf()); } /// @endcond @@ -457,34 +535,35 @@ class FlatBufferBuilder { /// @param[in] str A const char pointer to the data to be stored as a string. /// @param[in] len The number of bytes that should be stored from `str`. /// @return Returns the offset in the buffer where the string starts. - Offset CreateString(const char *str, size_t len) { - NotNested(); - PreAlign(len + 1); // Always 0-terminated. - buf_.fill(1); - PushBytes(reinterpret_cast(str), len); - PushElement(static_cast(len)); - return Offset(GetSize()); + template class OffsetT = Offset> + OffsetT CreateString(const char *str, size_t len) { + CreateStringImpl(str, len); + return OffsetT( + CalculateOffset::offset_type>()); } /// @brief Store a string in the buffer, which is null-terminated. /// @param[in] str A const char pointer to a C-string to add to the buffer. /// @return Returns the offset in the buffer where the string starts. - Offset CreateString(const char *str) { - return CreateString(str, strlen(str)); + template class OffsetT = Offset> + OffsetT CreateString(const char *str) { + return CreateString(str, strlen(str)); } /// @brief Store a string in the buffer, which is null-terminated. /// @param[in] str A char pointer to a C-string to add to the buffer. /// @return Returns the offset in the buffer where the string starts. - Offset CreateString(char *str) { - return CreateString(str, strlen(str)); + template class OffsetT = Offset> + OffsetT CreateString(char *str) { + return CreateString(str, strlen(str)); } /// @brief Store a string in the buffer, which can contain any binary data. /// @param[in] str A const reference to a std::string to store in the buffer. /// @return Returns the offset in the buffer where the string starts. - Offset CreateString(const std::string &str) { - return CreateString(str.c_str(), str.length()); + template class OffsetT = Offset> + OffsetT CreateString(const std::string &str) { + return CreateString(str.c_str(), str.length()); } // clang-format off @@ -492,8 +571,9 @@ class FlatBufferBuilder { /// @brief Store a string in the buffer, which can contain any binary data. /// @param[in] str A const string_view to copy in to the buffer. /// @return Returns the offset in the buffer where the string starts. - Offset CreateString(flatbuffers::string_view str) { - return CreateString(str.data(), str.size()); + template