From 9422eec1885b8b6409fb7377b111dcea1b82e86e Mon Sep 17 00:00:00 2001 From: Schmarni Date: Tue, 16 Sep 2025 04:47:03 +0200 Subject: [PATCH] chore: use the new asteroids name Signed-off-by: Schmarni --- Cargo.lock | 88 +++++++++++++++--------------------- Cargo.toml | 4 +- hexagon_launcher/Cargo.toml | 4 +- hexagon_launcher/src/main.rs | 5 +- single/Cargo.toml | 2 +- single/src/app.rs | 15 +++--- single/src/app_launcher.rs | 6 +-- single/src/main.rs | 2 +- sirius/Cargo.toml | 4 +- sirius/src/main.rs | 5 +- 10 files changed, 58 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ef83a1..1acc14b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,22 +138,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "app_grid" -version = "0.1.0" -dependencies = [ - "clap", - "color-eyre", - "glam 0.24.2", - "manifest-dir-macros", - "protostar", - "stardust-xr-fusion", - "stardust-xr-molecules", - "tokio", - "tracing-subscriber", - "tween", -] - [[package]] name = "arrayref" version = "0.3.9" @@ -183,35 +167,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "asteroids" -version = "2.0.0" -source = "git+https://github.com/StardustXR/asteroids.git?branch=dev#767d322b04b08fb5317b7c81cbb7730f1c87e85a" -dependencies = [ - "ashpd", - "bumpalo", - "derive-where", - "derive_setters", - "dioxus-devtools", - "directories 6.0.0", - "futures-util", - "glam 0.30.3", - "inotify", - "lazy_static", - "map-range", - "mint", - "ouroboros", - "ron", - "rustc-hash 2.1.1", - "serde", - "stardust-xr-fusion", - "stardust-xr-molecules", - "tokio", - "tracing", - "tracy-client", - "zbus", -] - [[package]] name = "async-broadcast" version = "0.7.2" @@ -1451,7 +1406,6 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" name = "hexagon_launcher" version = "0.1.0" dependencies = [ - "asteroids", "clap", "color-eyre", "glam 0.25.0", @@ -1461,6 +1415,7 @@ dependencies = [ "rayon", "serde", "single", + "stardust-xr-asteroids", "stardust-xr-fusion", "tokio", "tracing", @@ -3017,7 +2972,6 @@ dependencies = [ name = "single" version = "0.1.0" dependencies = [ - "asteroids", "clap", "color-eyre", "glam 0.24.2", @@ -3025,6 +2979,7 @@ dependencies = [ "mint", "protostar", "serde", + "stardust-xr-asteroids", "stardust-xr-fusion", "stardust-xr-molecules", "tokio", @@ -3043,7 +2998,6 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" name = "sirius" version = "0.1.0" dependencies = [ - "asteroids", "clap", "color-eyre", "glam 0.25.0", @@ -3052,6 +3006,7 @@ dependencies = [ "protostar", "serde", "single", + "stardust-xr-asteroids", "stardust-xr-fusion", "tokio", "tracing", @@ -3104,7 +3059,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stardust-xr" version = "0.45.0" -source = "git+https://github.com/StardustXR/core.git?branch=dev#32fd11dc199406e9a38194d937567b9e6b88122e" +source = "git+https://github.com/StardustXR/core.git?branch=dev#8aa50e038c5eb1610813b675e749ea80207d1206" dependencies = [ "cluFlock", "color-eyre", @@ -3121,10 +3076,39 @@ dependencies = [ "tracing", ] +[[package]] +name = "stardust-xr-asteroids" +version = "2.0.0" +source = "git+https://github.com/StardustXR/asteroids.git?branch=dev#6e94d9be18b7b38775d02dd49508d215d758500c" +dependencies = [ + "ashpd", + "bumpalo", + "derive-where", + "derive_setters", + "dioxus-devtools", + "directories 6.0.0", + "futures-util", + "glam 0.30.3", + "inotify", + "lazy_static", + "map-range", + "mint", + "ouroboros", + "ron", + "rustc-hash 2.1.1", + "serde", + "stardust-xr-fusion", + "stardust-xr-molecules", + "tokio", + "tracing", + "tracy-client", + "zbus", +] + [[package]] name = "stardust-xr-fusion" version = "0.45.0" -source = "git+https://github.com/StardustXR/core.git?branch=dev#32fd11dc199406e9a38194d937567b9e6b88122e" +source = "git+https://github.com/StardustXR/core.git?branch=dev#8aa50e038c5eb1610813b675e749ea80207d1206" dependencies = [ "color-eyre", "dashmap", @@ -3145,7 +3129,7 @@ dependencies = [ [[package]] name = "stardust-xr-fusion-codegen" version = "0.1.0" -source = "git+https://github.com/StardustXR/core.git?branch=dev#32fd11dc199406e9a38194d937567b9e6b88122e" +source = "git+https://github.com/StardustXR/core.git?branch=dev#8aa50e038c5eb1610813b675e749ea80207d1206" dependencies = [ "convert_case", "proc-macro2", @@ -3175,7 +3159,7 @@ dependencies = [ [[package]] name = "stardust-xr-schemas" version = "1.5.3" -source = "git+https://github.com/StardustXR/core.git?branch=dev#32fd11dc199406e9a38194d937567b9e6b88122e" +source = "git+https://github.com/StardustXR/core.git?branch=dev#8aa50e038c5eb1610813b675e749ea80207d1206" dependencies = [ "flatbuffers", "flexbuffers", diff --git a/Cargo.toml b/Cargo.toml index 7f31ce4..7feac65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["app_grid", "hexagon_launcher", "protostar", "single", "sirius"] +members = ["hexagon_launcher", "protostar", "single", "sirius"] [workspace.dependencies] tokio = { version = "1.47.1", features = ["rt", "tokio-macros", "sync"] } @@ -14,7 +14,7 @@ branch = "dev" git = "https://github.com/StardustXR/molecules.git" branch = "dev" -[workspace.dependencies.asteroids] +[workspace.dependencies.stardust-xr-asteroids] git = "https://github.com/StardustXR/asteroids.git" branch = "dev" diff --git a/hexagon_launcher/Cargo.toml b/hexagon_launcher/Cargo.toml index 1b7e781..0208ede 100644 --- a/hexagon_launcher/Cargo.toml +++ b/hexagon_launcher/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [features] -tracy = ["dep:tracing-tracy", "asteroids/tracy"] +tracy = ["dep:tracing-tracy", "stardust-xr-asteroids/tracy"] [dependencies] protostar = { path = "../protostar" } @@ -24,7 +24,7 @@ tracing-tracy = { version = "0.11.4", default-features = false, features = [ tokio = { workspace = true } serde = { workspace = true } stardust-xr-fusion = { workspace = true } -asteroids = { workspace = true } +stardust-xr-asteroids = { workspace = true } tracing = "0.1.41" single = { path = "../single" } rayon = "1.11.0" diff --git a/hexagon_launcher/src/main.rs b/hexagon_launcher/src/main.rs index 92c5e64..f4c7ac2 100644 --- a/hexagon_launcher/src/main.rs +++ b/hexagon_launcher/src/main.rs @@ -1,8 +1,7 @@ mod hex; -use asteroids::{ - ClientState, CustomElement, Element, Migrate, Reify, Transformable, client, - elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, +use stardust_xr_asteroids::{ + client, elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, ClientState, CustomElement, Element, Identifiable as _, Migrate, Reify, Transformable }; use glam::Quat; use hex::Hex; diff --git a/single/Cargo.toml b/single/Cargo.toml index f5c5a4f..ceac57c 100644 --- a/single/Cargo.toml +++ b/single/Cargo.toml @@ -18,4 +18,4 @@ tokio = { workspace = true } serde = { workspace = true } stardust-xr-fusion = { workspace = true } stardust-xr-molecules = { workspace = true } -asteroids = { workspace = true } +stardust-xr-asteroids = { workspace = true } diff --git a/single/src/app.rs b/single/src/app.rs index 6f78dc4..198572c 100644 --- a/single/src/app.rs +++ b/single/src/app.rs @@ -1,16 +1,15 @@ -use asteroids::elements::{ - Grabbable, Lines, Model, ModelPart, PointerMode, Text, line_from_points, -}; -use asteroids::{CustomElement, Element, Reify, Transformable}; use glam::{Quat, Vec3}; use mint::{Quaternion, Vector3}; use protostar::application::Application; use protostar::xdg::{DesktopFile, Icon, IconType}; use serde::{Deserialize, Serialize}; -use stardust_xr_fusion::drawable::{Line, LinePoint, TextBounds, TextFit}; +use stardust_xr_asteroids::elements::{ + Grabbable, Lines, Model, ModelPart, PointerMode, Text, line_from_points, +}; +use stardust_xr_asteroids::{CustomElement, Element, Reify, Transformable}; +use stardust_xr_fusion::drawable::{TextBounds, TextFit}; use stardust_xr_fusion::node::NodeError; use stardust_xr_fusion::values::ResourceID; -use stardust_xr_fusion::values::color::rgba_linear; use stardust_xr_fusion::{ drawable::{MaterialParameter, XAlign, YAlign}, fields::{CylinderShape, Shape}, @@ -153,8 +152,8 @@ impl Reify for App { anchor_align_x: XAlign::Center, anchor_align_y: YAlign::Bottom, }) - .text_align_x(XAlign::Center) - .text_align_y(YAlign::Bottom) + .align_x(XAlign::Center) + .align_y(YAlign::Bottom) .pos([0.0, -APP_SIZE * 0.35, 0.002]) .build(), ), diff --git a/single/src/app_launcher.rs b/single/src/app_launcher.rs index 3ee8479..2e9d0ed 100644 --- a/single/src/app_launcher.rs +++ b/single/src/app_launcher.rs @@ -1,4 +1,4 @@ -use asteroids::{CustomElement, ValidState}; +use stardust_xr_asteroids::{CustomElement, ValidState}; use protostar::application::Application; use stardust_xr_fusion::{ node::{NodeError, NodeType}, @@ -23,8 +23,8 @@ impl CustomElement for AppLauncher { fn create_inner( &self, - _asteroids_context: &asteroids::Context, - info: asteroids::CreateInnerInfo, + _asteroids_context: &stardust_xr_asteroids::Context, + info: stardust_xr_asteroids::CreateInnerInfo, _resource: &mut Self::Resource, ) -> Result { let spatial = Spatial::create( diff --git a/single/src/main.rs b/single/src/main.rs index 327a6cc..9a2562c 100644 --- a/single/src/main.rs +++ b/single/src/main.rs @@ -1,4 +1,4 @@ -use asteroids::{ClientState, CustomElement, Element, Migrate, Reify, client, elements::Spatial}; +use stardust_xr_asteroids::{ClientState, CustomElement, Element, Migrate, Reify, client, elements::Spatial}; use clap::Parser; use protostar::xdg::DesktopFile; use serde::{Deserialize, Serialize}; diff --git a/sirius/Cargo.toml b/sirius/Cargo.toml index 88c86a9..2563e70 100644 --- a/sirius/Cargo.toml +++ b/sirius/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [features] -tracy = ["dep:tracing-tracy", "asteroids/tracy"] +tracy = ["dep:tracing-tracy", "stardust-xr-asteroids/tracy"] [dependencies] protostar = { path = "../protostar" } @@ -18,7 +18,7 @@ tracing-tracy = { version = "0.11.4", optional = true } tokio = { workspace = true } serde = { workspace = true } stardust-xr-fusion = { workspace = true } -asteroids = { workspace = true } +stardust-xr-asteroids = { workspace = true } tracing = "0.1.41" walkdir = "2.4.0" single = { path = "../single" } diff --git a/sirius/src/main.rs b/sirius/src/main.rs index 2aa7d8f..76f5cfc 100644 --- a/sirius/src/main.rs +++ b/sirius/src/main.rs @@ -1,6 +1,5 @@ -use asteroids::{ - ClientState, CustomElement, Element, Migrate, Reify, Transformable, client, - elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, +use stardust_xr_asteroids::{ + client, elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, ClientState, CustomElement, Element, Identifiable as _, Migrate, Reify, Transformable }; use clap::Parser; use glam::Quat;