Skip to content

Added VelocitySettings to RPC schema #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M1DNYT3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added VelocitySettings to RPC schema #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 70 additions & 4 deletions protocol/cpp/include/solarxr_protocol/generated/all_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ struct StayAlignedSettingsBuilder;
struct HIDSettings;
struct HIDSettingsBuilder;

struct VelocitySettings;
struct VelocitySettingsBuilder;

struct TapDetectionSetupNotification;
struct TapDetectionSetupNotificationBuilder;

Expand Down Expand Up @@ -6830,7 +6833,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_AUTO_BONE_SETTINGS = 20,
VT_RESETS_SETTINGS = 22,
VT_STAY_ALIGNED = 24,
VT_HID_SETTINGS = 26
VT_HID_SETTINGS = 26,
VT_VELOCITY_SETTINGS = 28
};
const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const {
return GetPointer<const solarxr_protocol::rpc::SteamVRTrackersSetting *>(VT_STEAM_VR_TRACKERS);
Expand Down Expand Up @@ -6868,6 +6872,9 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const solarxr_protocol::rpc::HIDSettings *hid_settings() const {
return GetPointer<const solarxr_protocol::rpc::HIDSettings *>(VT_HID_SETTINGS);
}
const solarxr_protocol::rpc::VelocitySettings *velocity_settings() const {
return GetPointer<const solarxr_protocol::rpc::VelocitySettings *>(VT_VELOCITY_SETTINGS);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) &&
Expand All @@ -6894,6 +6901,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
verifier.VerifyTable(stay_aligned()) &&
VerifyOffset(verifier, VT_HID_SETTINGS) &&
verifier.VerifyTable(hid_settings()) &&
VerifyOffset(verifier, VT_VELOCITY_SETTINGS) &&
verifier.VerifyTable(velocity_settings()) &&
verifier.EndTable();
}
};
Expand Down Expand Up @@ -6938,6 +6947,9 @@ struct SettingsResponseBuilder {
void add_hid_settings(flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings) {
fbb_.AddOffset(SettingsResponse::VT_HID_SETTINGS, hid_settings);
}
void add_velocity_settings(flatbuffers::Offset<solarxr_protocol::rpc::VelocitySettings> velocity_settings) {
fbb_.AddOffset(SettingsResponse::VT_VELOCITY_SETTINGS, velocity_settings);
}
explicit SettingsResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
start_ = fbb_.StartTable();
Expand All @@ -6962,8 +6974,10 @@ inline flatbuffers::Offset<SettingsResponse> CreateSettingsResponse(
flatbuffers::Offset<solarxr_protocol::rpc::AutoBoneSettings> auto_bone_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::ResetsSettings> resets_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0,
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0) {
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VelocitySettings> velocity_settings = 0) {
SettingsResponseBuilder builder_(_fbb);
builder_.add_velocity_settings(velocity_settings);
builder_.add_hid_settings(hid_settings);
builder_.add_stay_aligned(stay_aligned);
builder_.add_resets_settings(resets_settings);
Expand Down Expand Up @@ -6993,7 +7007,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
VT_AUTO_BONE_SETTINGS = 20,
VT_RESETS_SETTINGS = 22,
VT_STAY_ALIGNED = 24,
VT_HID_SETTINGS = 26
VT_HID_SETTINGS = 26,
VT_VELOCITY_SETTINGS = 28
};
const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const {
return GetPointer<const solarxr_protocol::rpc::SteamVRTrackersSetting *>(VT_STEAM_VR_TRACKERS);
Expand Down Expand Up @@ -7031,6 +7046,9 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
const solarxr_protocol::rpc::HIDSettings *hid_settings() const {
return GetPointer<const solarxr_protocol::rpc::HIDSettings *>(VT_HID_SETTINGS);
}
const solarxr_protocol::rpc::VelocitySettings *velocity_settings() const {
return GetPointer<const solarxr_protocol::rpc::VelocitySettings *>(VT_VELOCITY_SETTINGS);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) &&
Expand All @@ -7057,6 +7075,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
verifier.VerifyTable(stay_aligned()) &&
VerifyOffset(verifier, VT_HID_SETTINGS) &&
verifier.VerifyTable(hid_settings()) &&
VerifyOffset(verifier, VT_VELOCITY_SETTINGS) &&
verifier.VerifyTable(velocity_settings()) &&
verifier.EndTable();
}
};
Expand Down Expand Up @@ -7101,6 +7121,9 @@ struct ChangeSettingsRequestBuilder {
void add_hid_settings(flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings) {
fbb_.AddOffset(ChangeSettingsRequest::VT_HID_SETTINGS, hid_settings);
}
void add_velocity_settings(flatbuffers::Offset<solarxr_protocol::rpc::VelocitySettings> velocity_settings) {
fbb_.AddOffset(ChangeSettingsRequest::VT_VELOCITY_SETTINGS, velocity_settings);
}
explicit ChangeSettingsRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
start_ = fbb_.StartTable();
Expand All @@ -7125,8 +7148,10 @@ inline flatbuffers::Offset<ChangeSettingsRequest> CreateChangeSettingsRequest(
flatbuffers::Offset<solarxr_protocol::rpc::AutoBoneSettings> auto_bone_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::ResetsSettings> resets_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0,
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0) {
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0,
flatbuffers::Offset<solarxr_protocol::rpc::VelocitySettings> velocity_settings = 0) {
ChangeSettingsRequestBuilder builder_(_fbb);
builder_.add_velocity_settings(velocity_settings);
builder_.add_hid_settings(hid_settings);
builder_.add_stay_aligned(stay_aligned);
builder_.add_resets_settings(resets_settings);
Expand Down Expand Up @@ -8250,6 +8275,47 @@ inline flatbuffers::Offset<HIDSettings> CreateHIDSettings(
return builder_.Finish();
}

struct VelocitySettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef VelocitySettingsBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
VT_SEND_DERIVED_VELOCITY = 4
};
bool send_derived_velocity() const {
return GetField<uint8_t>(VT_SEND_DERIVED_VELOCITY, 0) != 0;
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<uint8_t>(verifier, VT_SEND_DERIVED_VELOCITY, 1) &&
verifier.EndTable();
}
};

