diff --git a/generate-flatbuffer.ps1 b/generate-flatbuffer.ps1 index 9ba016bc..9ecab920 100644 --- a/generate-flatbuffer.ps1 +++ b/generate-flatbuffer.ps1 @@ -1,4 +1,5 @@ $ErrorActionPreference = "Stop" +$env:JAVA_HOME = "C:\Program Files\Eclipse Adoptium\jdk-17.0.18.8-hotspot" # TODO: check flatc version before doing anything @@ -9,8 +10,8 @@ Remove-Item -ErrorAction Ignore -Recurse protocol/rust/src/generated Remove-Item -ErrorAction Ignore -Recurse protocol/kotlin/src/generated/kotlin -./flatc.exe --java --gen-object-api --gen-all -o protocol/java/src -I ./schema/ ./schema/all.fbs -./flatc.exe --cpp --scoped-enums --gen-all -o protocol/cpp/include/solarxr_protocol/generated -I ./schema/ ./schema/all.fbs -./flatc.exe --ts --gen-object-api --gen-all -o protocol/typescript/src -I ./schema/ ./schema/all.fbs -./flatc.exe --rust --rust-module-root-file --gen-all -o protocol/rust/src/generated ./schema/all.fbs +flatc --java --gen-object-api --gen-all -o protocol/java/src -I ./schema/ ./schema/all.fbs +flatc --cpp --scoped-enums --gen-all -o protocol/cpp/include/solarxr_protocol/generated -I ./schema/ ./schema/all.fbs +flatc --ts --gen-object-api --gen-all -o protocol/typescript/src -I ./schema/ ./schema/all.fbs +flatc --rust --rust-module-root-file --gen-all -o protocol/rust/src/generated ./schema/all.fbs ./gradlew.bat :codegen:run --args="-o ./protocol/kotlin/src/generated/kotlin -I ./schema/ ./schema/all.fbs" diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index 87170b4d..b55dad42 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -733,11 +733,14 @@ enum class BodyPart : uint8_t { RIGHT_MIDDLE_TOE = 59, RIGHT_RING_TOE = 60, RIGHT_LITTLE_TOE = 61, + LEFT_POSTERIOR = 64, + RIGHT_POSTERIOR = 65, + TAIL = 66, MIN = NONE, - MAX = RIGHT_LITTLE_TOE + MAX = TAIL }; -inline const BodyPart (&EnumValuesBodyPart())[62] { +inline const BodyPart (&EnumValuesBodyPart())[65] { static const BodyPart values[] = { BodyPart::NONE, BodyPart::HEAD, @@ -800,13 +803,16 @@ inline const BodyPart (&EnumValuesBodyPart())[62] { BodyPart::RIGHT_INDEX_TOE, BodyPart::RIGHT_MIDDLE_TOE, BodyPart::RIGHT_RING_TOE, - BodyPart::RIGHT_LITTLE_TOE + BodyPart::RIGHT_LITTLE_TOE, + BodyPart::LEFT_POSTERIOR, + BodyPart::RIGHT_POSTERIOR, + BodyPart::TAIL }; return values; } inline const char * const *EnumNamesBodyPart() { - static const char * const names[63] = { + static const char * const names[68] = { "NONE", "HEAD", "NECK", @@ -869,13 +875,17 @@ inline const char * const *EnumNamesBodyPart() { "RIGHT_MIDDLE_TOE", "RIGHT_RING_TOE", "RIGHT_LITTLE_TOE", + "", + "LEFT_POSTERIOR", + "RIGHT_POSTERIOR", + "TAIL", nullptr }; return names; } inline const char *EnumNameBodyPart(BodyPart e) { - if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::RIGHT_LITTLE_TOE)) return ""; + if (flatbuffers::IsOutRange(e, BodyPart::NONE, BodyPart::TAIL)) 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 74f9fe0c..b8fcd2cf 100644 --- a/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java +++ b/protocol/java/src/solarxr_protocol/datatypes/BodyPart.java @@ -71,8 +71,11 @@ private BodyPart() { } public static final int RIGHT_MIDDLE_TOE = 59; public static final int RIGHT_RING_TOE = 60; public static final int RIGHT_LITTLE_TOE = 61; + public static final int LEFT_POSTERIOR = 64; + public static final int RIGHT_POSTERIOR = 65; + public static final int TAIL = 66; - public static final String[] names = { "NONE", "HEAD", "NECK", "UPPER_CHEST", "LOWER_CHEST", "UPPER_WAIST", "LOWER_WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "LEFT_THUMB_METACARPAL", "LEFT_THUMB_PROXIMAL", "LEFT_THUMB_DISTAL", "LEFT_INDEX_PROXIMAL", "LEFT_INDEX_INTERMEDIATE", "LEFT_INDEX_DISTAL", "LEFT_MIDDLE_PROXIMAL", "LEFT_MIDDLE_INTERMEDIATE", "LEFT_MIDDLE_DISTAL", "LEFT_RING_PROXIMAL", "LEFT_RING_INTERMEDIATE", "LEFT_RING_DISTAL", "LEFT_LITTLE_PROXIMAL", "LEFT_LITTLE_INTERMEDIATE", "LEFT_LITTLE_DISTAL", "RIGHT_THUMB_METACARPAL", "RIGHT_THUMB_PROXIMAL", "RIGHT_THUMB_DISTAL", "RIGHT_INDEX_PROXIMAL", "RIGHT_INDEX_INTERMEDIATE", "RIGHT_INDEX_DISTAL", "RIGHT_MIDDLE_PROXIMAL", "RIGHT_MIDDLE_INTERMEDIATE", "RIGHT_MIDDLE_DISTAL", "RIGHT_RING_PROXIMAL", "RIGHT_RING_INTERMEDIATE", "RIGHT_RING_DISTAL", "RIGHT_LITTLE_PROXIMAL", "RIGHT_LITTLE_INTERMEDIATE", "RIGHT_LITTLE_DISTAL", "LEFT_BIG_TOE", "LEFT_INDEX_TOE", "LEFT_MIDDLE_TOE", "LEFT_RING_TOE", "LEFT_LITTLE_TOE", "RIGHT_BIG_TOE", "RIGHT_INDEX_TOE", "RIGHT_MIDDLE_TOE", "RIGHT_RING_TOE", "RIGHT_LITTLE_TOE", }; + public static final String[] names = { "NONE", "HEAD", "NECK", "UPPER_CHEST", "LOWER_CHEST", "UPPER_WAIST", "LOWER_WAIST", "HIP", "LEFT_UPPER_LEG", "RIGHT_UPPER_LEG", "LEFT_LOWER_LEG", "RIGHT_LOWER_LEG", "LEFT_FOOT", "RIGHT_FOOT", "LEFT_UPPER_ARM", "RIGHT_UPPER_ARM", "LEFT_LOWER_ARM", "RIGHT_LOWER_ARM", "LEFT_HAND", "RIGHT_HAND", "LEFT_SHOULDER", "RIGHT_SHOULDER", "LEFT_THUMB_METACARPAL", "LEFT_THUMB_PROXIMAL", "LEFT_THUMB_DISTAL", "LEFT_INDEX_PROXIMAL", "LEFT_INDEX_INTERMEDIATE", "LEFT_INDEX_DISTAL", "LEFT_MIDDLE_PROXIMAL", "LEFT_MIDDLE_INTERMEDIATE", "LEFT_MIDDLE_DISTAL", "LEFT_RING_PROXIMAL", "LEFT_RING_INTERMEDIATE", "LEFT_RING_DISTAL", "LEFT_LITTLE_PROXIMAL", "LEFT_LITTLE_INTERMEDIATE", "LEFT_LITTLE_DISTAL", "RIGHT_THUMB_METACARPAL", "RIGHT_THUMB_PROXIMAL", "RIGHT_THUMB_DISTAL", "RIGHT_INDEX_PROXIMAL", "RIGHT_INDEX_INTERMEDIATE", "RIGHT_INDEX_DISTAL", "RIGHT_MIDDLE_PROXIMAL", "RIGHT_MIDDLE_INTERMEDIATE", "RIGHT_MIDDLE_DISTAL", "RIGHT_RING_PROXIMAL", "RIGHT_RING_INTERMEDIATE", "RIGHT_RING_DISTAL", "RIGHT_LITTLE_PROXIMAL", "RIGHT_LITTLE_INTERMEDIATE", "RIGHT_LITTLE_DISTAL", "LEFT_BIG_TOE", "LEFT_INDEX_TOE", "LEFT_MIDDLE_TOE", "LEFT_RING_TOE", "LEFT_LITTLE_TOE", "RIGHT_BIG_TOE", "RIGHT_INDEX_TOE", "RIGHT_MIDDLE_TOE", "RIGHT_RING_TOE", "RIGHT_LITTLE_TOE", "", "LEFT_POSTERIOR", "RIGHT_POSTERIOR", "TAIL" }; public static String name(int e) { return names[e]; } } diff --git a/protocol/kotlin/src/generated/kotlin/solarxr_protocol/datatypes/Datatypes.kt b/protocol/kotlin/src/generated/kotlin/solarxr_protocol/datatypes/Datatypes.kt index e471a35d..47286dc6 100644 --- a/protocol/kotlin/src/generated/kotlin/solarxr_protocol/datatypes/Datatypes.kt +++ b/protocol/kotlin/src/generated/kotlin/solarxr_protocol/datatypes/Datatypes.kt @@ -127,6 +127,9 @@ public enum class BodyPart( RIGHT_MIDDLE_TOE(59.toUByte()), RIGHT_RING_TOE(60.toUByte()), RIGHT_LITTLE_TOE(61.toUByte()), + LEFT_POSTERIOR(64.toUByte()), + RIGHT_POSTERIOR(65.toUByte()), + TAIL(66.toUByte()), ; public companion object { 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 260f1c56..f065c6dd 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 = 61; +pub const ENUM_MAX_BODY_PART: u8 = 66; #[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; 62] = [ +pub const ENUM_VALUES_BODY_PART: [BodyPart; 65] = [ BodyPart::NONE, BodyPart::HEAD, BodyPart::NECK, @@ -78,6 +78,9 @@ pub const ENUM_VALUES_BODY_PART: [BodyPart; 62] = [ BodyPart::RIGHT_MIDDLE_TOE, BodyPart::RIGHT_RING_TOE, BodyPart::RIGHT_LITTLE_TOE, + BodyPart::LEFT_POSTERIOR, + BodyPart::RIGHT_POSTERIOR, + BodyPart::TAIL, ]; /// Different parts of the body. Maps to each possible bone in the skeleton. @@ -149,9 +152,12 @@ impl BodyPart { pub const RIGHT_MIDDLE_TOE: Self = Self(59); pub const RIGHT_RING_TOE: Self = Self(60); pub const RIGHT_LITTLE_TOE: Self = Self(61); + pub const LEFT_POSTERIOR: Self = Self(64); + pub const RIGHT_POSTERIOR: Self = Self(65); + pub const TAIL: Self = Self(66); pub const ENUM_MIN: u8 = 0; - pub const ENUM_MAX: u8 = 61; + pub const ENUM_MAX: u8 = 66; pub const ENUM_VALUES: &'static [Self] = &[ Self::NONE, Self::HEAD, @@ -215,6 +221,9 @@ impl BodyPart { Self::RIGHT_MIDDLE_TOE, Self::RIGHT_RING_TOE, Self::RIGHT_LITTLE_TOE, + Self::LEFT_POSTERIOR, + Self::RIGHT_POSTERIOR, + Self::TAIL, ]; /// Returns the variant's name or "" if unknown. pub fn variant_name(self) -> Option<&'static str> { @@ -281,6 +290,9 @@ impl BodyPart { Self::RIGHT_MIDDLE_TOE => Some("RIGHT_MIDDLE_TOE"), Self::RIGHT_RING_TOE => Some("RIGHT_RING_TOE"), Self::RIGHT_LITTLE_TOE => Some("RIGHT_LITTLE_TOE"), + Self::LEFT_POSTERIOR => Some("LEFT_POSTERIOR"), + Self::RIGHT_POSTERIOR => Some("RIGHT_POSTERIOR"), + Self::TAIL => Some("TAIL"), _ => None, } } diff --git a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts index 02bc1b53..5899bc52 100644 --- a/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts +++ b/protocol/typescript/src/solarxr-protocol/datatypes/body-part.ts @@ -66,5 +66,8 @@ export enum BodyPart { RIGHT_INDEX_TOE = 58, RIGHT_MIDDLE_TOE = 59, RIGHT_RING_TOE = 60, - RIGHT_LITTLE_TOE = 61 + RIGHT_LITTLE_TOE = 61, + LEFT_POSTERIOR = 64, + RIGHT_POSTERIOR = 65, + TAIL = 66 } diff --git a/schema/datatypes/datatypes.fbs b/schema/datatypes/datatypes.fbs index 41080336..6ebfb5db 100644 --- a/schema/datatypes/datatypes.fbs +++ b/schema/datatypes/datatypes.fbs @@ -82,6 +82,10 @@ enum BodyPart: uint8 { RIGHT_MIDDLE_TOE = 59, RIGHT_RING_TOE = 60, RIGHT_LITTLE_TOE = 61, + + LEFT_POSTERIOR = 64, + RIGHT_POSTERIOR = 65, + TAIL = 66, } enum TrackerStatus: uint8 {