Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 4 additions & 51 deletions protocol/cpp/include/solarxr_protocol/generated/all_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -4475,10 +4474,6 @@ struct TrackerInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const flatbuffers::String *custom_name() const {
return GetPointer<const flatbuffers::String *>(VT_CUSTOM_NAME);
}
/// Whether to allow yaw drift compensation for this tracker or not.
bool allow_drift_compensation() const {
return GetField<uint8_t>(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
Expand Down Expand Up @@ -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<uint8_t>(verifier, VT_ALLOW_DRIFT_COMPENSATION, 1) &&
VerifyField<solarxr_protocol::datatypes::math::Quat>(verifier, VT_MOUNTING_RESET_ORIENTATION, 4) &&
VerifyField<uint8_t>(verifier, VT_IS_HMD, 1) &&
VerifyField<uint8_t>(verifier, VT_MAGNETOMETER, 1) &&
Expand Down Expand Up @@ -4549,9 +4543,6 @@ struct TrackerInfoBuilder {
void add_custom_name(flatbuffers::Offset<flatbuffers::String> custom_name) {
fbb_.AddOffset(TrackerInfo::VT_CUSTOM_NAME, custom_name);
}
void add_allow_drift_compensation(bool allow_drift_compensation) {
fbb_.AddElement<uint8_t>(TrackerInfo::VT_ALLOW_DRIFT_COMPENSATION, static_cast<uint8_t>(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);
}
Expand Down Expand Up @@ -4586,7 +4577,6 @@ inline flatbuffers::Offset<TrackerInfo> CreateTrackerInfo(
bool is_imu = false,
flatbuffers::Offset<flatbuffers::String> display_name = 0,
flatbuffers::Offset<flatbuffers::String> 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,
Expand All @@ -4601,7 +4591,6 @@ inline flatbuffers::Offset<TrackerInfo> 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);
Expand All @@ -4620,7 +4609,6 @@ inline flatbuffers::Offset<TrackerInfo> 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,
Expand All @@ -4638,7 +4626,6 @@ inline flatbuffers::Offset<TrackerInfo> CreateTrackerInfoDirect(
is_imu,
display_name__,
custom_name__,
allow_drift_compensation,
mounting_reset_orientation,
is_hmd,
magnetometer,
Expand Down Expand Up @@ -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<const solarxr_protocol::datatypes::TrackerId *>(VT_TRACKER_ID);
Expand All @@ -6679,9 +6665,6 @@ struct AssignTrackerRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
const flatbuffers::String *display_name() const {
return GetPointer<const flatbuffers::String *>(VT_DISPLAY_NAME);
}
bool allow_drift_compensation() const {
return GetField<uint8_t>(VT_ALLOW_DRIFT_COMPENSATION, 0) != 0;
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_TRACKER_ID) &&
Expand All @@ -6690,7 +6673,6 @@ struct AssignTrackerRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
VerifyField<solarxr_protocol::datatypes::math::Quat>(verifier, VT_MOUNTING_ORIENTATION, 4) &&
VerifyOffset(verifier, VT_DISPLAY_NAME) &&
verifier.VerifyString(display_name()) &&
VerifyField<uint8_t>(verifier, VT_ALLOW_DRIFT_COMPENSATION, 1) &&
verifier.EndTable();
}
};
Expand All @@ -6711,9 +6693,6 @@ struct AssignTrackerRequestBuilder {
void add_display_name(flatbuffers::Offset<flatbuffers::String> display_name) {
fbb_.AddOffset(AssignTrackerRequest::VT_DISPLAY_NAME, display_name);
}
void add_allow_drift_compensation(bool allow_drift_compensation) {
fbb_.AddElement<uint8_t>(AssignTrackerRequest::VT_ALLOW_DRIFT_COMPENSATION, static_cast<uint8_t>(allow_drift_compensation), 0);
}
explicit AssignTrackerRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
start_ = fbb_.StartTable();
Expand All @@ -6730,13 +6709,11 @@ inline flatbuffers::Offset<AssignTrackerRequest> CreateAssignTrackerRequest(
flatbuffers::Offset<solarxr_protocol::datatypes::TrackerId> 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<flatbuffers::String> display_name = 0,
bool allow_drift_compensation = false) {
flatbuffers::Offset<flatbuffers::String> 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();
}
Expand All @@ -6746,16 +6723,14 @@ inline flatbuffers::Offset<AssignTrackerRequest> CreateAssignTrackerRequestDirec
flatbuffers::Offset<solarxr_protocol::datatypes::TrackerId> 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 {
Expand Down Expand Up @@ -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,
Expand All @@ -6838,9 +6812,6 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const solarxr_protocol::rpc::FilteringSettings *filtering() const {
return GetPointer<const solarxr_protocol::rpc::FilteringSettings *>(VT_FILTERING);
}
const solarxr_protocol::rpc::DriftCompensationSettings *drift_compensation() const {
return GetPointer<const solarxr_protocol::rpc::DriftCompensationSettings *>(VT_DRIFT_COMPENSATION);
}
const solarxr_protocol::rpc::OSCRouterSettings *osc_router() const {
return GetPointer<const solarxr_protocol::rpc::OSCRouterSettings *>(VT_OSC_ROUTER);
}
Expand Down Expand Up @@ -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) &&
Expand Down Expand Up @@ -6908,9 +6877,6 @@ struct SettingsResponseBuilder {
void add_filtering(flatbuffers::Offset<solarxr_protocol::rpc::FilteringSettings> filtering) {
fbb_.AddOffset(SettingsResponse::VT_FILTERING, filtering);
}
void add_drift_compensation(flatbuffers::Offset<solarxr_protocol::rpc::DriftCompensationSettings> drift_compensation) {
fbb_.AddOffset(SettingsResponse::VT_DRIFT_COMPENSATION, drift_compensation);
}
void add_osc_router(flatbuffers::Offset<solarxr_protocol::rpc::OSCRouterSettings> osc_router) {
fbb_.AddOffset(SettingsResponse::VT_OSC_ROUTER, osc_router);
}
Expand Down Expand Up @@ -6953,7 +6919,6 @@ inline flatbuffers::Offset<SettingsResponse> CreateSettingsResponse(
flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<solarxr_protocol::rpc::SteamVRTrackersSetting> steam_vr_trackers = 0,
flatbuffers::Offset<solarxr_protocol::rpc::FilteringSettings> filtering = 0,
flatbuffers::Offset<solarxr_protocol::rpc::DriftCompensationSettings> drift_compensation = 0,
flatbuffers::Offset<solarxr_protocol::rpc::OSCRouterSettings> osc_router = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VRCOSCSettings> vrc_osc = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VMCOSCSettings> vmc_osc = 0,
Expand All @@ -6973,7 +6938,6 @@ inline flatbuffers::Offset<SettingsResponse> 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();
Expand All @@ -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,
Expand All @@ -7001,9 +6964,6 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
const solarxr_protocol::rpc::FilteringSettings *filtering() const {
return GetPointer<const solarxr_protocol::rpc::FilteringSettings *>(VT_FILTERING);
}
const solarxr_protocol::rpc::DriftCompensationSettings *drift_compensation() const {
return GetPointer<const solarxr_protocol::rpc::DriftCompensationSettings *>(VT_DRIFT_COMPENSATION);
}
const solarxr_protocol::rpc::OSCRouterSettings *osc_router() const {
return GetPointer<const solarxr_protocol::rpc::OSCRouterSettings *>(VT_OSC_ROUTER);
}
Expand Down Expand Up @@ -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) &&
Expand Down Expand Up @@ -7071,9 +7029,6 @@ struct ChangeSettingsRequestBuilder {
void add_filtering(flatbuffers::Offset<solarxr_protocol::rpc::FilteringSettings> filtering) {
fbb_.AddOffset(ChangeSettingsRequest::VT_FILTERING, filtering);
}
void add_drift_compensation(flatbuffers::Offset<solarxr_protocol::rpc::DriftCompensationSettings> drift_compensation) {
fbb_.AddOffset(ChangeSettingsRequest::VT_DRIFT_COMPENSATION, drift_compensation);
}
void add_osc_router(flatbuffers::Offset<solarxr_protocol::rpc::OSCRouterSettings> osc_router) {
fbb_.AddOffset(ChangeSettingsRequest::VT_OSC_ROUTER, osc_router);
}
Expand Down Expand Up @@ -7116,7 +7071,6 @@ inline flatbuffers::Offset<ChangeSettingsRequest> CreateChangeSettingsRequest(
flatbuffers::FlatBufferBuilder &_fbb,
flatbuffers::Offset<solarxr_protocol::rpc::SteamVRTrackersSetting> steam_vr_trackers = 0,
flatbuffers::Offset<solarxr_protocol::rpc::FilteringSettings> filtering = 0,
flatbuffers::Offset<solarxr_protocol::rpc::DriftCompensationSettings> drift_compensation = 0,
flatbuffers::Offset<solarxr_protocol::rpc::OSCRouterSettings> osc_router = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VRCOSCSettings> vrc_osc = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VMCOSCSettings> vmc_osc = 0,
Expand All @@ -7136,7 +7090,6 @@ inline flatbuffers::Offset<ChangeSettingsRequest> 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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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); }
Expand Down Expand Up @@ -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();
Expand All @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
}
}
Expand Down
Loading