struct VelocitySettingsBuilder {
typedef VelocitySettings Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
void add_send_derived_velocity(bool send_derived_velocity) {
fbb_.AddElement<uint8_t>(VelocitySettings::VT_SEND_DERIVED_VELOCITY, static_cast<uint8_t>(send_derived_velocity), 0);
}
explicit VelocitySettingsBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
start_ = fbb_.StartTable();
}
flatbuffers::Offset<VelocitySettings> Finish() {
const auto end = fbb_.EndTable(start_);
auto o = flatbuffers::Offset<VelocitySettings>(end);
return o;
}
};

inline flatbuffers::Offset<VelocitySettings> CreateVelocitySettings(
flatbuffers::FlatBufferBuilder &_fbb,
bool send_derived_velocity = false) {
VelocitySettingsBuilder builder_(_fbb);
builder_.add_send_derived_velocity(send_derived_velocity);
return builder_.Finish();
}

/// See TapDetectionSettings::setup_mode
struct TapDetectionSetupNotification FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef TapDetectionSetupNotificationBuilder Builder;
Expand Down
17 changes: 13 additions & 4 deletions protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public final class ChangeSettingsRequest extends Table {
public solarxr_protocol.rpc.StayAlignedSettings stayAligned(solarxr_protocol.rpc.StayAlignedSettings obj) { int o = __offset(24); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
public solarxr_protocol.rpc.HIDSettings hidSettings() { return hidSettings(new solarxr_protocol.rpc.HIDSettings()); }
public solarxr_protocol.rpc.HIDSettings hidSettings(solarxr_protocol.rpc.HIDSettings obj) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
public solarxr_protocol.rpc.VelocitySettings velocitySettings() { return velocitySettings(new solarxr_protocol.rpc.VelocitySettings()); }
public solarxr_protocol.rpc.VelocitySettings velocitySettings(solarxr_protocol.rpc.VelocitySettings obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }

public static int createChangeSettingsRequest(FlatBufferBuilder builder,
int steamVrTrackersOffset,
Expand All @@ -52,8 +54,10 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
int autoBoneSettingsOffset,
int resetsSettingsOffset,
int stayAlignedOffset,
int hidSettingsOffset) {
builder.startTable(12);
int hidSettingsOffset,
int velocitySettingsOffset) {
builder.startTable(13);
ChangeSettingsRequest.addVelocitySettings(builder, velocitySettingsOffset);
ChangeSettingsRequest.addHidSettings(builder, hidSettingsOffset);
ChangeSettingsRequest.addStayAligned(builder, stayAlignedOffset);
ChangeSettingsRequest.addResetsSettings(builder, resetsSettingsOffset);
Expand All @@ -69,7 +73,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
return ChangeSettingsRequest.endChangeSettingsRequest(builder);
}

public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(12); }
public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(13); }
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); }
Expand All @@ -82,6 +86,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
public static void addResetsSettings(FlatBufferBuilder builder, int resetsSettingsOffset) { builder.addOffset(9, resetsSettingsOffset, 0); }
public static void addStayAligned(FlatBufferBuilder builder, int stayAlignedOffset) { builder.addOffset(10, stayAlignedOffset, 0); }
public static void addHidSettings(FlatBufferBuilder builder, int hidSettingsOffset) { builder.addOffset(11, hidSettingsOffset, 0); }
public static void addVelocitySettings(FlatBufferBuilder builder, int velocitySettingsOffset) { builder.addOffset(12, velocitySettingsOffset, 0); }
public static int endChangeSettingsRequest(FlatBufferBuilder builder) {
int o = builder.endTable();
return o;
Expand Down Expand Up @@ -123,6 +128,8 @@ public void unpackTo(ChangeSettingsRequestT _o) {
else _o.setStayAligned(null);
if (hidSettings() != null) _o.setHidSettings(hidSettings().unpack());
else _o.setHidSettings(null);
if (velocitySettings() != null) _o.setVelocitySettings(velocitySettings().unpack());
else _o.setVelocitySettings(null);
}
public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
if (_o == null) return 0;
Expand All @@ -138,6 +145,7 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
int _resetsSettings = _o.getResetsSettings() == null ? 0 : solarxr_protocol.rpc.ResetsSettings.pack(builder, _o.getResetsSettings());
int _stayAligned = _o.getStayAligned() == null ? 0 : solarxr_protocol.rpc.StayAlignedSettings.pack(builder, _o.getStayAligned());
int _hidSettings = _o.getHidSettings() == null ? 0 : solarxr_protocol.rpc.HIDSettings.pack(builder, _o.getHidSettings());
int _velocitySettings = _o.getVelocitySettings() == null ? 0 : solarxr_protocol.rpc.VelocitySettings.pack(builder, _o.getVelocitySettings());
return createChangeSettingsRequest(
builder,
_steamVrTrackers,
Expand All @@ -151,7 +159,8 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
_autoBoneSettings,
_resetsSettings,
_stayAligned,
_hidSettings);
_hidSettings,
_velocitySettings);
}
}

