StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

feat: wip debugging improvements and protocol change

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-03-22 04:40:53 +01:00
parent af2666d403
commit 5797d2f3e3
3 changed files with 130 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Cargo.lock generated
View File

@@ -1048,9 +1048,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
[[package]]
name = "futures-lite"
version = "2.3.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
dependencies = [
"fastrand",
"futures-core",
@@ -1089,11 +1089,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
dependencies = [
"futures-core",
"futures-io",
"futures-macro",
"futures-sink",
"futures-task",
"memchr",
"pin-project-lite",
"pin-utils",
"slab",
@@ -2623,7 +2620,6 @@ checksum = "2f2b15926089e5526bb2dd738a2eb0e59034356e06eb71e1cd912358c0e62c4d"
[[package]]
name = "stardust-xr"
version = "0.45.0"
source = "git+https://github.com/StardustXR/core.git?branch=dev#0e746ca4d0a04f668fc1958e38b9d799eb5e3370"
dependencies = [
"cluFlock",
"color-eyre",
@@ -2644,7 +2640,6 @@ dependencies = [
[[package]]
name = "stardust-xr-schemas"
version = "1.5.3"
source = "git+https://github.com/StardustXR/core.git?branch=dev#0e746ca4d0a04f668fc1958e38b9d799eb5e3370"
dependencies = [
"flatbuffers",
"flexbuffers",
@@ -3667,6 +3662,15 @@ dependencies = [
"memchr",
]
[[package]]
name = "winnow"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
dependencies = [
"memchr",
]
[[package]]
name = "xdg-home"
version = "1.3.0"
@@ -3738,9 +3742,9 @@ checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
[[package]]
name = "zbus"
version = "5.0.1"
version = "5.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "333be40ef37976542e10832ba961e3e44ea215a6b1e2673066b303ee3e0ede10"
checksum = "59c333f648ea1b647bc95dc1d34807c8e25ed7a6feff3394034dc4776054b236"
dependencies = [
"async-broadcast",
"async-executor",
@@ -3755,7 +3759,7 @@ dependencies = [
"enumflags2",
"event-listener",
"futures-core",
"futures-util",
"futures-lite",
"hex",
"nix 0.29.0",
"ordered-stream",
@@ -3766,6 +3770,7 @@ dependencies = [
"tracing",
"uds_windows",
"windows-sys 0.59.0",
"winnow 0.7.4",
"xdg-home",
"zbus_macros",
"zbus_names",
@@ -3774,14 +3779,16 @@ dependencies = [
[[package]]
name = "zbus_macros"
version = "5.0.1"
version = "5.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "381be624000c82e716c2a45d9213fabacf82177591fa8a6ff655d2825450601a"
checksum = "f325ad10eb0d0a3eb060203494c3b7ec3162a01a59db75d2deee100339709fc0"
dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.87",
"zbus_names",
"zvariant",
"zvariant_utils",
]
@@ -3846,14 +3853,14 @@ dependencies = [
[[package]]
name = "zvariant_utils"
version = "3.0.1"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f8d85190ba70bc7b9540430df078bb529620b1464ed4a606010de584e27094d"
checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
dependencies = [
"proc-macro2",
"quote",
"serde",
"static_assertions",
"syn 2.0.87",
"winnow 0.6.18",
"winnow 0.7.4",
]

3
Cargo.toml
View File

@@ -12,6 +12,9 @@ homepage = "https://stardustxr.org"
[workspace]
members = ["codegen"]
[patch."https://github.com/StardustXR/core.git"]
stardust-xr.path = "../core/core"
[workspace.dependencies.stardust-xr]
git = "https://github.com/StardustXR/core.git"
branch = "dev"

106
codegen/src/lib.rs
View File

@@ -49,6 +49,110 @@ pub fn codegen_item_panel_protocol(_input: proc_macro::TokenStream) -> proc_macr
codegen_protocol(ITEM_PANEL_PROTOCOL)
}
#[proc_macro]
pub fn codegen_id_to_name_functions(_input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let mut aspect_map: Vec<(u64, String)> = Vec::new();
let mut method_map: Vec<(u64, String)> = Vec::new();
let mut signal_map: Vec<(u64, String)> = Vec::new();
let protocols = [
ROOT_PROTOCOL,
NODE_PROTOCOL,
SPATIAL_PROTOCOL,
FIELD_PROTOCOL,
AUDIO_PROTOCOL,
DRAWABLE_PROTOCOL,
INPUT_PROTOCOL,
ITEM_PROTOCOL,
ITEM_CAMERA_PROTOCOL,
ITEM_PANEL_PROTOCOL,
];
let mut interface_found = false;
for protocol in protocols
.into_iter()
.filter_map(|p| Protocol::parse(p).ok())
{
if let Some(i) = protocol.interface {
if interface_found {
panic!("more than one interface?! wha? pls help? someone?");
}
interface_found = true;
aspect_map.push((0, "interface".to_owned()));
for m in i.members {
match m._type {
MemberType::Signal => &mut signal_map,
MemberType::Method => &mut method_map,
}
.push((m.opcode, m.name));
}
}
for aspect in protocol.aspects.into_iter() {
aspect_map.push((aspect.id, aspect.name));
for m in aspect.members.into_iter() {
match m._type {
MemberType::Signal => &mut signal_map,
MemberType::Method => &mut method_map,
}
.push((m.opcode, m.name));
}
}
}
let aspect_id_to_name = aspect_map
.iter()
.map(|(id, name)| {
quote! {
#id => Some(#name),
}
})
.reduce(fold_tokens);
let aspect_id_to_name_fn = quote! {
pub const fn aspect_id_to_name(id: u64) -> Option<&'static str> {
match id {
#aspect_id_to_name
_ => None,
}
}
};
let method_id_to_name = method_map
.iter()
.map(|(id, name)| {
quote! {
#id => Some(#name),
}
})
.reduce(fold_tokens);
let method_id_to_name_fn = quote! {
pub const fn method_id_to_name(id: u64) -> Option<&'static str> {
match id {
#method_id_to_name
_ => None,
}
}
};
let signal_id_to_name = signal_map
.iter()
.map(|(id, name)| {
quote! {
#id => Some(#name),
}
})
.reduce(fold_tokens);
let signal_id_to_name_fn = quote! {
pub const fn signal_id_to_name(id: u64) -> Option<&'static str> {
match id {
#signal_id_to_name
_ => None
}
}
};
quote! {
#aspect_id_to_name_fn
#method_id_to_name_fn
#signal_id_to_name_fn
}
.into()
}
fn codegen_protocol(protocol: &'static str) -> proc_macro::TokenStream {
let protocol = Protocol::parse(protocol).unwrap();
let interface = protocol
@@ -143,7 +247,7 @@ fn generate_custom_union(custom_union: &CustomUnion) -> TokenStream {
quote! {
#[doc = #description]
#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
#[serde(tag = "type")]
// #[serde(tag = "type")]
pub enum #name {#option_decls}
}
}