diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index e0ded2e2f..3089cbf9f 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -4434,7 +4434,6 @@ struct TrackerInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_IS_IMU = 16, VT_DISPLAY_NAME = 18, VT_CUSTOM_NAME = 20, - VT_ALLOW_DRIFT_COMPENSATION = 22, VT_MOUNTING_RESET_ORIENTATION = 24, VT_IS_HMD = 26, VT_MAGNETOMETER = 28, @@ -4475,10 +4474,6 @@ struct TrackerInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::String *custom_name() const { return GetPointer(VT_CUSTOM_NAME); } - /// Whether to allow yaw drift compensation for this tracker or not. - bool allow_drift_compensation() const { - return GetField(VT_ALLOW_DRIFT_COMPENSATION, 0) != 0; - } /// Mounting Reset orientation overrides the current `mounting_orientation` of /// the tracker, this orientation is not saved and needs to be calculated /// each time the server is ran @@ -4509,7 +4504,6 @@ struct TrackerInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyString(display_name()) && VerifyOffset(verifier, VT_CUSTOM_NAME) && verifier.VerifyString(custom_name()) && - VerifyField(verifier, VT_ALLOW_DRIFT_COMPENSATION, 1) && VerifyField(verifier, VT_MOUNTING_RESET_ORIENTATION, 4) && VerifyField(verifier, VT_IS_HMD, 1) && VerifyField(verifier, VT_MAGNETOMETER, 1) && @@ -4549,9 +4543,6 @@ struct TrackerInfoBuilder { void add_custom_name(flatbuffers::Offset custom_name) { fbb_.AddOffset(TrackerInfo::VT_CUSTOM_NAME, custom_name); } - void add_allow_drift_compensation(bool allow_drift_compensation) { - fbb_.AddElement(TrackerInfo::VT_ALLOW_DRIFT_COMPENSATION, static_cast(allow_drift_compensation), 0); - } void add_mounting_reset_orientation(const solarxr_protocol::datatypes::math::Quat *mounting_reset_orientation) { fbb_.AddStruct(TrackerInfo::VT_MOUNTING_RESET_ORIENTATION, mounting_reset_orientation); } @@ -4586,7 +4577,6 @@ inline flatbuffers::Offset CreateTrackerInfo( bool is_imu = false, flatbuffers::Offset display_name = 0, flatbuffers::Offset custom_name = 0, - bool allow_drift_compensation = false, const solarxr_protocol::datatypes::math::Quat *mounting_reset_orientation = nullptr, bool is_hmd = false, solarxr_protocol::datatypes::MagnetometerStatus magnetometer = solarxr_protocol::datatypes::MagnetometerStatus::NOT_SUPPORTED, @@ -4601,7 +4591,6 @@ inline flatbuffers::Offset CreateTrackerInfo( builder_.add_data_support(data_support); builder_.add_magnetometer(magnetometer); builder_.add_is_hmd(is_hmd); - builder_.add_allow_drift_compensation(allow_drift_compensation); builder_.add_is_imu(is_imu); builder_.add_is_computed(is_computed); builder_.add_editable(editable); @@ -4620,7 +4609,6 @@ inline flatbuffers::Offset CreateTrackerInfoDirect( bool is_imu = false, const char *display_name = nullptr, const char *custom_name = nullptr, - bool allow_drift_compensation = false, const solarxr_protocol::datatypes::math::Quat *mounting_reset_orientation = nullptr, bool is_hmd = false, solarxr_protocol::datatypes::MagnetometerStatus magnetometer = solarxr_protocol::datatypes::MagnetometerStatus::NOT_SUPPORTED, @@ -4638,7 +4626,6 @@ inline flatbuffers::Offset CreateTrackerInfoDirect( is_imu, display_name__, custom_name__, - allow_drift_compensation, mounting_reset_orientation, is_hmd, magnetometer, @@ -6664,8 +6651,7 @@ struct AssignTrackerRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table VT_TRACKER_ID = 4, VT_BODY_POSITION = 6, VT_MOUNTING_ORIENTATION = 8, - VT_DISPLAY_NAME = 10, - VT_ALLOW_DRIFT_COMPENSATION = 12 + VT_DISPLAY_NAME = 10 }; const solarxr_protocol::datatypes::TrackerId *tracker_id() const { return GetPointer(VT_TRACKER_ID); @@ -6679,9 +6665,6 @@ struct AssignTrackerRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table const flatbuffers::String *display_name() const { return GetPointer(VT_DISPLAY_NAME); } - bool allow_drift_compensation() const { - return GetField(VT_ALLOW_DRIFT_COMPENSATION, 0) != 0; - } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_TRACKER_ID) && @@ -6690,7 +6673,6 @@ struct AssignTrackerRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table VerifyField(verifier, VT_MOUNTING_ORIENTATION, 4) && VerifyOffset(verifier, VT_DISPLAY_NAME) && verifier.VerifyString(display_name()) && - VerifyField(verifier, VT_ALLOW_DRIFT_COMPENSATION, 1) && verifier.EndTable(); } }; @@ -6711,9 +6693,6 @@ struct AssignTrackerRequestBuilder { void add_display_name(flatbuffers::Offset display_name) { fbb_.AddOffset(AssignTrackerRequest::VT_DISPLAY_NAME, display_name); } - void add_allow_drift_compensation(bool allow_drift_compensation) { - fbb_.AddElement(AssignTrackerRequest::VT_ALLOW_DRIFT_COMPENSATION, static_cast(allow_drift_compensation), 0); - } explicit AssignTrackerRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); @@ -6730,13 +6709,11 @@ inline flatbuffers::Offset CreateAssignTrackerRequest( flatbuffers::Offset tracker_id = 0, solarxr_protocol::datatypes::BodyPart body_position = solarxr_protocol::datatypes::BodyPart::NONE, const solarxr_protocol::datatypes::math::Quat *mounting_orientation = nullptr, - flatbuffers::Offset display_name = 0, - bool allow_drift_compensation = false) { + flatbuffers::Offset display_name = 0) { AssignTrackerRequestBuilder builder_(_fbb); builder_.add_display_name(display_name); builder_.add_mounting_orientation(mounting_orientation); builder_.add_tracker_id(tracker_id); - builder_.add_allow_drift_compensation(allow_drift_compensation); builder_.add_body_position(body_position); return builder_.Finish(); } @@ -6746,16 +6723,14 @@ inline flatbuffers::Offset CreateAssignTrackerRequestDirec flatbuffers::Offset tracker_id = 0, solarxr_protocol::datatypes::BodyPart body_position = solarxr_protocol::datatypes::BodyPart::NONE, const solarxr_protocol::datatypes::math::Quat *mounting_orientation = nullptr, - const char *display_name = nullptr, - bool allow_drift_compensation = false) { + const char *display_name = nullptr) { auto display_name__ = display_name ? _fbb.CreateString(display_name) : 0; return solarxr_protocol::rpc::CreateAssignTrackerRequest( _fbb, tracker_id, body_position, mounting_orientation, - display_name__, - allow_drift_compensation); + display_name__); } struct ClearDriftCompensationRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { @@ -6821,7 +6796,6 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STEAM_VR_TRACKERS = 4, VT_FILTERING = 6, - VT_DRIFT_COMPENSATION = 8, VT_OSC_ROUTER = 10, VT_VRC_OSC = 12, VT_VMC_OSC = 14, @@ -6838,9 +6812,6 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const solarxr_protocol::rpc::FilteringSettings *filtering() const { return GetPointer(VT_FILTERING); } - const solarxr_protocol::rpc::DriftCompensationSettings *drift_compensation() const { - return GetPointer(VT_DRIFT_COMPENSATION); - } const solarxr_protocol::rpc::OSCRouterSettings *osc_router() const { return GetPointer(VT_OSC_ROUTER); } @@ -6874,8 +6845,6 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { verifier.VerifyTable(steam_vr_trackers()) && VerifyOffset(verifier, VT_FILTERING) && verifier.VerifyTable(filtering()) && - VerifyOffset(verifier, VT_DRIFT_COMPENSATION) && - verifier.VerifyTable(drift_compensation()) && VerifyOffset(verifier, VT_OSC_ROUTER) && verifier.VerifyTable(osc_router()) && VerifyOffset(verifier, VT_VRC_OSC) && @@ -6908,9 +6877,6 @@ struct SettingsResponseBuilder { void add_filtering(flatbuffers::Offset filtering) { fbb_.AddOffset(SettingsResponse::VT_FILTERING, filtering); } - void add_drift_compensation(flatbuffers::Offset drift_compensation) { - fbb_.AddOffset(SettingsResponse::VT_DRIFT_COMPENSATION, drift_compensation); - } void add_osc_router(flatbuffers::Offset osc_router) { fbb_.AddOffset(SettingsResponse::VT_OSC_ROUTER, osc_router); } @@ -6953,7 +6919,6 @@ inline flatbuffers::Offset CreateSettingsResponse( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset steam_vr_trackers = 0, flatbuffers::Offset filtering = 0, - flatbuffers::Offset drift_compensation = 0, flatbuffers::Offset osc_router = 0, flatbuffers::Offset vrc_osc = 0, flatbuffers::Offset vmc_osc = 0, @@ -6973,7 +6938,6 @@ inline flatbuffers::Offset CreateSettingsResponse( builder_.add_vmc_osc(vmc_osc); builder_.add_vrc_osc(vrc_osc); builder_.add_osc_router(osc_router); - builder_.add_drift_compensation(drift_compensation); builder_.add_filtering(filtering); builder_.add_steam_vr_trackers(steam_vr_trackers); return builder_.Finish(); @@ -6984,7 +6948,6 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { VT_STEAM_VR_TRACKERS = 4, VT_FILTERING = 6, - VT_DRIFT_COMPENSATION = 8, VT_OSC_ROUTER = 10, VT_VRC_OSC = 12, VT_VMC_OSC = 14, @@ -7001,9 +6964,6 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl const solarxr_protocol::rpc::FilteringSettings *filtering() const { return GetPointer(VT_FILTERING); } - const solarxr_protocol::rpc::DriftCompensationSettings *drift_compensation() const { - return GetPointer(VT_DRIFT_COMPENSATION); - } const solarxr_protocol::rpc::OSCRouterSettings *osc_router() const { return GetPointer(VT_OSC_ROUTER); } @@ -7037,8 +6997,6 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl verifier.VerifyTable(steam_vr_trackers()) && VerifyOffset(verifier, VT_FILTERING) && verifier.VerifyTable(filtering()) && - VerifyOffset(verifier, VT_DRIFT_COMPENSATION) && - verifier.VerifyTable(drift_compensation()) && VerifyOffset(verifier, VT_OSC_ROUTER) && verifier.VerifyTable(osc_router()) && VerifyOffset(verifier, VT_VRC_OSC) && @@ -7071,9 +7029,6 @@ struct ChangeSettingsRequestBuilder { void add_filtering(flatbuffers::Offset filtering) { fbb_.AddOffset(ChangeSettingsRequest::VT_FILTERING, filtering); } - void add_drift_compensation(flatbuffers::Offset drift_compensation) { - fbb_.AddOffset(ChangeSettingsRequest::VT_DRIFT_COMPENSATION, drift_compensation); - } void add_osc_router(flatbuffers::Offset osc_router) { fbb_.AddOffset(ChangeSettingsRequest::VT_OSC_ROUTER, osc_router); } @@ -7116,7 +7071,6 @@ inline flatbuffers::Offset CreateChangeSettingsRequest( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset steam_vr_trackers = 0, flatbuffers::Offset filtering = 0, - flatbuffers::Offset drift_compensation = 0, flatbuffers::Offset osc_router = 0, flatbuffers::Offset vrc_osc = 0, flatbuffers::Offset vmc_osc = 0, @@ -7136,7 +7090,6 @@ inline flatbuffers::Offset CreateChangeSettingsRequest( builder_.add_vmc_osc(vmc_osc); builder_.add_vrc_osc(vrc_osc); builder_.add_osc_router(osc_router); - builder_.add_drift_compensation(drift_compensation); builder_.add_filtering(filtering); builder_.add_steam_vr_trackers(steam_vr_trackers); return builder_.Finish(); diff --git a/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfo.java b/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfo.java index b2de63828..91b5bc7ff 100644 --- a/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfo.java +++ b/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfo.java @@ -57,10 +57,6 @@ public final class TrackerInfo extends Table { public String customName() { int o = __offset(20); return o != 0 ? __string(o + bb_pos) : null; } public ByteBuffer customNameAsByteBuffer() { return __vector_as_bytebuffer(20, 1); } public ByteBuffer customNameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 20, 1); } - /** - * Whether to allow yaw drift compensation for this tracker or not. - */ - public boolean allowDriftCompensation() { int o = __offset(22); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } /** * Mounting Reset orientation overrides the current `mounting_orientation` of * the tracker, this orientation is not saved and needs to be calculated @@ -88,7 +84,6 @@ public final class TrackerInfo extends Table { public static void addIsImu(FlatBufferBuilder builder, boolean isImu) { builder.addBoolean(6, isImu, false); } public static void addDisplayName(FlatBufferBuilder builder, int displayNameOffset) { builder.addOffset(7, displayNameOffset, 0); } public static void addCustomName(FlatBufferBuilder builder, int customNameOffset) { builder.addOffset(8, customNameOffset, 0); } - public static void addAllowDriftCompensation(FlatBufferBuilder builder, boolean allowDriftCompensation) { builder.addBoolean(9, allowDriftCompensation, false); } public static void addMountingResetOrientation(FlatBufferBuilder builder, int mountingResetOrientationOffset) { builder.addStruct(10, mountingResetOrientationOffset, 0); } public static void addIsHmd(FlatBufferBuilder builder, boolean isHmd) { builder.addBoolean(11, isHmd, false); } public static void addMagnetometer(FlatBufferBuilder builder, int magnetometer) { builder.addByte(12, (byte) magnetometer, (byte) 0); } @@ -128,8 +123,6 @@ public void unpackTo(TrackerInfoT _o) { _o.setDisplayName(_oDisplayName); String _oCustomName = customName(); _o.setCustomName(_oCustomName); - boolean _oAllowDriftCompensation = allowDriftCompensation(); - _o.setAllowDriftCompensation(_oAllowDriftCompensation); if (mountingResetOrientation() != null) mountingResetOrientation().unpackTo(_o.getMountingResetOrientation()); else _o.setMountingResetOrientation(null); boolean _oIsHmd = isHmd(); @@ -153,7 +146,6 @@ public static int pack(FlatBufferBuilder builder, TrackerInfoT _o) { addIsImu(builder, _o.getIsImu()); addDisplayName(builder, _displayName); addCustomName(builder, _customName); - addAllowDriftCompensation(builder, _o.getAllowDriftCompensation()); addMountingResetOrientation(builder, solarxr_protocol.datatypes.math.Quat.pack(builder, _o.getMountingResetOrientation())); addIsHmd(builder, _o.getIsHmd()); addMagnetometer(builder, _o.getMagnetometer()); diff --git a/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfoT.java b/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfoT.java index dd51fdd06..91d13a64e 100644 --- a/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfoT.java +++ b/protocol/java/src/solarxr_protocol/data_feed/tracker/TrackerInfoT.java @@ -17,7 +17,6 @@ public class TrackerInfoT { private boolean isImu; private String displayName; private String customName; - private boolean allowDriftCompensation; private solarxr_protocol.datatypes.math.QuatT mountingResetOrientation; private boolean isHmd; private int magnetometer; @@ -59,10 +58,6 @@ public class TrackerInfoT { public void setCustomName(String customName) { this.customName = customName; } - public boolean getAllowDriftCompensation() { return allowDriftCompensation; } - - public void setAllowDriftCompensation(boolean allowDriftCompensation) { this.allowDriftCompensation = allowDriftCompensation; } - public solarxr_protocol.datatypes.math.QuatT getMountingResetOrientation() { return mountingResetOrientation; } public void setMountingResetOrientation(solarxr_protocol.datatypes.math.QuatT mountingResetOrientation) { this.mountingResetOrientation = mountingResetOrientation; } @@ -90,7 +85,6 @@ public TrackerInfoT() { this.isImu = false; this.displayName = null; this.customName = null; - this.allowDriftCompensation = false; this.mountingResetOrientation = new solarxr_protocol.datatypes.math.QuatT(); this.isHmd = false; this.magnetometer = 0; diff --git a/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequest.java b/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequest.java index 466465ca4..2e76029bc 100644 --- a/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequest.java +++ b/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequest.java @@ -23,14 +23,12 @@ public final class AssignTrackerRequest extends Table { public String displayName() { int o = __offset(10); return o != 0 ? __string(o + bb_pos) : null; } public ByteBuffer displayNameAsByteBuffer() { return __vector_as_bytebuffer(10, 1); } public ByteBuffer displayNameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 10, 1); } - public boolean allowDriftCompensation() { int o = __offset(12); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } public static void startAssignTrackerRequest(FlatBufferBuilder builder) { builder.startTable(5); } public static void addTrackerId(FlatBufferBuilder builder, int trackerIdOffset) { builder.addOffset(0, trackerIdOffset, 0); } public static void addBodyPosition(FlatBufferBuilder builder, int bodyPosition) { builder.addByte(1, (byte) bodyPosition, (byte) 0); } public static void addMountingOrientation(FlatBufferBuilder builder, int mountingOrientationOffset) { builder.addStruct(2, mountingOrientationOffset, 0); } public static void addDisplayName(FlatBufferBuilder builder, int displayNameOffset) { builder.addOffset(3, displayNameOffset, 0); } - public static void addAllowDriftCompensation(FlatBufferBuilder builder, boolean allowDriftCompensation) { builder.addBoolean(4, allowDriftCompensation, false); } public static int endAssignTrackerRequest(FlatBufferBuilder builder) { int o = builder.endTable(); return o; @@ -56,8 +54,6 @@ public void unpackTo(AssignTrackerRequestT _o) { else _o.setMountingOrientation(null); String _oDisplayName = displayName(); _o.setDisplayName(_oDisplayName); - boolean _oAllowDriftCompensation = allowDriftCompensation(); - _o.setAllowDriftCompensation(_oAllowDriftCompensation); } public static int pack(FlatBufferBuilder builder, AssignTrackerRequestT _o) { if (_o == null) return 0; @@ -68,7 +64,6 @@ public static int pack(FlatBufferBuilder builder, AssignTrackerRequestT _o) { addBodyPosition(builder, _o.getBodyPosition()); addMountingOrientation(builder, solarxr_protocol.datatypes.math.Quat.pack(builder, _o.getMountingOrientation())); addDisplayName(builder, _displayName); - addAllowDriftCompensation(builder, _o.getAllowDriftCompensation()); return endAssignTrackerRequest(builder); } } diff --git a/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequestT.java b/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequestT.java index 3b2257504..63b97fcee 100644 --- a/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequestT.java +++ b/protocol/java/src/solarxr_protocol/rpc/AssignTrackerRequestT.java @@ -12,7 +12,6 @@ public class AssignTrackerRequestT { private int bodyPosition; private solarxr_protocol.datatypes.math.QuatT mountingOrientation; private String displayName; - private boolean allowDriftCompensation; public solarxr_protocol.datatypes.TrackerIdT getTrackerId() { return trackerId; } @@ -30,17 +29,12 @@ public class AssignTrackerRequestT { public void setDisplayName(String displayName) { this.displayName = displayName; } - public boolean getAllowDriftCompensation() { return allowDriftCompensation; } - - public void setAllowDriftCompensation(boolean allowDriftCompensation) { this.allowDriftCompensation = allowDriftCompensation; } - public AssignTrackerRequestT() { this.trackerId = null; this.bodyPosition = 0; this.mountingOrientation = new solarxr_protocol.datatypes.math.QuatT(); this.displayName = null; - this.allowDriftCompensation = false; } } diff --git a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java index f7368dd34..a1631a678 100644 --- a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java +++ b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java @@ -19,8 +19,6 @@ public final class ChangeSettingsRequest extends Table { public solarxr_protocol.rpc.SteamVRTrackersSetting steamVrTrackers(solarxr_protocol.rpc.SteamVRTrackersSetting obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.FilteringSettings filtering() { return filtering(new solarxr_protocol.rpc.FilteringSettings()); } public solarxr_protocol.rpc.FilteringSettings filtering(solarxr_protocol.rpc.FilteringSettings obj) { int o = __offset(6); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } - public solarxr_protocol.rpc.DriftCompensationSettings driftCompensation() { return driftCompensation(new solarxr_protocol.rpc.DriftCompensationSettings()); } - public solarxr_protocol.rpc.DriftCompensationSettings driftCompensation(solarxr_protocol.rpc.DriftCompensationSettings obj) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.OSCRouterSettings oscRouter() { return oscRouter(new solarxr_protocol.rpc.OSCRouterSettings()); } public solarxr_protocol.rpc.OSCRouterSettings oscRouter(solarxr_protocol.rpc.OSCRouterSettings obj) { int o = __offset(10); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.VRCOSCSettings vrcOsc() { return vrcOsc(new solarxr_protocol.rpc.VRCOSCSettings()); } @@ -43,7 +41,6 @@ public final class ChangeSettingsRequest extends Table { public static int createChangeSettingsRequest(FlatBufferBuilder builder, int steamVrTrackersOffset, int filteringOffset, - int driftCompensationOffset, int oscRouterOffset, int vrcOscOffset, int vmcOscOffset, @@ -63,7 +60,6 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder, ChangeSettingsRequest.addVmcOsc(builder, vmcOscOffset); ChangeSettingsRequest.addVrcOsc(builder, vrcOscOffset); ChangeSettingsRequest.addOscRouter(builder, oscRouterOffset); - ChangeSettingsRequest.addDriftCompensation(builder, driftCompensationOffset); ChangeSettingsRequest.addFiltering(builder, filteringOffset); ChangeSettingsRequest.addSteamVrTrackers(builder, steamVrTrackersOffset); return ChangeSettingsRequest.endChangeSettingsRequest(builder); @@ -72,7 +68,6 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder, public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(12); } 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); } public static void addOscRouter(FlatBufferBuilder builder, int oscRouterOffset) { builder.addOffset(3, oscRouterOffset, 0); } public static void addVrcOsc(FlatBufferBuilder builder, int vrcOscOffset) { builder.addOffset(4, vrcOscOffset, 0); } public static void addVmcOsc(FlatBufferBuilder builder, int vmcOscOffset) { builder.addOffset(5, vmcOscOffset, 0); } @@ -103,8 +98,6 @@ public void unpackTo(ChangeSettingsRequestT _o) { else _o.setSteamVrTrackers(null); if (filtering() != null) _o.setFiltering(filtering().unpack()); else _o.setFiltering(null); - if (driftCompensation() != null) _o.setDriftCompensation(driftCompensation().unpack()); - else _o.setDriftCompensation(null); if (oscRouter() != null) _o.setOscRouter(oscRouter().unpack()); else _o.setOscRouter(null); if (vrcOsc() != null) _o.setVrcOsc(vrcOsc().unpack()); @@ -128,7 +121,6 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) { if (_o == null) return 0; int _steamVrTrackers = _o.getSteamVrTrackers() == null ? 0 : solarxr_protocol.rpc.SteamVRTrackersSetting.pack(builder, _o.getSteamVrTrackers()); int _filtering = _o.getFiltering() == null ? 0 : solarxr_protocol.rpc.FilteringSettings.pack(builder, _o.getFiltering()); - int _driftCompensation = _o.getDriftCompensation() == null ? 0 : solarxr_protocol.rpc.DriftCompensationSettings.pack(builder, _o.getDriftCompensation()); int _oscRouter = _o.getOscRouter() == null ? 0 : solarxr_protocol.rpc.OSCRouterSettings.pack(builder, _o.getOscRouter()); int _vrcOsc = _o.getVrcOsc() == null ? 0 : solarxr_protocol.rpc.VRCOSCSettings.pack(builder, _o.getVrcOsc()); int _vmcOsc = _o.getVmcOsc() == null ? 0 : solarxr_protocol.rpc.VMCOSCSettings.pack(builder, _o.getVmcOsc()); @@ -142,7 +134,6 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) { builder, _steamVrTrackers, _filtering, - _driftCompensation, _oscRouter, _vrcOsc, _vmcOsc, diff --git a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java index fea6a6179..16682038e 100644 --- a/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java +++ b/protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java @@ -10,7 +10,6 @@ public class ChangeSettingsRequestT { private solarxr_protocol.rpc.SteamVRTrackersSettingT steamVrTrackers; private solarxr_protocol.rpc.FilteringSettingsT filtering; - private solarxr_protocol.rpc.DriftCompensationSettingsT driftCompensation; private solarxr_protocol.rpc.OSCRouterSettingsT oscRouter; private solarxr_protocol.rpc.VRCOSCSettingsT vrcOsc; private solarxr_protocol.rpc.VMCOSCSettingsT vmcOsc; @@ -29,10 +28,6 @@ public class ChangeSettingsRequestT { public void setFiltering(solarxr_protocol.rpc.FilteringSettingsT filtering) { this.filtering = filtering; } - public solarxr_protocol.rpc.DriftCompensationSettingsT getDriftCompensation() { return driftCompensation; } - - public void setDriftCompensation(solarxr_protocol.rpc.DriftCompensationSettingsT driftCompensation) { this.driftCompensation = driftCompensation; } - public solarxr_protocol.rpc.OSCRouterSettingsT getOscRouter() { return oscRouter; } public void setOscRouter(solarxr_protocol.rpc.OSCRouterSettingsT oscRouter) { this.oscRouter = oscRouter; } @@ -73,7 +68,6 @@ public class ChangeSettingsRequestT { public ChangeSettingsRequestT() { this.steamVrTrackers = null; this.filtering = null; - this.driftCompensation = null; this.oscRouter = null; this.vrcOsc = null; this.vmcOsc = null; diff --git a/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java b/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java index d12d1401e..819df9028 100644 --- a/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java +++ b/protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java @@ -19,8 +19,6 @@ public final class SettingsResponse extends Table { public solarxr_protocol.rpc.SteamVRTrackersSetting steamVrTrackers(solarxr_protocol.rpc.SteamVRTrackersSetting obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.FilteringSettings filtering() { return filtering(new solarxr_protocol.rpc.FilteringSettings()); } public solarxr_protocol.rpc.FilteringSettings filtering(solarxr_protocol.rpc.FilteringSettings obj) { int o = __offset(6); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } - public solarxr_protocol.rpc.DriftCompensationSettings driftCompensation() { return driftCompensation(new solarxr_protocol.rpc.DriftCompensationSettings()); } - public solarxr_protocol.rpc.DriftCompensationSettings driftCompensation(solarxr_protocol.rpc.DriftCompensationSettings obj) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.OSCRouterSettings oscRouter() { return oscRouter(new solarxr_protocol.rpc.OSCRouterSettings()); } public solarxr_protocol.rpc.OSCRouterSettings oscRouter(solarxr_protocol.rpc.OSCRouterSettings obj) { int o = __offset(10); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public solarxr_protocol.rpc.VRCOSCSettings vrcOsc() { return vrcOsc(new solarxr_protocol.rpc.VRCOSCSettings()); } @@ -43,7 +41,6 @@ public final class SettingsResponse extends Table { public static int createSettingsResponse(FlatBufferBuilder builder, int steamVrTrackersOffset, int filteringOffset, - int driftCompensationOffset, int oscRouterOffset, int vrcOscOffset, int vmcOscOffset, @@ -63,7 +60,6 @@ public static int createSettingsResponse(FlatBufferBuilder builder, SettingsResponse.addVmcOsc(builder, vmcOscOffset); SettingsResponse.addVrcOsc(builder, vrcOscOffset); SettingsResponse.addOscRouter(builder, oscRouterOffset); - SettingsResponse.addDriftCompensation(builder, driftCompensationOffset); SettingsResponse.addFiltering(builder, filteringOffset); SettingsResponse.addSteamVrTrackers(builder, steamVrTrackersOffset); return SettingsResponse.endSettingsResponse(builder); @@ -72,7 +68,6 @@ public static int createSettingsResponse(FlatBufferBuilder builder, public static void startSettingsResponse(FlatBufferBuilder builder) { builder.startTable(12); } 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); } public static void addOscRouter(FlatBufferBuilder builder, int oscRouterOffset) { builder.addOffset(3, oscRouterOffset, 0); } public static void addVrcOsc(FlatBufferBuilder builder, int vrcOscOffset) { builder.addOffset(4, vrcOscOffset, 0); } public static void addVmcOsc(FlatBufferBuilder builder, int vmcOscOffset) { builder.addOffset(5, vmcOscOffset, 0); } @@ -103,8 +98,6 @@ public void unpackTo(SettingsResponseT _o) { else _o.setSteamVrTrackers(null); if (filtering() != null) _o.setFiltering(filtering().unpack()); else _o.setFiltering(null); - if (driftCompensation() != null) _o.setDriftCompensation(driftCompensation().unpack()); - else _o.setDriftCompensation(null); if (oscRouter() != null) _o.setOscRouter(oscRouter().unpack()); else _o.setOscRouter(null); if (vrcOsc() != null) _o.setVrcOsc(vrcOsc().unpack()); @@ -128,7 +121,6 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) { if (_o == null) return 0; int _steamVrTrackers = _o.getSteamVrTrackers() == null ? 0 : solarxr_protocol.rpc.SteamVRTrackersSetting.pack(builder, _o.getSteamVrTrackers()); int _filtering = _o.getFiltering() == null ? 0 : solarxr_protocol.rpc.FilteringSettings.pack(builder, _o.getFiltering()); - int _driftCompensation = _o.getDriftCompensation() == null ? 0 : solarxr_protocol.rpc.DriftCompensationSettings.pack(builder, _o.getDriftCompensation()); int _oscRouter = _o.getOscRouter() == null ? 0 : solarxr_protocol.rpc.OSCRouterSettings.pack(builder, _o.getOscRouter()); int _vrcOsc = _o.getVrcOsc() == null ? 0 : solarxr_protocol.rpc.VRCOSCSettings.pack(builder, _o.getVrcOsc()); int _vmcOsc = _o.getVmcOsc() == null ? 0 : solarxr_protocol.rpc.VMCOSCSettings.pack(builder, _o.getVmcOsc()); @@ -142,7 +134,6 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) { builder, _steamVrTrackers, _filtering, - _driftCompensation, _oscRouter, _vrcOsc, _vmcOsc, diff --git a/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java b/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java index 11068908c..bd7b022ff 100644 --- a/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java +++ b/protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java @@ -10,7 +10,6 @@ public class SettingsResponseT { private solarxr_protocol.rpc.SteamVRTrackersSettingT steamVrTrackers; private solarxr_protocol.rpc.FilteringSettingsT filtering; - private solarxr_protocol.rpc.DriftCompensationSettingsT driftCompensation; private solarxr_protocol.rpc.OSCRouterSettingsT oscRouter; private solarxr_protocol.rpc.VRCOSCSettingsT vrcOsc; private solarxr_protocol.rpc.VMCOSCSettingsT vmcOsc; @@ -29,10 +28,6 @@ public class SettingsResponseT { public void setFiltering(solarxr_protocol.rpc.FilteringSettingsT filtering) { this.filtering = filtering; } - public solarxr_protocol.rpc.DriftCompensationSettingsT getDriftCompensation() { return driftCompensation; } - - public void setDriftCompensation(solarxr_protocol.rpc.DriftCompensationSettingsT driftCompensation) { this.driftCompensation = driftCompensation; } - public solarxr_protocol.rpc.OSCRouterSettingsT getOscRouter() { return oscRouter; } public void setOscRouter(solarxr_protocol.rpc.OSCRouterSettingsT oscRouter) { this.oscRouter = oscRouter; } @@ -73,7 +68,6 @@ public class SettingsResponseT { public SettingsResponseT() { this.steamVrTrackers = null; this.filtering = null; - this.driftCompensation = null; this.oscRouter = null; this.vrcOsc = null; this.vmcOsc = null; diff --git a/protocol/kotlin/src/solarxr_protocol/data_feed/tracker/TrackerInfo.kt b/protocol/kotlin/src/solarxr_protocol/data_feed/tracker/TrackerInfo.kt index a24af5083..de62fc207 100644 --- a/protocol/kotlin/src/solarxr_protocol/data_feed/tracker/TrackerInfo.kt +++ b/protocol/kotlin/src/solarxr_protocol/data_feed/tracker/TrackerInfo.kt @@ -100,14 +100,6 @@ class TrackerInfo : Table() { } val customNameAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(20, 1) fun customNameInByteBuffer(_bb: ByteBuffer) : ByteBuffer = __vector_in_bytebuffer(_bb, 20, 1) - /** - * Whether to allow yaw drift compensation for this tracker or not. - */ - val allowDriftCompensation : Boolean - get() { - val o = __offset(22) - return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else false - } /** * Mounting Reset orientation overrides the current `mounting_orientation` of * the tracker, this orientation is not saved and needs to be calculated @@ -174,8 +166,6 @@ class TrackerInfo : Table() { @JvmStatic fun addCustomName(builder: FlatBufferBuilder, customName: Int) = builder.addOffset(8, customName, 0) @JvmStatic - fun addAllowDriftCompensation(builder: FlatBufferBuilder, allowDriftCompensation: Boolean) = builder.addBoolean(9, allowDriftCompensation, false) - @JvmStatic fun addMountingResetOrientation(builder: FlatBufferBuilder, mountingResetOrientation: Int) = builder.addStruct(10, mountingResetOrientation, 0) @JvmStatic fun addIsHmd(builder: FlatBufferBuilder, isHmd: Boolean) = builder.addBoolean(11, isHmd, false) diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/AssignTrackerRequest.kt b/protocol/kotlin/src/solarxr_protocol/rpc/AssignTrackerRequest.kt index 3febae0ff..32be25248 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/AssignTrackerRequest.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/AssignTrackerRequest.kt @@ -46,11 +46,6 @@ class AssignTrackerRequest : Table() { } val displayNameAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(10, 1) fun displayNameInByteBuffer(_bb: ByteBuffer) : ByteBuffer = __vector_in_bytebuffer(_bb, 10, 1) - val allowDriftCompensation : Boolean - get() { - val o = __offset(12) - return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else false - } companion object { @JvmStatic fun validateVersion() = Constants.FLATBUFFERS_22_10_26() @@ -72,8 +67,6 @@ class AssignTrackerRequest : Table() { @JvmStatic fun addDisplayName(builder: FlatBufferBuilder, displayName: Int) = builder.addOffset(3, displayName, 0) @JvmStatic - fun addAllowDriftCompensation(builder: FlatBufferBuilder, allowDriftCompensation: Boolean) = builder.addBoolean(4, allowDriftCompensation, false) - @JvmStatic fun endAssignTrackerRequest(builder: FlatBufferBuilder) : Int { val o = builder.endTable() return o diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt b/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt index 68967b027..112290507 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/ChangeSettingsRequest.kt @@ -34,15 +34,6 @@ class ChangeSettingsRequest : Table() { null } } - val driftCompensation : solarxr_protocol.rpc.DriftCompensationSettings? get() = driftCompensation(solarxr_protocol.rpc.DriftCompensationSettings()) - fun driftCompensation(obj: solarxr_protocol.rpc.DriftCompensationSettings) : solarxr_protocol.rpc.DriftCompensationSettings? { - val o = __offset(8) - return if (o != 0) { - obj.__assign(__indirect(o + bb_pos), bb) - } else { - null - } - } val oscRouter : solarxr_protocol.rpc.OSCRouterSettings? get() = oscRouter(solarxr_protocol.rpc.OSCRouterSettings()) fun oscRouter(obj: solarxr_protocol.rpc.OSCRouterSettings) : solarxr_protocol.rpc.OSCRouterSettings? { val o = __offset(10) @@ -135,7 +126,7 @@ 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) : Int { + fun createChangeSettingsRequest(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int) : Int { builder.startTable(12) addHidSettings(builder, hidSettingsOffset) addStayAligned(builder, stayAlignedOffset) @@ -146,7 +137,6 @@ class ChangeSettingsRequest : Table() { addVmcOsc(builder, vmcOscOffset) addVrcOsc(builder, vrcOscOffset) addOscRouter(builder, oscRouterOffset) - addDriftCompensation(builder, driftCompensationOffset) addFiltering(builder, filteringOffset) addSteamVrTrackers(builder, steamVrTrackersOffset) return endChangeSettingsRequest(builder) @@ -158,8 +148,6 @@ class ChangeSettingsRequest : Table() { @JvmStatic fun addFiltering(builder: FlatBufferBuilder, filtering: Int) = builder.addOffset(1, filtering, 0) @JvmStatic - fun addDriftCompensation(builder: FlatBufferBuilder, driftCompensation: Int) = builder.addOffset(2, driftCompensation, 0) - @JvmStatic fun addOscRouter(builder: FlatBufferBuilder, oscRouter: Int) = builder.addOffset(3, oscRouter, 0) @JvmStatic fun addVrcOsc(builder: FlatBufferBuilder, vrcOsc: Int) = builder.addOffset(4, vrcOsc, 0) diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt b/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt index 298b69e4c..759a41e58 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/SettingsResponse.kt @@ -34,15 +34,6 @@ class SettingsResponse : Table() { null } } - val driftCompensation : solarxr_protocol.rpc.DriftCompensationSettings? get() = driftCompensation(solarxr_protocol.rpc.DriftCompensationSettings()) - fun driftCompensation(obj: solarxr_protocol.rpc.DriftCompensationSettings) : solarxr_protocol.rpc.DriftCompensationSettings? { - val o = __offset(8) - return if (o != 0) { - obj.__assign(__indirect(o + bb_pos), bb) - } else { - null - } - } val oscRouter : solarxr_protocol.rpc.OSCRouterSettings? get() = oscRouter(solarxr_protocol.rpc.OSCRouterSettings()) fun oscRouter(obj: solarxr_protocol.rpc.OSCRouterSettings) : solarxr_protocol.rpc.OSCRouterSettings? { val o = __offset(10) @@ -135,7 +126,7 @@ 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) : Int { + fun createSettingsResponse(builder: FlatBufferBuilder, steamVrTrackersOffset: Int, filteringOffset: Int, oscRouterOffset: Int, vrcOscOffset: Int, vmcOscOffset: Int, modelSettingsOffset: Int, tapDetectionSettingsOffset: Int, autoBoneSettingsOffset: Int, resetsSettingsOffset: Int, stayAlignedOffset: Int, hidSettingsOffset: Int) : Int { builder.startTable(12) addHidSettings(builder, hidSettingsOffset) addStayAligned(builder, stayAlignedOffset) @@ -146,7 +137,6 @@ class SettingsResponse : Table() { addVmcOsc(builder, vmcOscOffset) addVrcOsc(builder, vrcOscOffset) addOscRouter(builder, oscRouterOffset) - addDriftCompensation(builder, driftCompensationOffset) addFiltering(builder, filteringOffset) addSteamVrTrackers(builder, steamVrTrackersOffset) return endSettingsResponse(builder) @@ -158,8 +148,6 @@ class SettingsResponse : Table() { @JvmStatic fun addFiltering(builder: FlatBufferBuilder, filtering: Int) = builder.addOffset(1, filtering, 0) @JvmStatic - fun addDriftCompensation(builder: FlatBufferBuilder, driftCompensation: Int) = builder.addOffset(2, driftCompensation, 0) - @JvmStatic fun addOscRouter(builder: FlatBufferBuilder, oscRouter: Int) = builder.addOffset(3, oscRouter, 0) @JvmStatic fun addVrcOsc(builder: FlatBufferBuilder, vrcOsc: Int) = builder.addOffset(4, vrcOsc, 0) diff --git a/protocol/rust/src/generated/solarxr_protocol/data_feed/tracker/tracker_info_generated.rs b/protocol/rust/src/generated/solarxr_protocol/data_feed/tracker/tracker_info_generated.rs index a53ebd36f..a7dd2c56a 100644 --- a/protocol/rust/src/generated/solarxr_protocol/data_feed/tracker/tracker_info_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/data_feed/tracker/tracker_info_generated.rs @@ -35,7 +35,6 @@ impl<'a> TrackerInfo<'a> { pub const VT_IS_IMU: flatbuffers::VOffsetT = 16; pub const VT_DISPLAY_NAME: flatbuffers::VOffsetT = 18; pub const VT_CUSTOM_NAME: flatbuffers::VOffsetT = 20; - pub const VT_ALLOW_DRIFT_COMPENSATION: flatbuffers::VOffsetT = 22; pub const VT_MOUNTING_RESET_ORIENTATION: flatbuffers::VOffsetT = 24; pub const VT_IS_HMD: flatbuffers::VOffsetT = 26; pub const VT_MAGNETOMETER: flatbuffers::VOffsetT = 28; @@ -60,7 +59,6 @@ impl<'a> TrackerInfo<'a> { builder.add_data_support(args.data_support); builder.add_magnetometer(args.magnetometer); builder.add_is_hmd(args.is_hmd); - builder.add_allow_drift_compensation(args.allow_drift_compensation); builder.add_is_imu(args.is_imu); builder.add_is_computed(args.is_computed); builder.add_editable(args.editable); @@ -140,14 +138,6 @@ impl<'a> TrackerInfo<'a> { // which contains a valid value in this slot unsafe { self._tab.get::>(TrackerInfo::VT_CUSTOM_NAME, None)} } - /// Whether to allow yaw drift compensation for this tracker or not. - #[inline] - pub fn allow_drift_compensation(&self) -> bool { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::(TrackerInfo::VT_ALLOW_DRIFT_COMPENSATION, Some(false)).unwrap()} - } /// Mounting Reset orientation overrides the current `mounting_orientation` of /// the tracker, this orientation is not saved and needs to be calculated /// each time the server is ran @@ -199,7 +189,6 @@ impl flatbuffers::Verifiable for TrackerInfo<'_> { .visit_field::("is_imu", Self::VT_IS_IMU, false)? .visit_field::>("display_name", Self::VT_DISPLAY_NAME, false)? .visit_field::>("custom_name", Self::VT_CUSTOM_NAME, false)? - .visit_field::("allow_drift_compensation", Self::VT_ALLOW_DRIFT_COMPENSATION, false)? .visit_field::("mounting_reset_orientation", Self::VT_MOUNTING_RESET_ORIENTATION, false)? .visit_field::("is_hmd", Self::VT_IS_HMD, false)? .visit_field::("magnetometer", Self::VT_MAGNETOMETER, false)? @@ -218,7 +207,6 @@ pub struct TrackerInfoArgs<'a> { pub is_imu: bool, pub display_name: Option>, pub custom_name: Option>, - pub allow_drift_compensation: bool, pub mounting_reset_orientation: Option<&'a super::super::datatypes::math::Quat>, pub is_hmd: bool, pub magnetometer: super::super::datatypes::MagnetometerStatus, @@ -237,7 +225,6 @@ impl<'a> Default for TrackerInfoArgs<'a> { is_imu: false, display_name: None, custom_name: None, - allow_drift_compensation: false, mounting_reset_orientation: None, is_hmd: false, magnetometer: super::super::datatypes::MagnetometerStatus::NOT_SUPPORTED, @@ -288,10 +275,6 @@ impl<'a: 'b, 'b> TrackerInfoBuilder<'a, 'b> { self.fbb_.push_slot_always::>(TrackerInfo::VT_CUSTOM_NAME, custom_name); } #[inline] - pub fn add_allow_drift_compensation(&mut self, allow_drift_compensation: bool) { - self.fbb_.push_slot::(TrackerInfo::VT_ALLOW_DRIFT_COMPENSATION, allow_drift_compensation, false); - } - #[inline] pub fn add_mounting_reset_orientation(&mut self, mounting_reset_orientation: &super::super::datatypes::math::Quat) { self.fbb_.push_slot_always::<&super::super::datatypes::math::Quat>(TrackerInfo::VT_MOUNTING_RESET_ORIENTATION, mounting_reset_orientation); } @@ -334,7 +317,6 @@ impl core::fmt::Debug for TrackerInfo<'_> { ds.field("is_imu", &self.is_imu()); ds.field("display_name", &self.display_name()); ds.field("custom_name", &self.custom_name()); - ds.field("allow_drift_compensation", &self.allow_drift_compensation()); ds.field("mounting_reset_orientation", &self.mounting_reset_orientation()); ds.field("is_hmd", &self.is_hmd()); ds.field("magnetometer", &self.magnetometer()); diff --git a/protocol/rust/src/generated/solarxr_protocol/rpc/assign_tracker_request_generated.rs b/protocol/rust/src/generated/solarxr_protocol/rpc/assign_tracker_request_generated.rs index 603a99655..323f49124 100644 --- a/protocol/rust/src/generated/solarxr_protocol/rpc/assign_tracker_request_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/rpc/assign_tracker_request_generated.rs @@ -29,7 +29,6 @@ impl<'a> AssignTrackerRequest<'a> { pub const VT_BODY_POSITION: flatbuffers::VOffsetT = 6; pub const VT_MOUNTING_ORIENTATION: flatbuffers::VOffsetT = 8; pub const VT_DISPLAY_NAME: flatbuffers::VOffsetT = 10; - pub const VT_ALLOW_DRIFT_COMPENSATION: flatbuffers::VOffsetT = 12; #[inline] pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { @@ -44,7 +43,6 @@ impl<'a> AssignTrackerRequest<'a> { if let Some(x) = args.display_name { builder.add_display_name(x); } if let Some(x) = args.mounting_orientation { builder.add_mounting_orientation(x); } if let Some(x) = args.tracker_id { builder.add_tracker_id(x); } - builder.add_allow_drift_compensation(args.allow_drift_compensation); builder.add_body_position(args.body_position); builder.finish() } @@ -78,13 +76,6 @@ impl<'a> AssignTrackerRequest<'a> { // which contains a valid value in this slot unsafe { self._tab.get::>(AssignTrackerRequest::VT_DISPLAY_NAME, None)} } - #[inline] - pub fn allow_drift_compensation(&self) -> bool { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::(AssignTrackerRequest::VT_ALLOW_DRIFT_COMPENSATION, Some(false)).unwrap()} - } } impl flatbuffers::Verifiable for AssignTrackerRequest<'_> { @@ -98,7 +89,6 @@ impl flatbuffers::Verifiable for AssignTrackerRequest<'_> { .visit_field::("body_position", Self::VT_BODY_POSITION, false)? .visit_field::("mounting_orientation", Self::VT_MOUNTING_ORIENTATION, false)? .visit_field::>("display_name", Self::VT_DISPLAY_NAME, false)? - .visit_field::("allow_drift_compensation", Self::VT_ALLOW_DRIFT_COMPENSATION, false)? .finish(); Ok(()) } @@ -108,7 +98,6 @@ pub struct AssignTrackerRequestArgs<'a> { pub body_position: super::datatypes::BodyPart, pub mounting_orientation: Option<&'a super::datatypes::math::Quat>, pub display_name: Option>, - pub allow_drift_compensation: bool, } impl<'a> Default for AssignTrackerRequestArgs<'a> { #[inline] @@ -118,7 +107,6 @@ impl<'a> Default for AssignTrackerRequestArgs<'a> { body_position: super::datatypes::BodyPart::NONE, mounting_orientation: None, display_name: None, - allow_drift_compensation: false, } } } @@ -145,10 +133,6 @@ impl<'a: 'b, 'b> AssignTrackerRequestBuilder<'a, 'b> { self.fbb_.push_slot_always::>(AssignTrackerRequest::VT_DISPLAY_NAME, display_name); } #[inline] - pub fn add_allow_drift_compensation(&mut self, allow_drift_compensation: bool) { - self.fbb_.push_slot::(AssignTrackerRequest::VT_ALLOW_DRIFT_COMPENSATION, allow_drift_compensation, false); - } - #[inline] pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> AssignTrackerRequestBuilder<'a, 'b> { let start = _fbb.start_table(); AssignTrackerRequestBuilder { @@ -170,7 +154,6 @@ impl core::fmt::Debug for AssignTrackerRequest<'_> { ds.field("body_position", &self.body_position()); ds.field("mounting_orientation", &self.mounting_orientation()); ds.field("display_name", &self.display_name()); - ds.field("allow_drift_compensation", &self.allow_drift_compensation()); ds.finish() } } 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 fef1cfb8d..e2d9151ed 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 @@ -27,7 +27,6 @@ impl<'a> flatbuffers::Follow<'a> for ChangeSettingsRequest<'a> { impl<'a> ChangeSettingsRequest<'a> { pub const VT_STEAM_VR_TRACKERS: flatbuffers::VOffsetT = 4; pub const VT_FILTERING: flatbuffers::VOffsetT = 6; - pub const VT_DRIFT_COMPENSATION: flatbuffers::VOffsetT = 8; pub const VT_OSC_ROUTER: flatbuffers::VOffsetT = 10; pub const VT_VRC_OSC: flatbuffers::VOffsetT = 12; pub const VT_VMC_OSC: flatbuffers::VOffsetT = 14; @@ -57,7 +56,6 @@ impl<'a> ChangeSettingsRequest<'a> { if let Some(x) = args.vmc_osc { builder.add_vmc_osc(x); } if let Some(x) = args.vrc_osc { builder.add_vrc_osc(x); } if let Some(x) = args.osc_router { builder.add_osc_router(x); } - if let Some(x) = args.drift_compensation { builder.add_drift_compensation(x); } if let Some(x) = args.filtering { builder.add_filtering(x); } if let Some(x) = args.steam_vr_trackers { builder.add_steam_vr_trackers(x); } builder.finish() @@ -79,13 +77,6 @@ impl<'a> ChangeSettingsRequest<'a> { unsafe { self._tab.get::>(ChangeSettingsRequest::VT_FILTERING, None)} } #[inline] - pub fn drift_compensation(&self) -> Option> { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::>(ChangeSettingsRequest::VT_DRIFT_COMPENSATION, None)} - } - #[inline] pub fn osc_router(&self) -> Option> { // Safety: // Created from valid Table for this object @@ -159,7 +150,6 @@ impl flatbuffers::Verifiable for ChangeSettingsRequest<'_> { v.visit_table(pos)? .visit_field::>("steam_vr_trackers", Self::VT_STEAM_VR_TRACKERS, false)? .visit_field::>("filtering", Self::VT_FILTERING, false)? - .visit_field::>("drift_compensation", Self::VT_DRIFT_COMPENSATION, false)? .visit_field::>("osc_router", Self::VT_OSC_ROUTER, false)? .visit_field::>("vrc_osc", Self::VT_VRC_OSC, false)? .visit_field::>("vmc_osc", Self::VT_VMC_OSC, false)? @@ -176,7 +166,6 @@ impl flatbuffers::Verifiable for ChangeSettingsRequest<'_> { pub struct ChangeSettingsRequestArgs<'a> { pub steam_vr_trackers: Option>>, pub filtering: Option>>, - pub drift_compensation: Option>>, pub osc_router: Option>>, pub vrc_osc: Option>>, pub vmc_osc: Option>>, @@ -193,7 +182,6 @@ impl<'a> Default for ChangeSettingsRequestArgs<'a> { ChangeSettingsRequestArgs { steam_vr_trackers: None, filtering: None, - drift_compensation: None, osc_router: None, vrc_osc: None, vmc_osc: None, @@ -221,10 +209,6 @@ impl<'a: 'b, 'b> ChangeSettingsRequestBuilder<'a, 'b> { self.fbb_.push_slot_always::>(ChangeSettingsRequest::VT_FILTERING, filtering); } #[inline] - pub fn add_drift_compensation(&mut self, drift_compensation: flatbuffers::WIPOffset>) { - self.fbb_.push_slot_always::>(ChangeSettingsRequest::VT_DRIFT_COMPENSATION, drift_compensation); - } - #[inline] pub fn add_osc_router(&mut self, osc_router: flatbuffers::WIPOffset>) { self.fbb_.push_slot_always::>(ChangeSettingsRequest::VT_OSC_ROUTER, osc_router); } @@ -280,7 +264,6 @@ impl core::fmt::Debug for ChangeSettingsRequest<'_> { let mut ds = f.debug_struct("ChangeSettingsRequest"); ds.field("steam_vr_trackers", &self.steam_vr_trackers()); ds.field("filtering", &self.filtering()); - ds.field("drift_compensation", &self.drift_compensation()); ds.field("osc_router", &self.osc_router()); ds.field("vrc_osc", &self.vrc_osc()); ds.field("vmc_osc", &self.vmc_osc()); 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 b014c4b84..94ec22f41 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 @@ -27,7 +27,6 @@ impl<'a> flatbuffers::Follow<'a> for SettingsResponse<'a> { impl<'a> SettingsResponse<'a> { pub const VT_STEAM_VR_TRACKERS: flatbuffers::VOffsetT = 4; pub const VT_FILTERING: flatbuffers::VOffsetT = 6; - pub const VT_DRIFT_COMPENSATION: flatbuffers::VOffsetT = 8; pub const VT_OSC_ROUTER: flatbuffers::VOffsetT = 10; pub const VT_VRC_OSC: flatbuffers::VOffsetT = 12; pub const VT_VMC_OSC: flatbuffers::VOffsetT = 14; @@ -57,7 +56,6 @@ impl<'a> SettingsResponse<'a> { if let Some(x) = args.vmc_osc { builder.add_vmc_osc(x); } if let Some(x) = args.vrc_osc { builder.add_vrc_osc(x); } if let Some(x) = args.osc_router { builder.add_osc_router(x); } - if let Some(x) = args.drift_compensation { builder.add_drift_compensation(x); } if let Some(x) = args.filtering { builder.add_filtering(x); } if let Some(x) = args.steam_vr_trackers { builder.add_steam_vr_trackers(x); } builder.finish() @@ -79,13 +77,6 @@ impl<'a> SettingsResponse<'a> { unsafe { self._tab.get::>(SettingsResponse::VT_FILTERING, None)} } #[inline] - pub fn drift_compensation(&self) -> Option> { - // Safety: - // Created from valid Table for this object - // which contains a valid value in this slot - unsafe { self._tab.get::>(SettingsResponse::VT_DRIFT_COMPENSATION, None)} - } - #[inline] pub fn osc_router(&self) -> Option> { // Safety: // Created from valid Table for this object @@ -159,7 +150,6 @@ impl flatbuffers::Verifiable for SettingsResponse<'_> { v.visit_table(pos)? .visit_field::>("steam_vr_trackers", Self::VT_STEAM_VR_TRACKERS, false)? .visit_field::>("filtering", Self::VT_FILTERING, false)? - .visit_field::>("drift_compensation", Self::VT_DRIFT_COMPENSATION, false)? .visit_field::>("osc_router", Self::VT_OSC_ROUTER, false)? .visit_field::>("vrc_osc", Self::VT_VRC_OSC, false)? .visit_field::>("vmc_osc", Self::VT_VMC_OSC, false)? @@ -176,7 +166,6 @@ impl flatbuffers::Verifiable for SettingsResponse<'_> { pub struct SettingsResponseArgs<'a> { pub steam_vr_trackers: Option>>, pub filtering: Option>>, - pub drift_compensation: Option>>, pub osc_router: Option>>, pub vrc_osc: Option>>, pub vmc_osc: Option>>, @@ -193,7 +182,6 @@ impl<'a> Default for SettingsResponseArgs<'a> { SettingsResponseArgs { steam_vr_trackers: None, filtering: None, - drift_compensation: None, osc_router: None, vrc_osc: None, vmc_osc: None, @@ -221,10 +209,6 @@ impl<'a: 'b, 'b> SettingsResponseBuilder<'a, 'b> { self.fbb_.push_slot_always::>(SettingsResponse::VT_FILTERING, filtering); } #[inline] - pub fn add_drift_compensation(&mut self, drift_compensation: flatbuffers::WIPOffset>) { - self.fbb_.push_slot_always::>(SettingsResponse::VT_DRIFT_COMPENSATION, drift_compensation); - } - #[inline] pub fn add_osc_router(&mut self, osc_router: flatbuffers::WIPOffset>) { self.fbb_.push_slot_always::>(SettingsResponse::VT_OSC_ROUTER, osc_router); } @@ -280,7 +264,6 @@ impl core::fmt::Debug for SettingsResponse<'_> { let mut ds = f.debug_struct("SettingsResponse"); ds.field("steam_vr_trackers", &self.steam_vr_trackers()); ds.field("filtering", &self.filtering()); - ds.field("drift_compensation", &self.drift_compensation()); ds.field("osc_router", &self.osc_router()); ds.field("vrc_osc", &self.vrc_osc()); ds.field("vmc_osc", &self.vmc_osc()); diff --git a/protocol/typescript/src/solarxr-protocol/data-feed/tracker/tracker-info.ts b/protocol/typescript/src/solarxr-protocol/data-feed/tracker/tracker-info.ts index 29c386aac..063486c36 100644 --- a/protocol/typescript/src/solarxr-protocol/data-feed/tracker/tracker-info.ts +++ b/protocol/typescript/src/solarxr-protocol/data-feed/tracker/tracker-info.ts @@ -104,14 +104,6 @@ customName(optionalEncoding?:any):string|Uint8Array|null { return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null; } -/** - * Whether to allow yaw drift compensation for this tracker or not. - */ -allowDriftCompensation():boolean { - const offset = this.bb!.__offset(this.bb_pos, 22); - return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false; -} - /** * Mounting Reset orientation overrides the current `mounting_orientation` of * the tracker, this orientation is not saved and needs to be calculated @@ -183,10 +175,6 @@ static addCustomName(builder:flatbuffers.Builder, customNameOffset:flatbuffers.O builder.addFieldOffset(8, customNameOffset, 0); } -static addAllowDriftCompensation(builder:flatbuffers.Builder, allowDriftCompensation:boolean) { - builder.addFieldInt8(9, +allowDriftCompensation, +false); -} - static addMountingResetOrientation(builder:flatbuffers.Builder, mountingResetOrientationOffset:flatbuffers.Offset) { builder.addFieldStruct(10, mountingResetOrientationOffset, 0); } @@ -220,7 +208,6 @@ unpack(): TrackerInfoT { this.isImu(), this.displayName(), this.customName(), - this.allowDriftCompensation(), (this.mountingResetOrientation() !== null ? this.mountingResetOrientation()!.unpack() : null), this.isHmd(), this.magnetometer(), @@ -239,7 +226,6 @@ unpackTo(_o: TrackerInfoT): void { _o.isImu = this.isImu(); _o.displayName = this.displayName(); _o.customName = this.customName(); - _o.allowDriftCompensation = this.allowDriftCompensation(); _o.mountingResetOrientation = (this.mountingResetOrientation() !== null ? this.mountingResetOrientation()!.unpack() : null); _o.isHmd = this.isHmd(); _o.magnetometer = this.magnetometer(); @@ -258,7 +244,6 @@ constructor( public isImu: boolean = false, public displayName: string|Uint8Array|null = null, public customName: string|Uint8Array|null = null, - public allowDriftCompensation: boolean = false, public mountingResetOrientation: QuatT|null = null, public isHmd: boolean = false, public magnetometer: MagnetometerStatus = MagnetometerStatus.NOT_SUPPORTED, @@ -280,7 +265,6 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { TrackerInfo.addIsImu(builder, this.isImu); TrackerInfo.addDisplayName(builder, displayName); TrackerInfo.addCustomName(builder, customName); - TrackerInfo.addAllowDriftCompensation(builder, this.allowDriftCompensation); TrackerInfo.addMountingResetOrientation(builder, (this.mountingResetOrientation !== null ? this.mountingResetOrientation!.pack(builder) : 0)); TrackerInfo.addIsHmd(builder, this.isHmd); TrackerInfo.addMagnetometer(builder, this.magnetometer); diff --git a/protocol/typescript/src/solarxr-protocol/rpc/assign-tracker-request.ts b/protocol/typescript/src/solarxr-protocol/rpc/assign-tracker-request.ts index 692e050f8..2c0d6bd6b 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/assign-tracker-request.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/assign-tracker-request.ts @@ -47,11 +47,6 @@ displayName(optionalEncoding?:any):string|Uint8Array|null { return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null; } -allowDriftCompensation():boolean { - const offset = this.bb!.__offset(this.bb_pos, 12); - return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false; -} - static startAssignTrackerRequest(builder:flatbuffers.Builder) { builder.startObject(5); } @@ -72,10 +67,6 @@ static addDisplayName(builder:flatbuffers.Builder, displayNameOffset:flatbuffers builder.addFieldOffset(3, displayNameOffset, 0); } -static addAllowDriftCompensation(builder:flatbuffers.Builder, allowDriftCompensation:boolean) { - builder.addFieldInt8(4, +allowDriftCompensation, +false); -} - static endAssignTrackerRequest(builder:flatbuffers.Builder):flatbuffers.Offset { const offset = builder.endObject(); return offset; @@ -88,8 +79,7 @@ unpack(): AssignTrackerRequestT { this.bodyPosition(), (this.mountingOrientation() !== null ? this.mountingOrientation()!.unpack() : null), this.displayName(), - this.allowDriftCompensation() - ); +); } @@ -98,7 +88,6 @@ unpackTo(_o: AssignTrackerRequestT): void { _o.bodyPosition = this.bodyPosition(); _o.mountingOrientation = (this.mountingOrientation() !== null ? this.mountingOrientation()!.unpack() : null); _o.displayName = this.displayName(); - _o.allowDriftCompensation = this.allowDriftCompensation(); } } @@ -108,21 +97,17 @@ constructor( public bodyPosition: BodyPart = BodyPart.NONE, public mountingOrientation: QuatT|null = null, public displayName: string|Uint8Array|null = null, - public allowDriftCompensation: boolean = false ){} pack(builder:flatbuffers.Builder): flatbuffers.Offset { const trackerId = (this.trackerId !== null ? this.trackerId!.pack(builder) : 0); const displayName = (this.displayName !== null ? builder.createString(this.displayName!) : 0); - AssignTrackerRequest.startAssignTrackerRequest(builder); AssignTrackerRequest.addTrackerId(builder, trackerId); AssignTrackerRequest.addBodyPosition(builder, this.bodyPosition); AssignTrackerRequest.addMountingOrientation(builder, (this.mountingOrientation !== null ? this.mountingOrientation!.pack(builder) : 0)); AssignTrackerRequest.addDisplayName(builder, displayName); - AssignTrackerRequest.addAllowDriftCompensation(builder, this.allowDriftCompensation); - - return AssignTrackerRequest.endAssignTrackerRequest(builder); +return AssignTrackerRequest.endAssignTrackerRequest(builder); } } 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 27b19d46e..d67040b18 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/change-settings-request.ts @@ -3,7 +3,6 @@ import * as flatbuffers from 'flatbuffers'; import { AutoBoneSettings, AutoBoneSettingsT } from '../../solarxr-protocol/rpc/auto-bone-settings.js'; -import { DriftCompensationSettings, DriftCompensationSettingsT } from '../../solarxr-protocol/rpc/drift-compensation-settings.js'; import { FilteringSettings, FilteringSettingsT } from '../../solarxr-protocol/rpc/filtering-settings.js'; import { HIDSettings, HIDSettingsT } from '../../solarxr-protocol/rpc/hidsettings.js'; import { OSCRouterSettings, OSCRouterSettingsT } from '../../solarxr-protocol/rpc/oscrouter-settings.js'; @@ -44,11 +43,6 @@ filtering(obj?:FilteringSettings):FilteringSettings|null { return offset ? (obj || new FilteringSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; } -driftCompensation(obj?:DriftCompensationSettings):DriftCompensationSettings|null { - const offset = this.bb!.__offset(this.bb_pos, 8); - return offset ? (obj || new DriftCompensationSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; -} - oscRouter(obj?:OSCRouterSettings):OSCRouterSettings|null { const offset = this.bb!.__offset(this.bb_pos, 10); return offset ? (obj || new OSCRouterSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; @@ -106,10 +100,6 @@ static addFiltering(builder:flatbuffers.Builder, filteringOffset:flatbuffers.Off builder.addFieldOffset(1, filteringOffset, 0); } -static addDriftCompensation(builder:flatbuffers.Builder, driftCompensationOffset:flatbuffers.Offset) { - builder.addFieldOffset(2, driftCompensationOffset, 0); -} - static addOscRouter(builder:flatbuffers.Builder, oscRouterOffset:flatbuffers.Offset) { builder.addFieldOffset(3, oscRouterOffset, 0); } @@ -156,7 +146,6 @@ unpack(): ChangeSettingsRequestT { return new ChangeSettingsRequestT( (this.steamVrTrackers() !== null ? this.steamVrTrackers()!.unpack() : null), (this.filtering() !== null ? this.filtering()!.unpack() : null), - (this.driftCompensation() !== null ? this.driftCompensation()!.unpack() : null), (this.oscRouter() !== null ? this.oscRouter()!.unpack() : null), (this.vrcOsc() !== null ? this.vrcOsc()!.unpack() : null), (this.vmcOsc() !== null ? this.vmcOsc()!.unpack() : null), @@ -173,7 +162,6 @@ unpack(): ChangeSettingsRequestT { unpackTo(_o: ChangeSettingsRequestT): void { _o.steamVrTrackers = (this.steamVrTrackers() !== null ? this.steamVrTrackers()!.unpack() : null); _o.filtering = (this.filtering() !== null ? this.filtering()!.unpack() : null); - _o.driftCompensation = (this.driftCompensation() !== null ? this.driftCompensation()!.unpack() : null); _o.oscRouter = (this.oscRouter() !== null ? this.oscRouter()!.unpack() : null); _o.vrcOsc = (this.vrcOsc() !== null ? this.vrcOsc()!.unpack() : null); _o.vmcOsc = (this.vmcOsc() !== null ? this.vmcOsc()!.unpack() : null); @@ -190,7 +178,6 @@ export class ChangeSettingsRequestT implements flatbuffers.IGeneratedObject { constructor( public steamVrTrackers: SteamVRTrackersSettingT|null = null, public filtering: FilteringSettingsT|null = null, - public driftCompensation: DriftCompensationSettingsT|null = null, public oscRouter: OSCRouterSettingsT|null = null, public vrcOsc: VRCOSCSettingsT|null = null, public vmcOsc: VMCOSCSettingsT|null = null, @@ -206,7 +193,6 @@ constructor( pack(builder:flatbuffers.Builder): flatbuffers.Offset { const steamVrTrackers = (this.steamVrTrackers !== null ? this.steamVrTrackers!.pack(builder) : 0); const filtering = (this.filtering !== null ? this.filtering!.pack(builder) : 0); - const driftCompensation = (this.driftCompensation !== null ? this.driftCompensation!.pack(builder) : 0); const oscRouter = (this.oscRouter !== null ? this.oscRouter!.pack(builder) : 0); const vrcOsc = (this.vrcOsc !== null ? this.vrcOsc!.pack(builder) : 0); const vmcOsc = (this.vmcOsc !== null ? this.vmcOsc!.pack(builder) : 0); @@ -220,7 +206,6 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { ChangeSettingsRequest.startChangeSettingsRequest(builder); ChangeSettingsRequest.addSteamVrTrackers(builder, steamVrTrackers); ChangeSettingsRequest.addFiltering(builder, filtering); - ChangeSettingsRequest.addDriftCompensation(builder, driftCompensation); ChangeSettingsRequest.addOscRouter(builder, oscRouter); ChangeSettingsRequest.addVrcOsc(builder, vrcOsc); ChangeSettingsRequest.addVmcOsc(builder, vmcOsc); diff --git a/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts b/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts index d707cce66..a5aa275c8 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/settings-response.ts @@ -3,7 +3,6 @@ import * as flatbuffers from 'flatbuffers'; import { AutoBoneSettings, AutoBoneSettingsT } from '../../solarxr-protocol/rpc/auto-bone-settings.js'; -import { DriftCompensationSettings, DriftCompensationSettingsT } from '../../solarxr-protocol/rpc/drift-compensation-settings.js'; import { FilteringSettings, FilteringSettingsT } from '../../solarxr-protocol/rpc/filtering-settings.js'; import { HIDSettings, HIDSettingsT } from '../../solarxr-protocol/rpc/hidsettings.js'; import { OSCRouterSettings, OSCRouterSettingsT } from '../../solarxr-protocol/rpc/oscrouter-settings.js'; @@ -44,11 +43,6 @@ filtering(obj?:FilteringSettings):FilteringSettings|null { return offset ? (obj || new FilteringSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; } -driftCompensation(obj?:DriftCompensationSettings):DriftCompensationSettings|null { - const offset = this.bb!.__offset(this.bb_pos, 8); - return offset ? (obj || new DriftCompensationSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; -} - oscRouter(obj?:OSCRouterSettings):OSCRouterSettings|null { const offset = this.bb!.__offset(this.bb_pos, 10); return offset ? (obj || new OSCRouterSettings()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; @@ -106,10 +100,6 @@ static addFiltering(builder:flatbuffers.Builder, filteringOffset:flatbuffers.Off builder.addFieldOffset(1, filteringOffset, 0); } -static addDriftCompensation(builder:flatbuffers.Builder, driftCompensationOffset:flatbuffers.Offset) { - builder.addFieldOffset(2, driftCompensationOffset, 0); -} - static addOscRouter(builder:flatbuffers.Builder, oscRouterOffset:flatbuffers.Offset) { builder.addFieldOffset(3, oscRouterOffset, 0); } @@ -156,7 +146,6 @@ unpack(): SettingsResponseT { return new SettingsResponseT( (this.steamVrTrackers() !== null ? this.steamVrTrackers()!.unpack() : null), (this.filtering() !== null ? this.filtering()!.unpack() : null), - (this.driftCompensation() !== null ? this.driftCompensation()!.unpack() : null), (this.oscRouter() !== null ? this.oscRouter()!.unpack() : null), (this.vrcOsc() !== null ? this.vrcOsc()!.unpack() : null), (this.vmcOsc() !== null ? this.vmcOsc()!.unpack() : null), @@ -173,7 +162,6 @@ unpack(): SettingsResponseT { unpackTo(_o: SettingsResponseT): void { _o.steamVrTrackers = (this.steamVrTrackers() !== null ? this.steamVrTrackers()!.unpack() : null); _o.filtering = (this.filtering() !== null ? this.filtering()!.unpack() : null); - _o.driftCompensation = (this.driftCompensation() !== null ? this.driftCompensation()!.unpack() : null); _o.oscRouter = (this.oscRouter() !== null ? this.oscRouter()!.unpack() : null); _o.vrcOsc = (this.vrcOsc() !== null ? this.vrcOsc()!.unpack() : null); _o.vmcOsc = (this.vmcOsc() !== null ? this.vmcOsc()!.unpack() : null); @@ -190,7 +178,6 @@ export class SettingsResponseT implements flatbuffers.IGeneratedObject { constructor( public steamVrTrackers: SteamVRTrackersSettingT|null = null, public filtering: FilteringSettingsT|null = null, - public driftCompensation: DriftCompensationSettingsT|null = null, public oscRouter: OSCRouterSettingsT|null = null, public vrcOsc: VRCOSCSettingsT|null = null, public vmcOsc: VMCOSCSettingsT|null = null, @@ -206,7 +193,6 @@ constructor( pack(builder:flatbuffers.Builder): flatbuffers.Offset { const steamVrTrackers = (this.steamVrTrackers !== null ? this.steamVrTrackers!.pack(builder) : 0); const filtering = (this.filtering !== null ? this.filtering!.pack(builder) : 0); - const driftCompensation = (this.driftCompensation !== null ? this.driftCompensation!.pack(builder) : 0); const oscRouter = (this.oscRouter !== null ? this.oscRouter!.pack(builder) : 0); const vrcOsc = (this.vrcOsc !== null ? this.vrcOsc!.pack(builder) : 0); const vmcOsc = (this.vmcOsc !== null ? this.vmcOsc!.pack(builder) : 0); @@ -220,7 +206,6 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { SettingsResponse.startSettingsResponse(builder); SettingsResponse.addSteamVrTrackers(builder, steamVrTrackers); SettingsResponse.addFiltering(builder, filtering); - SettingsResponse.addDriftCompensation(builder, driftCompensation); SettingsResponse.addOscRouter(builder, oscRouter); SettingsResponse.addVrcOsc(builder, vrcOsc); SettingsResponse.addVmcOsc(builder, vmcOsc); diff --git a/schema/data_feed/tracker.fbs b/schema/data_feed/tracker.fbs index a5ffd48b3..0182a7516 100644 --- a/schema/data_feed/tracker.fbs +++ b/schema/data_feed/tracker.fbs @@ -100,7 +100,7 @@ table TrackerInfo { custom_name: string; /// Whether to allow yaw drift compensation for this tracker or not. - allow_drift_compensation: bool; + allow_drift_compensation: bool (deprecated); /// Mounting Reset orientation overrides the current `mounting_orientation` of /// the tracker, this orientation is not saved and needs to be calculated diff --git a/schema/rpc.fbs b/schema/rpc.fbs index c54f1504e..c3627484e 100644 --- a/schema/rpc.fbs +++ b/schema/rpc.fbs @@ -20,6 +20,7 @@ union RpcMessage { SettingsRequest, SettingsResponse, ChangeSettingsRequest, + // DEPRECATED ClearDriftCompensationRequest, RecordBVHRequest, RecordBVHStatus, @@ -151,10 +152,10 @@ table AssignTrackerRequest { body_position: solarxr_protocol.datatypes.BodyPart; mounting_orientation: solarxr_protocol.datatypes.math.Quat; display_name: string; - allow_drift_compensation: bool; + allow_drift_compensation: bool (deprecated); } -table ClearDriftCompensationRequest {} +table ClearDriftCompensationRequest (deprecated) {} // ---- Settings ---- @@ -163,7 +164,7 @@ table SettingsRequest {} table SettingsResponse { steam_vr_trackers: SteamVRTrackersSetting; filtering: FilteringSettings; - drift_compensation: DriftCompensationSettings; + drift_compensation: DriftCompensationSettings (deprecated); osc_router: OSCRouterSettings; vrc_osc: VRCOSCSettings; vmc_osc: VMCOSCSettings; @@ -178,7 +179,7 @@ table SettingsResponse { table ChangeSettingsRequest { steam_vr_trackers: SteamVRTrackersSetting; filtering: FilteringSettings; - drift_compensation: DriftCompensationSettings; + drift_compensation: DriftCompensationSettings (deprecated); osc_router: OSCRouterSettings; vrc_osc: VRCOSCSettings; vmc_osc: VMCOSCSettings; @@ -223,7 +224,7 @@ table FilteringSettings { } /// Settings related to IMU yaw drift compensation -table DriftCompensationSettings { +table DriftCompensationSettings (deprecated) { enabled: bool; prediction: bool; /// 0 to 1. A higher value results in more yaw drift compensation