From 6bcf1040c49cefa2218c15938004e28bcaecdc98 Mon Sep 17 00:00:00 2001 From: Erimel Date: Thu, 30 May 2024 20:15:15 -0400 Subject: [PATCH 1/2] add MOTION_COMPENSATION BodyPart --- .../solarxr_protocol/generated/all_generated.h | 13 ++++++++----- .../src/solarxr_protocol/datatypes/BodyPart.java | 3 ++- .../src/solarxr_protocol/datatypes/BodyPart.kt | 3 ++- .../datatypes/body_part_generated.rs | 10 +++++++--- .../src/solarxr-protocol/datatypes/body-part.ts | 3 ++- schema/datatypes/datatypes.fbs | 1 + 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index 2d3322c4..dd34c251 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -577,11 +577,12 @@ enum class BodyPart : uint8_t { UPPER_CHEST = 22, LEFT_HIP = 23, RIGHT_HIP = 24, + MOTION_COMPENSATION = 25, MIN = NONE, - MAX = RIGHT_HIP + MAX = MOTION_COMPENSATION }; -inline const BodyPart (&EnumValuesBodyPart())[23] { +inline const BodyPart (&EnumValuesBodyPart())[24] { static const BodyPart values[] = { BodyPart::NONE, BodyPart::HEAD, @@ -605,13 +606,14 @@ inline const BodyPart (&EnumValuesBodyPart())[23] { BodyPart::RIGHT_SHOULDER, BodyPart::UPPER_CHEST, BodyPart::LEFT_HIP, - BodyPart::RIGHT_HIP + BodyPart::RIGHT_HIP, + BodyPart::MOTION_COMPENSATION }; return values; } inline const char * const *EnumNamesBodyPart() { - static const char * const names[26] = { + static const char * const names[27] = { "NONE", "HEAD", "NECK", @@ -637,13 +639,14 @@ inline const char * const *EnumNamesBodyPart() { "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", + "MOTION_COMPENSATION", nullptr }; return names; } inline const char *EnumNameBodyPart(BodyPart e) { - if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::RIGHT_HIP)) return ""; + if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::MOTION_COMPENSATION)) return ""; const size_t index = static_cast(e); return EnumNamesBodyPart()[index]; } diff --git a/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java b/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java index b7ba54d1..5551ca61 100644 --- a/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java +++ b/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java @@ -32,8 +32,9 @@ private BodyPart() { } public static final int UPPER_CHEST = 22; public static final int LEFT_HIP = 23; public static final int RIGHT_HIP = 24; + public static final int MOTION_COMPENSATION = 25; - public static final String[] names = { "NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", }; + public static final String[] names = { "NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "MOTION_COMPENSATION", }; public static String name(int e) { return names[e]; } } diff --git a/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt b/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt index 14734b12..f673bdb4 100644 --- a/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt +++ b/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt @@ -32,7 +32,8 @@ class BodyPart private constructor() { const val UPPERCHEST: UByte = 22u const val LEFTHIP: UByte = 23u const val RIGHTHIP: UByte = 24u - val names : Array = arrayOf("NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP") + const val MOTIONCOMPENSATION: UByte = 25u + val names : Array = arrayOf("NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "MOTION_COMPENSATION") @JvmStatic fun name(e: Int) : String = names[e] } diff --git a/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs b/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs index 2f988983..1efa1779 100644 --- a/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs @@ -12,10 +12,10 @@ use super::*; #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] pub const ENUM_MIN_BODY_PART: u8 = 0; #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] -pub const ENUM_MAX_BODY_PART: u8 = 24; +pub const ENUM_MAX_BODY_PART: u8 = 25; #[deprecated(since = "2.0.0", note = "Use associated constants instead. This will no longer be generated in 2021.")] #[allow(non_camel_case_types)] -pub const ENUM_VALUES_BODY_PART: [BodyPart; 23] = [ +pub const ENUM_VALUES_BODY_PART: [BodyPart; 24] = [ BodyPart::NONE, BodyPart::HEAD, BodyPart::NECK, @@ -39,6 +39,7 @@ pub const ENUM_VALUES_BODY_PART: [BodyPart; 23] = [ BodyPart::UPPER_CHEST, BodyPart::LEFT_HIP, BodyPart::RIGHT_HIP, + BodyPart::MOTION_COMPENSATION, ]; /// Different parts of the body. Maps to each possible non-tracker bone in the skeleton. @@ -71,9 +72,10 @@ impl BodyPart { pub const UPPER_CHEST: Self = Self(22); pub const LEFT_HIP: Self = Self(23); pub const RIGHT_HIP: Self = Self(24); + pub const MOTION_COMPENSATION: Self = Self(25); pub const ENUM_MIN: u8 = 0; - pub const ENUM_MAX: u8 = 24; + pub const ENUM_MAX: u8 = 25; pub const ENUM_VALUES: &'static [Self] = &[ Self::NONE, Self::HEAD, @@ -98,6 +100,7 @@ impl BodyPart { Self::UPPER_CHEST, Self::LEFT_HIP, Self::RIGHT_HIP, + Self::MOTION_COMPENSATION, ]; /// Returns the variant's name or "" if unknown. pub fn variant_name(self) -> Option<&'static str> { @@ -125,6 +128,7 @@ impl BodyPart { Self::UPPER_CHEST => Some("UPPER_CHEST"), Self::LEFT_HIP => Some("LEFT_HIP"), Self::RIGHT_HIP => Some("RIGHT_HIP"), + Self::MOTION_COMPENSATION => Some("MOTION_COMPENSATION"), _ => None, } } diff --git a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts index 66bfe303..67d0e889 100644 --- a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts +++ b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts @@ -27,5 +27,6 @@ export enum BodyPart { RIGHT_SHOULDER = 21, UPPER_CHEST = 22, LEFT_HIP = 23, - RIGHT_HIP = 24 + RIGHT_HIP = 24, + MOTION_COMPENSATION = 25 } diff --git a/schema/datatypes/datatypes.fbs b/schema/datatypes/datatypes.fbs index 189252d9..0bb6f7b9 100644 --- a/schema/datatypes/datatypes.fbs +++ b/schema/datatypes/datatypes.fbs @@ -116,6 +116,7 @@ enum BodyPart: uint8 { UPPER_CHEST = 22, LEFT_HIP = 23, RIGHT_HIP = 24, + MOTION_COMPENSATION = 25, } enum TrackerStatus: uint8 { From 81215ad3df67612313ca7da6540b09cc64f355b0 Mon Sep 17 00:00:00 2001 From: Erimel Date: Thu, 30 May 2024 20:18:57 -0400 Subject: [PATCH 2/2] rename to PLAYSPACE --- .../include/solarxr_protocol/generated/all_generated.h | 10 +++++----- .../java/src/solarxr_protocol/datatypes/BodyPart.java | 4 ++-- .../kotlin/src/solarxr_protocol/datatypes/BodyPart.kt | 4 ++-- .../solarxr_protocol/datatypes/body_part_generated.rs | 8 ++++---- .../src/solarxr-protocol/datatypes/body-part.ts | 2 +- schema/datatypes/datatypes.fbs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index dd34c251..2812b85c 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -577,9 +577,9 @@ enum class BodyPart : uint8_t { UPPER_CHEST = 22, LEFT_HIP = 23, RIGHT_HIP = 24, - MOTION_COMPENSATION = 25, + PLAYSPACE = 25, MIN = NONE, - MAX = MOTION_COMPENSATION + MAX = PLAYSPACE }; inline const BodyPart (&EnumValuesBodyPart())[24] { @@ -607,7 +607,7 @@ inline const BodyPart (&EnumValuesBodyPart())[24] { BodyPart::UPPER_CHEST, BodyPart::LEFT_HIP, BodyPart::RIGHT_HIP, - BodyPart::MOTION_COMPENSATION + BodyPart::PLAYSPACE }; return values; } @@ -639,14 +639,14 @@ inline const char * const *EnumNamesBodyPart() { "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", - "MOTION_COMPENSATION", + "PLAYSPACE", nullptr }; return names; } inline const char *EnumNameBodyPart(BodyPart e) { - if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::MOTION_COMPENSATION)) return ""; + if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::PLAYSPACE)) return ""; const size_t index = static_cast(e); return EnumNamesBodyPart()[index]; } diff --git a/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java b/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java index 5551ca61..69e84107 100644 --- a/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java +++ b/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java @@ -32,9 +32,9 @@ private BodyPart() { } public static final int UPPER_CHEST = 22; public static final int LEFT_HIP = 23; public static final int RIGHT_HIP = 24; - public static final int MOTION_COMPENSATION = 25; + public static final int PLAYSPACE = 25; - public static final String[] names = { "NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "MOTION_COMPENSATION", }; + public static final String[] names = { "NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "PLAYSPACE", }; public static String name(int e) { return names[e]; } } diff --git a/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt b/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt index f673bdb4..76e15fd0 100644 --- a/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt +++ b/protocol/kotlin/src/solarxr_protocol/datatypes/BodyPart.kt @@ -32,8 +32,8 @@ class BodyPart private constructor() { const val UPPERCHEST: UByte = 22u const val LEFTHIP: UByte = 23u const val RIGHTHIP: UByte = 24u - const val MOTIONCOMPENSATION: UByte = 25u - val names : Array = arrayOf("NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "MOTION_COMPENSATION") + const val PLAYSPACE: UByte = 25u + val names : Array = arrayOf("NONE", "HEAD", "NECK", "CHEST", "WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "", "", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "UPPER_CHEST", "LEFT_HIP", "RIGHT_HIP", "PLAYSPACE") @JvmStatic fun name(e: Int) : String = names[e] } diff --git a/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs b/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs index 1efa1779..91cbf120 100644 --- a/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/datatypes/body_part_generated.rs @@ -39,7 +39,7 @@ pub const ENUM_VALUES_BODY_PART: [BodyPart; 24] = [ BodyPart::UPPER_CHEST, BodyPart::LEFT_HIP, BodyPart::RIGHT_HIP, - BodyPart::MOTION_COMPENSATION, + BodyPart::PLAYSPACE, ]; /// Different parts of the body. Maps to each possible non-tracker bone in the skeleton. @@ -72,7 +72,7 @@ impl BodyPart { pub const UPPER_CHEST: Self = Self(22); pub const LEFT_HIP: Self = Self(23); pub const RIGHT_HIP: Self = Self(24); - pub const MOTION_COMPENSATION: Self = Self(25); + pub const PLAYSPACE: Self = Self(25); pub const ENUM_MIN: u8 = 0; pub const ENUM_MAX: u8 = 25; @@ -100,7 +100,7 @@ impl BodyPart { Self::UPPER_CHEST, Self::LEFT_HIP, Self::RIGHT_HIP, - Self::MOTION_COMPENSATION, + Self::PLAYSPACE, ]; /// Returns the variant's name or "" if unknown. pub fn variant_name(self) -> Option<&'static str> { @@ -128,7 +128,7 @@ impl BodyPart { Self::UPPER_CHEST => Some("UPPER_CHEST"), Self::LEFT_HIP => Some("LEFT_HIP"), Self::RIGHT_HIP => Some("RIGHT_HIP"), - Self::MOTION_COMPENSATION => Some("MOTION_COMPENSATION"), + Self::PLAYSPACE => Some("PLAYSPACE"), _ => None, } } diff --git a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts index 67d0e889..ef49e77f 100644 --- a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts +++ b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts @@ -28,5 +28,5 @@ export enum BodyPart { UPPER_CHEST = 22, LEFT_HIP = 23, RIGHT_HIP = 24, - MOTION_COMPENSATION = 25 + PLAYSPACE = 25 } diff --git a/schema/datatypes/datatypes.fbs b/schema/datatypes/datatypes.fbs index 0bb6f7b9..e04d72ba 100644 --- a/schema/datatypes/datatypes.fbs +++ b/schema/datatypes/datatypes.fbs @@ -116,7 +116,7 @@ enum BodyPart: uint8 { UPPER_CHEST = 22, LEFT_HIP = 23, RIGHT_HIP = 24, - MOTION_COMPENSATION = 25, + PLAYSPACE = 25, } enum TrackerStatus: uint8 {