6 changes: 6 additions & 0 deletions protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class ChangeSettingsRequestT {
private solarxr_protocol.rpc.ResetsSettingsT resetsSettings;
private solarxr_protocol.rpc.StayAlignedSettingsT stayAligned;
private solarxr_protocol.rpc.HIDSettingsT hidSettings;
private solarxr_protocol.rpc.VelocitySettingsT velocitySettings;

public solarxr_protocol.rpc.SteamVRTrackersSettingT getSteamVrTrackers() { return steamVrTrackers; }

Expand Down Expand Up @@ -69,6 +70,10 @@ public class ChangeSettingsRequestT {

public void setHidSettings(solarxr_protocol.rpc.HIDSettingsT hidSettings) { this.hidSettings = hidSettings; }

public solarxr_protocol.rpc.VelocitySettingsT getVelocitySettings() { return velocitySettings; }

public void setVelocitySettings(solarxr_protocol.rpc.VelocitySettingsT velocitySettings) { this.velocitySettings = velocitySettings; }


public ChangeSettingsRequestT() {
this.steamVrTrackers = null;
Expand All @@ -83,6 +88,7 @@ public ChangeSettingsRequestT() {
this.resetsSettings = null;
this.stayAligned = null;
this.hidSettings = null;
this.velocitySettings = null;
}
}

17 changes: 13 additions & 4 deletions protocol/java/src/solarxr_protocol/rpc/SettingsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public final class SettingsResponse extends Table {
public solarxr_protocol.rpc.StayAlignedSettings stayAligned(solarxr_protocol.rpc.StayAlignedSettings obj) { int o = __offset(24); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
public solarxr_protocol.rpc.HIDSettings hidSettings() { return hidSettings(new solarxr_protocol.rpc.HIDSettings()); }
public solarxr_protocol.rpc.HIDSettings hidSettings(solarxr_protocol.rpc.HIDSettings obj) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
public solarxr_protocol.rpc.VelocitySettings velocitySettings() { return velocitySettings(new solarxr_protocol.rpc.VelocitySettings()); }
public solarxr_protocol.rpc.VelocitySettings velocitySettings(solarxr_protocol.rpc.VelocitySettings obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }

public static int createSettingsResponse(FlatBufferBuilder builder,
int steamVrTrackersOffset,
Expand All @@ -52,8 +54,10 @@ public static int createSettingsResponse(FlatBufferBuilder builder,
int autoBoneSettingsOffset,
int resetsSettingsOffset,
int stayAlignedOffset,
int hidSettingsOffset) {
builder.startTable(12);
int hidSettingsOffset,
int velocitySettingsOffset) {
builder.startTable(13);
SettingsResponse.addVelocitySettings(builder, velocitySettingsOffset);
SettingsResponse.addHidSettings(builder, hidSettingsOffset);
SettingsResponse.addStayAligned(builder, stayAlignedOffset);
SettingsResponse.addResetsSettings(builder, resetsSettingsOffset);
Expand All @@ -69,7 +73,7 @@ public static int createSettingsResponse(FlatBufferBuilder builder,
return SettingsResponse.endSettingsResponse(builder);
}

public static void startSettingsResponse(FlatBufferBuilder builder) { builder.startTable(12); }
public static void startSettingsResponse(FlatBufferBuilder builder) { builder.startTable(13); }
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); }
Expand All @@ -82,6 +86,7 @@ public static int createSettingsResponse(FlatBufferBuilder builder,
public static void addResetsSettings(FlatBufferBuilder builder, int resetsSettingsOffset) { builder.addOffset(9, resetsSettingsOffset, 0); }
public static void addStayAligned(FlatBufferBuilder builder, int stayAlignedOffset) { builder.addOffset(10, stayAlignedOffset, 0); }
public static void addHidSettings(FlatBufferBuilder builder, int hidSettingsOffset) { builder.addOffset(11, hidSettingsOffset, 0); }
public static void addVelocitySettings(FlatBufferBuilder builder, int velocitySettingsOffset) { builder.addOffset(12, velocitySettingsOffset, 0); }
public static int endSettingsResponse(FlatBufferBuilder builder) {
int o = builder.endTable();
return o;
Expand Down Expand Up @@ -123,6 +128,8 @@ public void unpackTo(SettingsResponseT _o) {
else _o.setStayAligned(null);
if (hidSettings() != null) _o.setHidSettings(hidSettings().unpack());
else _o.setHidSettings(null);
if (velocitySettings() != null) _o.setVelocitySettings(velocitySettings().unpack());
else _o.setVelocitySettings(null);
}
public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) {
if (_o == null) return 0;
Expand All @@ -138,6 +145,7 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) {
int _resetsSettings = _o.getResetsSettings() == null ? 0 : solarxr_protocol.rpc.ResetsSettings.pack(builder, _o.getResetsSettings());
int _stayAligned = _o.getStayAligned() == null ? 0 : solarxr_protocol.rpc.StayAlignedSettings.pack(builder, _o.getStayAligned());
int _hidSettings = _o.getHidSettings() == null ? 0 : solarxr_protocol.rpc.HIDSettings.pack(builder, _o.getHidSettings());
int _velocitySettings = _o.getVelocitySettings() == null ? 0 : solarxr_protocol.rpc.VelocitySettings.pack(builder, _o.getVelocitySettings());
return createSettingsResponse(
builder,
_steamVrTrackers,
Expand All @@ -151,7 +159,8 @@ public static int pack(FlatBufferBuilder builder, SettingsResponseT _o) {
_autoBoneSettings,
_resetsSettings,
_stayAligned,
_hidSettings);
_hidSettings,
_velocitySettings);
}
}

6 changes: 6 additions & 0 deletions protocol/java/src/solarxr_protocol/rpc/SettingsResponseT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class SettingsResponseT {
private solarxr_protocol.rpc.ResetsSettingsT resetsSettings;
private solarxr_protocol.rpc.StayAlignedSettingsT stayAligned;
private solarxr_protocol.rpc.HIDSettingsT hidSettings;
private solarxr_protocol.rpc.VelocitySettingsT velocitySettings;

public solarxr_protocol.rpc.SteamVRTrackersSettingT getSteamVrTrackers() { return steamVrTrackers; }

Expand Down Expand Up @@ -69,6 +70,10 @@ public class SettingsResponseT {

public void setHidSettings(solarxr_protocol.rpc.HIDSettingsT hidSettings) { this.hidSettings = hidSettings; }

public solarxr_protocol.rpc.VelocitySettingsT getVelocitySettings() { return velocitySettings; }

public void setVelocitySettings(solarxr_protocol.rpc.VelocitySettingsT velocitySettings) { this.velocitySettings = velocitySettings; }


public SettingsResponseT() {
this.steamVrTrackers = null;
Expand All @@ -83,6 +88,7 @@ public SettingsResponseT() {
this.resetsSettings = null;
this.stayAligned = null;
this.hidSettings = null;
this.velocitySettings = null;
}
}

Loading