diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index b446987f..cc639af5 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -239,6 +239,9 @@ struct HIDSettingsBuilder; struct TimeoutSettings; struct TimeoutSettingsBuilder; +struct VelocitySettings; +struct VelocitySettingsBuilder; + struct TapDetectionSetupNotification; struct TapDetectionSetupNotificationBuilder; @@ -7390,7 +7393,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_RESETS_SETTINGS = 22, VT_STAY_ALIGNED = 24, VT_HID_SETTINGS = 26, - VT_TIMEOUT = 28 + VT_TIMEOUT = 28, + VT_VELOCITY_SETTINGS = 30 }; const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const { return GetPointer(VT_STEAM_VR_TRACKERS); @@ -7431,6 +7435,9 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const solarxr_protocol::rpc::TimeoutSettings *timeout() const { return GetPointer(VT_TIMEOUT); } + const solarxr_protocol::rpc::VelocitySettings *velocity_settings() const { + return GetPointer(VT_VELOCITY_SETTINGS); + } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) && @@ -7459,6 +7466,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyTable(hid_settings()) && VerifyOffset(verifier, VT_TIMEOUT) && verifier.VerifyTable(timeout()) && + VerifyOffset(verifier, VT_VELOCITY_SETTINGS) && + verifier.VerifyTable(velocity_settings()) && verifier.EndTable(); } }; @@ -7506,6 +7515,9 @@ struct SettingsResponseBuilder { void add_timeout(flatbuffers::Offset timeout) { fbb_.AddOffset(SettingsResponse::VT_TIMEOUT, timeout); } + void add_velocity_settings(flatbuffers::Offset velocity_settings) { + fbb_.AddOffset(SettingsResponse::VT_VELOCITY_SETTINGS, velocity_settings); + } explicit SettingsResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); @@ -7531,8 +7543,10 @@ inline flatbuffers::Offset CreateSettingsResponse( flatbuffers::Offset resets_settings = 0, flatbuffers::Offset stay_aligned = 0, flatbuffers::Offset hid_settings = 0, - flatbuffers::Offset timeout = 0) { + flatbuffers::Offset timeout = 0, + flatbuffers::Offset velocity_settings = 0) { SettingsResponseBuilder builder_(_fbb); + builder_.add_velocity_settings(velocity_settings); builder_.add_timeout(timeout); builder_.add_hid_settings(hid_settings); builder_.add_stay_aligned(stay_aligned); @@ -7564,7 +7578,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl VT_RESETS_SETTINGS = 22, VT_STAY_ALIGNED = 24, VT_HID_SETTINGS = 26, - VT_TIMEOUT = 28 + VT_TIMEOUT = 28, + VT_VELOCITY_SETTINGS = 30 }; const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const { return GetPointer(VT_STEAM_VR_TRACKERS); @@ -7605,6 +7620,9 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl const solarxr_protocol::rpc::TimeoutSettings *timeout() const { return GetPointer(VT_TIMEOUT); } + const solarxr_protocol::rpc::VelocitySettings *velocity_settings() const { + return GetPointer(VT_VELOCITY_SETTINGS); + } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) && @@ -7633,6 +7651,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl verifier.VerifyTable(hid_settings()) && VerifyOffset(verifier, VT_TIMEOUT) && verifier.VerifyTable(timeout()) && + VerifyOffset(verifier, VT_VELOCITY_SETTINGS) && + verifier.VerifyTable(velocity_settings()) && verifier.EndTable(); } }; @@ -7680,6 +7700,9 @@ struct ChangeSettingsRequestBuilder { void add_timeout(flatbuffers::Offset timeout) { fbb_.AddOffset(ChangeSettingsRequest::VT_TIMEOUT, timeout); } + void add_velocity_settings(flatbuffers::Offset velocity_settings) { + fbb_.AddOffset(ChangeSettingsRequest::VT_VELOCITY_SETTINGS, velocity_settings); + } explicit ChangeSettingsRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); @@ -7705,8 +7728,10 @@ inline flatbuffers::Offset CreateChangeSettingsRequest( flatbuffers::Offset resets_settings = 0, flatbuffers::Offset stay_aligned = 0, flatbuffers::Offset hid_settings = 0, - flatbuffers::Offset timeout = 0) { + flatbuffers::Offset timeout = 0, + flatbuffers::Offset velocity_settings = 0) { ChangeSettingsRequestBuilder builder_(_fbb); + builder_.add_velocity_settings(velocity_settings); builder_.add_timeout(timeout); builder_.add_hid_settings(hid_settings); builder_.add_stay_aligned(stay_aligned); @@ -8902,6 +8927,47 @@ inline flatbuffers::Offset CreateTimeoutSettings( return builder_.Finish(); } +struct VelocitySettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { + typedef VelocitySettingsBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_SEND_DERIVED_VELOCITY = 4 + }; + bool send_derived_velocity() const { + return GetField(VT_SEND_DERIVED_VELOCITY, 0) != 0; + } + bool Verify(flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyField(verifier, VT_SEND_DERIVED_VELOCITY, 1) && + verifier.EndTable(); + } +}; + +struct VelocitySettingsBuilder { + typedef VelocitySettings Table; + flatbuffers::FlatBufferBuilder &fbb_; + flatbuffers::uoffset_t start_; + void add_send_derived_velocity(bool send_derived_velocity) { + fbb_.AddElement(VelocitySettings::VT_SEND_DERIVED_VELOCITY, static_cast(send_derived_velocity), 0); + } + explicit VelocitySettingsBuilder(flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = flatbuffers::Offset(end); + return o; + } +}; + +inline flatbuffers::Offset CreateVelocitySettings( + flatbuffers::FlatBufferBuilder &_fbb, + bool send_derived_velocity = false) { + VelocitySettingsBuilder builder_(_fbb); + builder_.add_send_derived_velocity(send_derived_velocity); + return builder_.Finish(); +} + /// See TapDetectionSettings::setup_mode struct TapDetectionSetupNotification FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { typedef TapDetectionSetupNotificationBuilder Builder; diff --git a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java index 785cb55a..883ce72e 100644 --- a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java +++ b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java @@ -41,6 +41,8 @@ public final class ChangeSettingsRequest extends Table { public solarxr_protocol.rpc.HIDSettings hidSettings(solarxr_protocol.rpc.HIDSettings obj) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.TimeoutSettings timeout() { return timeout(new solarxr_protocol.rpc.TimeoutSettings()); } public solarxr_protocol.rpc.TimeoutSettings timeout(solarxr_protocol.rpc.TimeoutSettings obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public solarxr_protocol.rpc.VelocitySettings velocitySettings() { return velocitySettings(new solarxr_protocol.rpc.VelocitySettings()); } + public solarxr_protocol.rpc.VelocitySettings velocitySettings(solarxr_protocol.rpc.VelocitySettings obj) { int o = __offset(30); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public static int createChangeSettingsRequest(FlatBufferBuilder builder, int steamVrTrackersOffset, @@ -55,8 +57,10 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder, int resetsSettingsOffset, int stayAlignedOffset, int hidSettingsOffset, - int timeoutOffset) { - builder.startTable(13); + int timeoutOffset, + int velocitySettingsOffset) { + builder.startTable(14); + ChangeSettingsRequest.addVelocitySettings(builder, velocitySettingsOffset); ChangeSettingsRequest.addTimeout(builder, timeoutOffset); ChangeSettingsRequest.addHidSettings(builder, hidSettingsOffset); ChangeSettingsRequest.addStayAligned(builder, stayAlignedOffset); @@ -73,7 +77,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder, return ChangeSettingsRequest.endChangeSettingsRequest(builder); } - public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(13); } + public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(14); } public static void addSteamVrTrackers(FlatBufferBuilder builder, int steamVrTrackersOffset) { builder.addOffset(0, steamVrTrackersOffset, 0); } public static void addFiltering(FlatBufferBuilder builder, int filteringOffset) { builder.addOffset(1, filteringOffset, 0); } public static void addDriftCompensation(FlatBufferBuilder builder, int driftCompensationOffset) { builder.addOffset(2, driftCompensationOffset, 0); } @@ -87,6 +91,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder, public static void addStayAligned(FlatBufferBuilder builder, int stayAlignedOffset) { builder.addOffset(10, stayAlignedOffset, 0); } public static void addHidSettings(FlatBufferBuilder builder, int hidSettingsOffset) { builder.addOffset(11, hidSettingsOffset, 0); } public static void addTimeout(FlatBufferBuilder builder, int timeoutOffset) { builder.addOffset(12, timeoutOffset, 0); } + public static void addVelocitySettings(FlatBufferBuilder builder, int velocitySettingsOffset) { builder.addOffset(13, velocitySettingsOffset, 0); } public static int endChangeSettingsRequest(FlatBufferBuilder builder) { int o = builder.endTable(); return o; @@ -130,6 +135,8 @@ public void unpackTo(ChangeSettingsRequestT _o) { else _o.setHidSettings(null); if (timeout() != null) _o.setTimeout(timeout().unpack()); else _o.setTimeout(null); + if (velocitySettings() != null) _o.setVelocitySettings(velocitySettings().unpack()); + else _o.setVelocitySettings(null); } public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) { if (_o == null) return 0; @@ -146,6 +153,7 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) { int _stayAligned = _o.getStayAligned() == null ? 0 : solarxr_protocol.rpc.StayAlignedSettings.pack(builder, _o.getStayAligned()); int _hidSettings = _o.getHidSettings() == null ? 0 : solarxr_protocol.rpc.HIDSettings.pack(builder, _o.getHidSettings()); int _timeout = _o.getTimeout() == null ? 0 : solarxr_protocol.rpc.TimeoutSettings.pack(builder, _o.getTimeout()); + int _velocitySettings = _o.getVelocitySettings() == null ? 0 : solarxr_protocol.rpc.VelocitySettings.pack(builder, _o.getVelocitySettings()); return createChangeSettingsRequest( builder, _steamVrTrackers, @@ -160,7 +168,8 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) { _resetsSettings, _stayAligned, _hidSettings, - _timeout); + _timeout, + _velocitySettings); } } diff --git a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java index 0063f43a..dd488d26 100644 --- a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java +++ b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java @@ -21,6 +21,7 @@ public class ChangeSettingsRequestT { private solarxr_protocol.rpc.StayAlignedSettingsT stayAligned; private solarxr_protocol.rpc.HIDSettingsT hidSettings; private solarxr_protocol.rpc.TimeoutSettingsT timeout; + private solarxr_protocol.rpc.VelocitySettingsT velocitySettings; public solarxr_protocol.rpc.SteamVRTrackersSettingT getSteamVrTrackers() { return steamVrTrackers; } @@ -74,6 +75,10 @@ public class ChangeSettingsRequestT { public void setTimeout(solarxr_protocol.rpc.TimeoutSettingsT timeout) { this.timeout = timeout; } + public solarxr_protocol.rpc.VelocitySettingsT getVelocitySettings() { return velocitySettings; } + + public void setVelocitySettings(solarxr_protocol.rpc.VelocitySettingsT velocitySettings) { this.velocitySettings = velocitySettings; } + public ChangeSettingsRequestT() { this.steamVrTrackers = null; @@ -89,6 +94,7 @@ public ChangeSettingsRequestT() { this.stayAligned = null; this.hidSettings = null; this.timeout = null; + this.velocitySettings = null; } } diff --git a/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java b/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java index 8443065e..651522f0 100644 --- a/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java +++ b/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java @@ -41,6 +41,8 @@ public final class SettingsResponse extends Table { public solarxr_protocol.rpc.HIDSettings hidSettings(solarxr_protocol.rpc.HIDSettings obj) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.TimeoutSettings timeout() { return timeout(new solarxr_protocol.rpc.TimeoutSettings()); } public solarxr_protocol.rpc.TimeoutSettings timeout(solarxr_protocol.rpc.TimeoutSettings obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public solarxr_protocol.rpc.VelocitySettings velocitySettings() { return velocitySettings(new solarxr_protocol.rpc.VelocitySettings()); } + public solarxr_protocol.rpc.VelocitySettings velocitySettings(solarxr_protocol.rpc.VelocitySettings obj) { int o = __offset(30); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public static int createSettingsResponse(FlatBufferBuilder builder, int steamVrTrackersOffset, @@ -55,8 +57,10 @@ public static int createSettingsResponse(FlatBufferBuilder builder, int resetsSettingsOffset, int stayAlignedOffset, int hidSettingsOffset, - int timeoutOffset) { - builder.startTable(13); + int timeoutOffset, + int velocitySettingsOffset) { + builder.startTable(14); + SettingsResponse.addVelocitySettings(builder, velocitySettingsOffset); SettingsResponse.addTimeout(builder, timeoutOffset); SettingsResponse.addHidSettings(builder, hidSettingsOffset); SettingsResponse.addStayAligned(builder, stayAlignedOffset); @@ -73,7 +77,7 @@ public static int createSettingsResponse(FlatBufferBuilder builder, return SettingsResponse.endSettingsResponse(builder); } - public static void startSettingsResponse(FlatBufferBuilder builder) { builder.startTable(13); } + public static void startSettingsResponse(FlatBufferBuilder builder) { builder.startTable(14); } public static void addSteamVrTrackers(FlatBufferBuilder builder, int steamVrTrackersOffset) { builder.addOffset(0, steamVrTrackersOffset, 0); } public static void addFiltering(FlatBufferBuilder builder, int filteringOffset) { builder.addOffset(1, filteringOffset, 0); } public static void addDriftCompensation(FlatBufferBuilder builder, int driftCompensationOffset) { builder.addOffset(2, driftCompensationOffset, 0); } @@ -87,6 +91,7 @@ public static int createSettingsResponse(FlatBufferBuilder builder, public static void addStayAligned(FlatBufferBuilder builder, int stayAlignedOffset) { builder.addOffset(10, stayAlignedOffset, 0); } public static void addHidSettings(FlatBufferBuilder builder, int hidSettingsOffset) { builder.addOffset(11, hidSettingsOffset, 0); } public static void addTimeout(FlatBufferBuilder builder, int timeoutOffset) { builder.addOffset(12, timeoutOffset, 0); } + public static void addVelocitySettings(FlatBufferBuilder builder, int velocitySettingsOffset) { builder.addOffset(13, velocitySettingsOffset, 0); } public static int endSettingsResponse(FlatBufferBuilder builder) { int o = builder.endTable(); return o; @@ -130,6 +135,8 @@ public void unpackTo(SettingsResponseT _o) { else _o.setHidSettings(null); if (timeout() != null) _o.setTimeout(timeout().unpack()); else _o.setTimeout(null); + if (velocitySettings() != null) _o.setVelocitySettings(velocitySettings().unpack()); + else _o.setVelocitySettings(null); } public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) { if (_o == null) return 0; @@ -146,6 +153,7 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) { int _stayAligned = _o.getStayAligned() == null ? 0 : solarxr_protocol.rpc.StayAlignedSettings.pack(builder, _o.getStayAligned()); int _hidSettings = _o.getHidSettings() == null ? 0 : solarxr_protocol.rpc.HIDSettings.pack(builder, _o.getHidSettings()); int _timeout = _o.getTimeout() == null ? 0 : solarxr_protocol.rpc.TimeoutSettings.pack(builder, _o.getTimeout()); + int _velocitySettings = _o.getVelocitySettings() == null ? 0 : solarxr_protocol.rpc.VelocitySettings.pack(builder, _o.getVelocitySettings()); return createSettingsResponse( builder, _steamVrTrackers, @@ -160,7 +168,8 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) { _resetsSettings, _stayAligned, _hidSettings, - _timeout); + _timeout, + _velocitySettings); } } diff --git a/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java b/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java index 10e9c571..30f73a0f 100644 --- a/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java +++ b/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java @@ -21,6 +21,7 @@ public class SettingsResponseT { private solarxr_protocol.rpc.StayAlignedSettingsT stayAligned; private solarxr_protocol.rpc.HIDSettingsT hidSettings; private solarxr_protocol.rpc.TimeoutSettingsT timeout; + private solarxr_protocol.rpc.VelocitySettingsT velocitySettings; public solarxr_protocol.rpc.SteamVRTrackersSettingT getSteamVrTrackers() { return steamVrTrackers; } @@ -74,6 +75,10 @@ public class SettingsResponseT { public void setTimeout(solarxr_protocol.rpc.TimeoutSettingsT timeout) { this.timeout = timeout; } + public solarxr_protocol.rpc.VelocitySettingsT getVelocitySettings() { return velocitySettings; } + + public void setVelocitySettings(solarxr_protocol.rpc.VelocitySettingsT velocitySettings) { this.velocitySettings = velocitySettings; } + public SettingsResponseT() { this.steamVrTrackers = null; @@ -89,6 +94,7 @@ public SettingsResponseT() { this.stayAligned = null; this.hidSettings = null; this.timeout = null; + this.velocitySettings = null; } } diff --git a/protocol/java/src/solarxr_protocol/rpc/VelocitySettings.java b/protocol/java/src/solarxr_protocol/rpc/VelocitySettings.java new file mode 100644 index 00000000..e58a77ee --- /dev/null +++ b/protocol/java/src/solarxr_protocol/rpc/VelocitySettings.java @@ -0,0 +1,56 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +package solarxr_protocol.rpc; + +import java.nio.*; +import java.lang.*; +import java.util.*; +import com.google.flatbuffers.*; + +@SuppressWarnings("unused") +public final class VelocitySettings extends Table { + public static void ValidateVersion() { Constants.FLATBUFFERS_22_10_26(); } + public static VelocitySettings getRootAsVelocitySettings(ByteBuffer _bb) { return getRootAsVelocitySettings(_bb, new VelocitySettings()); } + public static VelocitySettings getRootAsVelocitySettings(ByteBuffer _bb, VelocitySettings obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } + public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } + public VelocitySettings __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public boolean sendDerivedVelocity() { int o = __offset(4); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } + + public static int createVelocitySettings(FlatBufferBuilder builder, + boolean sendDerivedVelocity) { + builder.startTable(1); + VelocitySettings.addSendDerivedVelocity(builder, sendDerivedVelocity); + return VelocitySettings.endVelocitySettings(builder); + } + + public static void startVelocitySettings(FlatBufferBuilder builder) { builder.startTable(1); } + public static void addSendDerivedVelocity(FlatBufferBuilder builder, boolean sendDerivedVelocity) { builder.addBoolean(0, sendDerivedVelocity, false); } + public static int endVelocitySettings(FlatBufferBuilder builder) { + int o = builder.endTable(); + return o; + } + + public static final class Vector extends BaseVector { + public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + + public VelocitySettings get(int j) { return get(new VelocitySettings(), j); } + public VelocitySettings get(VelocitySettings obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } + } + public VelocitySettingsT unpack() { + VelocitySettingsT _o = new VelocitySettingsT(); + unpackTo(_o); + return _o; + } + public void unpackTo(VelocitySettingsT _o) { + boolean _oSendDerivedVelocity = sendDerivedVelocity(); + _o.setSendDerivedVelocity(_oSendDerivedVelocity); + } + public static int pack(FlatBufferBuilder builder, VelocitySettingsT _o) { + if (_o == null) return 0; + return createVelocitySettings( + builder, + _o.getSendDerivedVelocity()); + } +} + diff --git a/protocol/java/src/solarxr_protocol/rpc/VelocitySettingsT.java b/protocol/java/src/solarxr_protocol/rpc/VelocitySettingsT.java new file mode 100644 index 00000000..6814df81 --- /dev/null +++ b/protocol/java/src/solarxr_protocol/rpc/VelocitySettingsT.java @@ -0,0 +1,22 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +package solarxr_protocol.rpc; + +import java.nio.*; +import java.lang.*; +import java.util.*; +import com.google.flatbuffers.*; + +public class VelocitySettingsT { + private boolean sendDerivedVelocity; + + public boolean getSendDerivedVelocity() { return sendDerivedVelocity; } + + public void setSendDerivedVelocity(boolean sendDerivedVelocity) { this.sendDerivedVelocity = sendDerivedVelocity; } + + + public VelocitySettingsT() { + this.sendDerivedVelocity = false; + } +} + diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt b/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt index c8e6d741..2eb4f233 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt @@ -133,6 +133,15 @@ class ChangeSettingsRequest : Table() { null } } + val velocitySettings : solarxr_protocol.rpc.VelocitySettings? get() = velocitySettings(solarxr_protocol.rpc.VelocitySettings()) + fun velocitySettings(obj: solarxr_protocol.rpc.VelocitySettings) : solarxr_protocol.rpc.VelocitySettings? { + val o = __offset(30) + return if (o != 0) { + obj.__assign(__indirect(o + bb_pos), bb) + } else { + null + } + } companion object { @JvmStatic fun validateVersion() = Constants.FLATBUFFERS_22_10_26() @@ -144,8 +153,9 @@ class ChangeSettingsRequest : Table() { return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)) } @JvmStatic - fun createChangeSettingsRequest(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, driftCompensationOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int, timeoutOffset: Int) : Int { - builder.startTable(13) + fun createChangeSettingsRequest(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, driftCompensationOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int, timeoutOffset: Int, velocitySettingsOffset: Int) : Int { + builder.startTable(14) + addVelocitySettings(builder, velocitySettingsOffset) addTimeout(builder, timeoutOffset) addHidSettings(builder, hidSettingsOffset) addStayAligned(builder, stayAlignedOffset) @@ -162,7 +172,7 @@ class ChangeSettingsRequest : Table() { return endChangeSettingsRequest(builder) } @JvmStatic - fun startChangeSettingsRequest(builder: FlatBufferBuilder) = builder.startTable(13) + fun startChangeSettingsRequest(builder: FlatBufferBuilder) = builder.startTable(14) @JvmStatic fun addSteamVrTrackers(builder: FlatBufferBuilder, steamVrTrackers: Int) = builder.addOffset(0, steamVrTrackers, 0) @JvmStatic @@ -190,6 +200,8 @@ class ChangeSettingsRequest : Table() { @JvmStatic fun addTimeout(builder: FlatBufferBuilder, timeout: Int) = builder.addOffset(12, timeout, 0) @JvmStatic + fun addVelocitySettings(builder: FlatBufferBuilder, velocitySettings: Int) = builder.addOffset(13, velocitySettings, 0) + @JvmStatic fun endChangeSettingsRequest(builder: FlatBufferBuilder) : Int { val o = builder.endTable() return o diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt b/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt index 5c9cb196..5fa87bab 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt @@ -133,6 +133,15 @@ class SettingsResponse : Table() { null } } + val velocitySettings : solarxr_protocol.rpc.VelocitySettings? get() = velocitySettings(solarxr_protocol.rpc.VelocitySettings()) + fun velocitySettings(obj: solarxr_protocol.rpc.VelocitySettings) : solarxr_protocol.rpc.VelocitySettings? { + val o = __offset(30) + return if (o != 0) { + obj.__assign(__indirect(o + bb_pos), bb) + } else { + null + } + } companion object { @JvmStatic fun validateVersion() = Constants.FLATBUFFERS_22_10_26() @@ -144,8 +153,9 @@ class SettingsResponse : Table() { return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)) } @JvmStatic - fun createSettingsResponse(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, driftCompensationOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int, timeoutOffset: Int) : Int { - builder.startTable(13) + fun createSettingsResponse(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, driftCompensationOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int, timeoutOffset: Int, velocitySettingsOffset: Int) : Int { + builder.startTable(14) + addVelocitySettings(builder, velocitySettingsOffset) addTimeout(builder, timeoutOffset) addHidSettings(builder, hidSettingsOffset) addStayAligned(builder, stayAlignedOffset) @@ -162,7 +172,7 @@ class SettingsResponse : Table() { return endSettingsResponse(builder) } @JvmStatic - fun startSettingsResponse(builder: FlatBufferBuilder) = builder.startTable(13) + fun startSettingsResponse(builder: FlatBufferBuilder) = builder.startTable(14) @JvmStatic fun addSteamVrTrackers(builder: FlatBufferBuilder, steamVrTrackers: Int) = builder.addOffset(0, steamVrTrackers, 0) @JvmStatic @@ -190,6 +200,8 @@ class SettingsResponse : Table() { @JvmStatic fun addTimeout(builder: FlatBufferBuilder, timeout: Int) = builder.addOffset(12, timeout, 0) @JvmStatic + fun addVelocitySettings(builder: FlatBufferBuilder, velocitySettings: Int) = builder.addOffset(13, velocitySettings, 0) + @JvmStatic fun endSettingsResponse(builder: FlatBufferBuilder) : Int { val o = builder.endTable() return o diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/VelocitySettings.kt b/protocol/kotlin/src/solarxr_protocol/rpc/VelocitySettings.kt new file mode 100644 index 00000000..11c97c5c --- /dev/null +++ b/protocol/kotlin/src/solarxr_protocol/rpc/VelocitySettings.kt @@ -0,0 +1,50 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +package solarxr_protocol.rpc + +import java.nio.* +import kotlin.math.sign +import com.google.flatbuffers.* + +@Suppress("unused") +class VelocitySettings : Table() { + + fun __init(_i: Int, _bb: ByteBuffer) { + __reset(_i, _bb) + } + fun __assign(_i: Int, _bb: ByteBuffer) : VelocitySettings { + __init(_i, _bb) + return this + } + val sendDerivedVelocity : Boolean + get() { + val o = __offset(4) + return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else false + } + companion object { + @JvmStatic + fun validateVersion() = Constants.FLATBUFFERS_22_10_26() + @JvmStatic + fun getRootAsVelocitySettings(_bb: ByteBuffer): VelocitySettings = getRootAsVelocitySettings(_bb, VelocitySettings()) + @JvmStatic + fun getRootAsVelocitySettings(_bb: ByteBuffer, obj: VelocitySettings): VelocitySettings { + _bb.order(ByteOrder.LITTLE_ENDIAN) + return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)) + } + @JvmStatic + fun createVelocitySettings(builder: FlatBufferBuilder, sendDerivedVelocity: Boolean) : Int { + builder.startTable(1) + addSendDerivedVelocity(builder, sendDerivedVelocity) + return endVelocitySettings(builder) + } + @JvmStatic + fun startVelocitySettings(builder: FlatBufferBuilder) = builder.startTable(1) + @JvmStatic + fun addSendDerivedVelocity(builder: FlatBufferBuilder, sendDerivedVelocity: Boolean) = builder.addBoolean(0, sendDerivedVelocity, false) + @JvmStatic + fun endVelocitySettings(builder: FlatBufferBuilder) : Int { + val o = builder.endTable() + return o + } + } +} diff --git a/protocol/rust/src/generated/mod.rs b/protocol/rust/src/generated/mod.rs index 17882dd5..e7cfad64 100644 --- a/protocol/rust/src/generated/mod.rs +++ b/protocol/rust/src/generated/mod.rs @@ -252,6 +252,8 @@ pub mod solarxr_protocol { pub use self::hidsettings_generated::*; mod timeout_settings_generated; pub use self::timeout_settings_generated::*; + mod velocity_settings_generated; + pub use self::velocity_settings_generated::*; mod tap_detection_setup_notification_generated; pub use self::tap_detection_setup_notification_generated::*; mod record_bvhrequest_generated; diff --git a/protocol/rust/src/generated/solarxr_protocol/rpc/change_settings_request_generated.rs b/protocol/rust/src/generated/solarxr_protocol/rpc/change_settings_request_generated.rs index aa1fef59..7e3942e9 100644 --- a/protocol/rust/src/generated/solarxr_protocol/rpc/change_settings_request_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/rpc/change_settings_request_generated.rs @@ -38,6 +38,7 @@ impl<'a> ChangeSettingsRequest<'a> { pub const VT_STAY_ALIGNED: flatbuffers::VOffsetT = 24; pub const VT_HID_SETTINGS: flatbuffers::VOffsetT = 26; pub const VT_TIMEOUT: flatbuffers::VOffsetT = 28; + pub const VT_VELOCITY_SETTINGS: flatbuffers::VOffsetT = 30; #[inline] pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { @@ -49,6 +50,7 @@ impl<'a> ChangeSettingsRequest<'a> { args: &'args ChangeSettingsRequestArgs<'args> ) -> flatbuffers::WIPOffset> { let mut builder = ChangeSettingsRequestBuilder::new(_fbb); + if let Some(x) = args.velocity_settings { builder.add_velocity_settings(x); } if let Some(x) = args.timeout { builder.add_timeout(x); } if let Some(x) = args.hid_settings { builder.add_hid_settings(x); } if let Some(x) = args.stay_aligned { builder.add_stay_aligned(x); } @@ -157,6 +159,13 @@ impl<'a> ChangeSettingsRequest<'a> { // which contains a valid value in this slot unsafe { self._tab.get::>(ChangeSettingsRequest::VT_TIMEOUT, None)} } + #[inline] + pub fn velocity_settings(&self) -> Option> { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::>(ChangeSettingsRequest::VT_VELOCITY_SETTINGS, None)} + } } impl flatbuffers::Verifiable for ChangeSettingsRequest<'_> { @@ -179,6 +188,7 @@ impl flatbuffers::Verifiable for ChangeSettingsRequest<'_> { .visit_field::>("stay_aligned", Self::VT_STAY_ALIGNED, false)? .visit_field::>("hid_settings", Self::VT_HID_SETTINGS, false)? .visit_field::>("timeout", Self::VT_TIMEOUT, false)? + .visit_field::>("velocity_settings", Self::VT_VELOCITY_SETTINGS, false)? .finish(); Ok(()) } @@ -197,6 +207,7 @@ pub struct ChangeSettingsRequestArgs<'a> { pub stay_aligned: Option>>, pub hid_settings: Option>>, pub timeout: Option>>, + pub velocity_settings: Option>>, } impl<'a> Default for ChangeSettingsRequestArgs<'a> { #[inline] @@ -215,6 +226,7 @@ impl<'a> Default for ChangeSettingsRequestArgs<'a> { stay_aligned: None, hid_settings: None, timeout: None, + velocity_settings: None, } } } @@ -277,6 +289,10 @@ impl<'a: 'b, 'b> ChangeSettingsRequestBuilder<'a, 'b> { self.fbb_.push_slot_always::>(ChangeSettingsRequest::VT_TIMEOUT, timeout); } #[inline] + pub fn add_velocity_settings(&mut self, velocity_settings: flatbuffers::WIPOffset>) { + self.fbb_.push_slot_always::>(ChangeSettingsRequest::VT_VELOCITY_SETTINGS, velocity_settings); + } + #[inline] pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> ChangeSettingsRequestBuilder<'a, 'b> { let start = _fbb.start_table(); ChangeSettingsRequestBuilder { @@ -307,6 +323,7 @@ impl core::fmt::Debug for ChangeSettingsRequest<'_> { ds.field("stay_aligned", &self.stay_aligned()); ds.field("hid_settings", &self.hid_settings()); ds.field("timeout", &self.timeout()); + ds.field("velocity_settings", &self.velocity_settings()); ds.finish() } } diff --git a/protocol/rust/src/generated/solarxr_protocol/rpc/settings_response_generated.rs b/protocol/rust/src/generated/solarxr_protocol/rpc/settings_response_generated.rs index 941ffdcf..2eaba862 100644 --- a/protocol/rust/src/generated/solarxr_protocol/rpc/settings_response_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/rpc/settings_response_generated.rs @@ -38,6 +38,7 @@ impl<'a> SettingsResponse<'a> { pub const VT_STAY_ALIGNED: flatbuffers::VOffsetT = 24; pub const VT_HID_SETTINGS: flatbuffers::VOffsetT = 26; pub const VT_TIMEOUT: flatbuffers::VOffsetT = 28; + pub const VT_VELOCITY_SETTINGS: flatbuffers::VOffsetT = 30; #[inline] pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { @@ -49,6 +50,7 @@ impl<'a> SettingsResponse<'a> { args: &'args SettingsResponseArgs<'args> ) -> flatbuffers::WIPOffset> { let mut builder = SettingsResponseBuilder::new(_fbb); + if let Some(x) = args.velocity_settings { builder.add_velocity_settings(x); } if let Some(x) = args.timeout { builder.add_timeout(x); } if let Some(x) = args.hid_settings { builder.add_hid_settings(x); } if let Some(x) = args.stay_aligned { builder.add_stay_aligned(x); } @@ -157,6 +159,13 @@ impl<'a> SettingsResponse<'a> { // which contains a valid value in this slot unsafe { self._tab.get::>(SettingsResponse::VT_TIMEOUT, None)} } + #[inline] + pub fn velocity_settings(&self) -> Option> { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::>(SettingsResponse::VT_VELOCITY_SETTINGS, None)} + } } impl flatbuffers::Verifiable for SettingsResponse<'_> { @@ -179,6 +188,7 @@ impl flatbuffers::Verifiable for SettingsResponse<'_> { .visit_field::>("stay_aligned", Self::VT_STAY_ALIGNED, false)? .visit_field::>("hid_settings", Self::VT_HID_SETTINGS, false)? .visit_field::>("timeout", Self::VT_TIMEOUT, false)? + .visit_field::>("velocity_settings", Self::VT_VELOCITY_SETTINGS, false)? .finish(); Ok(()) } @@ -197,6 +207,7 @@ pub struct SettingsResponseArgs<'a> { pub stay_aligned: Option>>, pub hid_settings: Option>>, pub timeout: Option>>, + pub velocity_settings: Option>>, } impl<'a> Default for SettingsResponseArgs<'a> { #[inline] @@ -215,6 +226,7 @@ impl<'a> Default for SettingsResponseArgs<'a> { stay_aligned: None, hid_settings: None, timeout: None, + velocity_settings: None, } } } @@ -277,6 +289,10 @@ impl<'a: 'b, 'b> SettingsResponseBuilder<'a, 'b> { self.fbb_.push_slot_always::>(SettingsResponse::VT_TIMEOUT, timeout); } #[inline] + pub fn add_velocity_settings(&mut self, velocity_settings: flatbuffers::WIPOffset>) { + self.fbb_.push_slot_always::>(SettingsResponse::VT_VELOCITY_SETTINGS, velocity_settings); + } + #[inline] pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> SettingsResponseBuilder<'a, 'b> { let start = _fbb.start_table(); SettingsResponseBuilder { @@ -307,6 +323,7 @@ impl core::fmt::Debug for SettingsResponse<'_> { ds.field("stay_aligned", &self.stay_aligned()); ds.field("hid_settings", &self.hid_settings()); ds.field("timeout", &self.timeout()); + ds.field("velocity_settings", &self.velocity_settings()); ds.finish() } } diff --git a/protocol/rust/src/generated/solarxr_protocol/rpc/velocity_settings_generated.rs b/protocol/rust/src/generated/solarxr_protocol/rpc/velocity_settings_generated.rs new file mode 100644 index 00000000..836b1df1 --- /dev/null +++ b/protocol/rust/src/generated/solarxr_protocol/rpc/velocity_settings_generated.rs @@ -0,0 +1,108 @@ +// automatically generated by the FlatBuffers compiler, do not modify +// @generated +extern crate alloc; +extern crate flatbuffers; +use alloc::boxed::Box; +use alloc::string::{String, ToString}; +use alloc::vec::Vec; +use core::mem; +use core::cmp::Ordering; +use self::flatbuffers::{EndianScalar, Follow}; +use super::*; +pub enum VelocitySettingsOffset {} +#[derive(Copy, Clone, PartialEq)] + +pub struct VelocitySettings<'a> { + pub _tab: flatbuffers::Table<'a>, +} + +impl<'a> flatbuffers::Follow<'a> for VelocitySettings<'a> { + type Inner = VelocitySettings<'a>; + #[inline] + unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner { + Self { _tab: flatbuffers::Table::new(buf, loc) } + } +} + +impl<'a> VelocitySettings<'a> { + pub const VT_SEND_DERIVED_VELOCITY: flatbuffers::VOffsetT = 4; + + #[inline] + pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { + VelocitySettings { _tab: table } + } + #[allow(unused_mut)] + pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>( + _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>, + args: &'args VelocitySettingsArgs + ) -> flatbuffers::WIPOffset> { + let mut builder = VelocitySettingsBuilder::new(_fbb); + builder.add_send_derived_velocity(args.send_derived_velocity); + builder.finish() + } + + + #[inline] + pub fn send_derived_velocity(&self) -> bool { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::(VelocitySettings::VT_SEND_DERIVED_VELOCITY, Some(false)).unwrap()} + } +} + +impl flatbuffers::Verifiable for VelocitySettings<'_> { + #[inline] + fn run_verifier( + v: &mut flatbuffers::Verifier, pos: usize + ) -> Result<(), flatbuffers::InvalidFlatbuffer> { + use self::flatbuffers::Verifiable; + v.visit_table(pos)? + .visit_field::("send_derived_velocity", Self::VT_SEND_DERIVED_VELOCITY, false)? + .finish(); + Ok(()) + } +} +pub struct VelocitySettingsArgs { + pub send_derived_velocity: bool, +} +impl<'a> Default for VelocitySettingsArgs { + #[inline] + fn default() -> Self { + VelocitySettingsArgs { + send_derived_velocity: false, + } + } +} + +pub struct VelocitySettingsBuilder<'a: 'b, 'b> { + fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>, + start_: flatbuffers::WIPOffset, +} +impl<'a: 'b, 'b> VelocitySettingsBuilder<'a, 'b> { + #[inline] + pub fn add_send_derived_velocity(&mut self, send_derived_velocity: bool) { + self.fbb_.push_slot::(VelocitySettings::VT_SEND_DERIVED_VELOCITY, send_derived_velocity, false); + } + #[inline] + pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> VelocitySettingsBuilder<'a, 'b> { + let start = _fbb.start_table(); + VelocitySettingsBuilder { + fbb_: _fbb, + start_: start, + } + } + #[inline] + pub fn finish(self) -> flatbuffers::WIPOffset> { + let o = self.fbb_.end_table(self.start_); + flatbuffers::WIPOffset::new(o.value()) + } +} + +impl core::fmt::Debug for VelocitySettings<'_> { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + let mut ds = f.debug_struct("VelocitySettings"); + ds.field("send_derived_velocity", &self.send_derived_velocity()); + ds.finish() + } +} diff --git a/protocol/typescript/src/all_generated.ts b/protocol/typescript/src/all_generated.ts index 8643f2bc..7444c3c7 100644 --- a/protocol/typescript/src/all_generated.ts +++ b/protocol/typescript/src/all_generated.ts @@ -194,6 +194,7 @@ export { VRCConfigValues, VRCConfigValuesT } from './solarxr-protocol/rpc/vrccon export { VRCOSCSettings, VRCOSCSettingsT } from './solarxr-protocol/rpc/vrcoscsettings.js'; export { VRCSpineMode } from './solarxr-protocol/rpc/vrcspine-mode.js'; export { VRCTrackerModel } from './solarxr-protocol/rpc/vrctracker-model.js'; +export { VelocitySettings, VelocitySettingsT } from './solarxr-protocol/rpc/velocity-settings.js'; export { WifiProvisioningStatus } from './solarxr-protocol/rpc/wifi-provisioning-status.js'; export { WifiProvisioningStatusResponse, WifiProvisioningStatusResponseT } from './solarxr-protocol/rpc/wifi-provisioning-status-response.js'; export { LegTweaksSettings, LegTweaksSettingsT } from './solarxr-protocol/rpc/settings/leg-tweaks-settings.js'; diff --git a/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts b/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts index 2143c437..5fb5bdf7 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts @@ -14,6 +14,7 @@ import { TapDetectionSettings, TapDetectionSettingsT } from '../../solarxr-proto import { TimeoutSettings, TimeoutSettingsT } from '../../solarxr-protocol/rpc/timeout-settings.js'; import { VMCOSCSettings, VMCOSCSettingsT } from '../../solarxr-protocol/rpc/vmcoscsettings.js'; import { VRCOSCSettings, VRCOSCSettingsT } from '../../solarxr-protocol/rpc/vrcoscsettings.js'; +import { VelocitySettings, VelocitySettingsT } from '../../solarxr-protocol/rpc/velocity-settings.js'; import { ModelSettings, ModelSettingsT } from '../../solarxr-protocol/rpc/settings/model-settings.js'; @@ -100,8 +101,13 @@ timeout(obj?:TimeoutSettings):TimeoutSettings|null { return offset ? (obj || new TimeoutSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; } +velocitySettings(obj?:VelocitySettings):VelocitySettings|null { + const offset = this.bb!.__offset(this.bb_pos, 30); + return offset ? (obj || new VelocitySettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; +} + static startChangeSettingsRequest(builder:flatbuffers.Builder) { - builder.startObject(13); + builder.startObject(14); } static addSteamVrTrackers(builder:flatbuffers.Builder, steamVrTrackersOffset:flatbuffers.Offset) { @@ -156,6 +162,10 @@ static addTimeout(builder:flatbuffers.Builder, timeoutOffset:flatbuffers.Offset) builder.addFieldOffset(12, timeoutOffset, 0); } +static addVelocitySettings(builder:flatbuffers.Builder, velocitySettingsOffset:flatbuffers.Offset) { + builder.addFieldOffset(13, velocitySettingsOffset, 0); +} + static endChangeSettingsRequest(builder:flatbuffers.Builder):flatbuffers.Offset { const offset = builder.endObject(); return offset; @@ -176,7 +186,8 @@ unpack(): ChangeSettingsRequestT { (this.resetsSettings() !== null ? this.resetsSettings()!.unpack() : null), (this.stayAligned() !== null ? this.stayAligned()!.unpack() : null), (this.hidSettings() !== null ? this.hidSettings()!.unpack() : null), - (this.timeout() !== null ? this.timeout()!.unpack() : null) + (this.timeout() !== null ? this.timeout()!.unpack() : null), + (this.velocitySettings() !== null ? this.velocitySettings()!.unpack() : null) ); } @@ -195,6 +206,7 @@ unpackTo(_o: ChangeSettingsRequestT): void { _o.stayAligned = (this.stayAligned() !== null ? this.stayAligned()!.unpack() : null); _o.hidSettings = (this.hidSettings() !== null ? this.hidSettings()!.unpack() : null); _o.timeout = (this.timeout() !== null ? this.timeout()!.unpack() : null); + _o.velocitySettings = (this.velocitySettings() !== null ? this.velocitySettings()!.unpack() : null); } } @@ -212,7 +224,8 @@ constructor( public resetsSettings: ResetsSettingsT|null = null, public stayAligned: StayAlignedSettingsT|null = null, public hidSettings: HIDSettingsT|null = null, - public timeout: TimeoutSettingsT|null = null + public timeout: TimeoutSettingsT|null = null, + public velocitySettings: VelocitySettingsT|null = null ){} @@ -230,6 +243,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { const stayAligned = (this.stayAligned !== null ? this.stayAligned!.pack(builder) : 0); const hidSettings = (this.hidSettings !== null ? this.hidSettings!.pack(builder) : 0); const timeout = (this.timeout !== null ? this.timeout!.pack(builder) : 0); + const velocitySettings = (this.velocitySettings !== null ? this.velocitySettings!.pack(builder) : 0); ChangeSettingsRequest.startChangeSettingsRequest(builder); ChangeSettingsRequest.addSteamVrTrackers(builder, steamVrTrackers); @@ -245,6 +259,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { ChangeSettingsRequest.addStayAligned(builder, stayAligned); ChangeSettingsRequest.addHidSettings(builder, hidSettings); ChangeSettingsRequest.addTimeout(builder, timeout); + ChangeSettingsRequest.addVelocitySettings(builder, velocitySettings); return ChangeSettingsRequest.endChangeSettingsRequest(builder); } diff --git a/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts b/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts index fe4b6fe9..97d955f4 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts @@ -14,6 +14,7 @@ import { TapDetectionSettings, TapDetectionSettingsT } from '../../solarxr-proto import { TimeoutSettings, TimeoutSettingsT } from '../../solarxr-protocol/rpc/timeout-settings.js'; import { VMCOSCSettings, VMCOSCSettingsT } from '../../solarxr-protocol/rpc/vmcoscsettings.js'; import { VRCOSCSettings, VRCOSCSettingsT } from '../../solarxr-protocol/rpc/vrcoscsettings.js'; +import { VelocitySettings, VelocitySettingsT } from '../../solarxr-protocol/rpc/velocity-settings.js'; import { ModelSettings, ModelSettingsT } from '../../solarxr-protocol/rpc/settings/model-settings.js'; @@ -100,8 +101,13 @@ timeout(obj?:TimeoutSettings):TimeoutSettings|null { return offset ? (obj || new TimeoutSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; } +velocitySettings(obj?:VelocitySettings):VelocitySettings|null { + const offset = this.bb!.__offset(this.bb_pos, 30); + return offset ? (obj || new VelocitySettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; +} + static startSettingsResponse(builder:flatbuffers.Builder) { - builder.startObject(13); + builder.startObject(14); } static addSteamVrTrackers(builder:flatbuffers.Builder, steamVrTrackersOffset:flatbuffers.Offset) { @@ -156,6 +162,10 @@ static addTimeout(builder:flatbuffers.Builder, timeoutOffset:flatbuffers.Offset) builder.addFieldOffset(12, timeoutOffset, 0); } +static addVelocitySettings(builder:flatbuffers.Builder, velocitySettingsOffset:flatbuffers.Offset) { + builder.addFieldOffset(13, velocitySettingsOffset, 0); +} + static endSettingsResponse(builder:flatbuffers.Builder):flatbuffers.Offset { const offset = builder.endObject(); return offset; @@ -176,7 +186,8 @@ unpack(): SettingsResponseT { (this.resetsSettings() !== null ? this.resetsSettings()!.unpack() : null), (this.stayAligned() !== null ? this.stayAligned()!.unpack() : null), (this.hidSettings() !== null ? this.hidSettings()!.unpack() : null), - (this.timeout() !== null ? this.timeout()!.unpack() : null) + (this.timeout() !== null ? this.timeout()!.unpack() : null), + (this.velocitySettings() !== null ? this.velocitySettings()!.unpack() : null) ); } @@ -195,6 +206,7 @@ unpackTo(_o: SettingsResponseT): void { _o.stayAligned = (this.stayAligned() !== null ? this.stayAligned()!.unpack() : null); _o.hidSettings = (this.hidSettings() !== null ? this.hidSettings()!.unpack() : null); _o.timeout = (this.timeout() !== null ? this.timeout()!.unpack() : null); + _o.velocitySettings = (this.velocitySettings() !== null ? this.velocitySettings()!.unpack() : null); } } @@ -212,7 +224,8 @@ constructor( public resetsSettings: ResetsSettingsT|null = null, public stayAligned: StayAlignedSettingsT|null = null, public hidSettings: HIDSettingsT|null = null, - public timeout: TimeoutSettingsT|null = null + public timeout: TimeoutSettingsT|null = null, + public velocitySettings: VelocitySettingsT|null = null ){} @@ -230,6 +243,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { const stayAligned = (this.stayAligned !== null ? this.stayAligned!.pack(builder) : 0); const hidSettings = (this.hidSettings !== null ? this.hidSettings!.pack(builder) : 0); const timeout = (this.timeout !== null ? this.timeout!.pack(builder) : 0); + const velocitySettings = (this.velocitySettings !== null ? this.velocitySettings!.pack(builder) : 0); SettingsResponse.startSettingsResponse(builder); SettingsResponse.addSteamVrTrackers(builder, steamVrTrackers); @@ -245,6 +259,7 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { SettingsResponse.addStayAligned(builder, stayAligned); SettingsResponse.addHidSettings(builder, hidSettings); SettingsResponse.addTimeout(builder, timeout); + SettingsResponse.addVelocitySettings(builder, velocitySettings); return SettingsResponse.endSettingsResponse(builder); } diff --git a/protocol/typescript/src/solarxr-protocol/rpc/velocity-settings.ts b/protocol/typescript/src/solarxr-protocol/rpc/velocity-settings.ts new file mode 100644 index 00000000..560451a0 --- /dev/null +++ b/protocol/typescript/src/solarxr-protocol/rpc/velocity-settings.ts @@ -0,0 +1,72 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +import * as flatbuffers from 'flatbuffers'; + + + +export class VelocitySettings implements flatbuffers.IUnpackableObject { + bb: flatbuffers.ByteBuffer|null = null; + bb_pos = 0; + __init(i:number, bb:flatbuffers.ByteBuffer):VelocitySettings { + this.bb_pos = i; + this.bb = bb; + return this; +} + +static getRootAsVelocitySettings(bb:flatbuffers.ByteBuffer, obj?:VelocitySettings):VelocitySettings { + return (obj || new VelocitySettings()).__init(bb.readInt32(bb.position()) + bb.position(), bb); +} + +static getSizePrefixedRootAsVelocitySettings(bb:flatbuffers.ByteBuffer, obj?:VelocitySettings):VelocitySettings { + bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH); + return (obj || new VelocitySettings()).__init(bb.readInt32(bb.position()) + bb.position(), bb); +} + +sendDerivedVelocity():boolean { + const offset = this.bb!.__offset(this.bb_pos, 4); + return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false; +} + +static startVelocitySettings(builder:flatbuffers.Builder) { + builder.startObject(1); +} + +static addSendDerivedVelocity(builder:flatbuffers.Builder, sendDerivedVelocity:boolean) { + builder.addFieldInt8(0, +sendDerivedVelocity, +false); +} + +static endVelocitySettings(builder:flatbuffers.Builder):flatbuffers.Offset { + const offset = builder.endObject(); + return offset; +} + +static createVelocitySettings(builder:flatbuffers.Builder, sendDerivedVelocity:boolean):flatbuffers.Offset { + VelocitySettings.startVelocitySettings(builder); + VelocitySettings.addSendDerivedVelocity(builder, sendDerivedVelocity); + return VelocitySettings.endVelocitySettings(builder); +} + +unpack(): VelocitySettingsT { + return new VelocitySettingsT( + this.sendDerivedVelocity() + ); +} + + +unpackTo(_o: VelocitySettingsT): void { + _o.sendDerivedVelocity = this.sendDerivedVelocity(); +} +} + +export class VelocitySettingsT implements flatbuffers.IGeneratedObject { +constructor( + public sendDerivedVelocity: boolean = false +){} + + +pack(builder:flatbuffers.Builder): flatbuffers.Offset { + return VelocitySettings.createVelocitySettings(builder, + this.sendDerivedVelocity + ); +} +} diff --git a/schema/rpc.fbs b/schema/rpc.fbs index f3094e46..405057bb 100644 --- a/schema/rpc.fbs +++ b/schema/rpc.fbs @@ -227,6 +227,7 @@ table SettingsResponse { stay_aligned: StayAlignedSettings; hid_settings: HIDSettings; timeout: TimeoutSettings; + velocity_settings: VelocitySettings; } table ChangeSettingsRequest { @@ -243,6 +244,7 @@ table ChangeSettingsRequest { stay_aligned: StayAlignedSettings; hid_settings: HIDSettings; timeout: TimeoutSettings; + velocity_settings: VelocitySettings; } @@ -392,6 +394,10 @@ table TimeoutSettings { duration: float32; } +table VelocitySettings { + send_derived_velocity: bool; +} + /// See TapDetectionSettings::setup_mode table TapDetectionSetupNotification { tracker_id: solarxr_protocol.datatypes.TrackerId;