chore: use the new asteroids name
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
88
Cargo.lock
generated
88
Cargo.lock
generated
@@ -138,22 +138,6 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"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]]
|
[[package]]
|
||||||
name = "arrayref"
|
name = "arrayref"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
@@ -183,35 +167,6 @@ dependencies = [
|
|||||||
"zbus",
|
"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]]
|
[[package]]
|
||||||
name = "async-broadcast"
|
name = "async-broadcast"
|
||||||
version = "0.7.2"
|
version = "0.7.2"
|
||||||
@@ -1451,7 +1406,6 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
|||||||
name = "hexagon_launcher"
|
name = "hexagon_launcher"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asteroids",
|
|
||||||
"clap",
|
"clap",
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
"glam 0.25.0",
|
"glam 0.25.0",
|
||||||
@@ -1461,6 +1415,7 @@ dependencies = [
|
|||||||
"rayon",
|
"rayon",
|
||||||
"serde",
|
"serde",
|
||||||
"single",
|
"single",
|
||||||
|
"stardust-xr-asteroids",
|
||||||
"stardust-xr-fusion",
|
"stardust-xr-fusion",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
@@ -3017,7 +2972,6 @@ dependencies = [
|
|||||||
name = "single"
|
name = "single"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asteroids",
|
|
||||||
"clap",
|
"clap",
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
"glam 0.24.2",
|
"glam 0.24.2",
|
||||||
@@ -3025,6 +2979,7 @@ dependencies = [
|
|||||||
"mint",
|
"mint",
|
||||||
"protostar",
|
"protostar",
|
||||||
"serde",
|
"serde",
|
||||||
|
"stardust-xr-asteroids",
|
||||||
"stardust-xr-fusion",
|
"stardust-xr-fusion",
|
||||||
"stardust-xr-molecules",
|
"stardust-xr-molecules",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -3043,7 +2998,6 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
|
|||||||
name = "sirius"
|
name = "sirius"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asteroids",
|
|
||||||
"clap",
|
"clap",
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
"glam 0.25.0",
|
"glam 0.25.0",
|
||||||
@@ -3052,6 +3006,7 @@ dependencies = [
|
|||||||
"protostar",
|
"protostar",
|
||||||
"serde",
|
"serde",
|
||||||
"single",
|
"single",
|
||||||
|
"stardust-xr-asteroids",
|
||||||
"stardust-xr-fusion",
|
"stardust-xr-fusion",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
@@ -3104,7 +3059,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "stardust-xr"
|
name = "stardust-xr"
|
||||||
version = "0.45.0"
|
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 = [
|
dependencies = [
|
||||||
"cluFlock",
|
"cluFlock",
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
@@ -3121,10 +3076,39 @@ dependencies = [
|
|||||||
"tracing",
|
"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]]
|
[[package]]
|
||||||
name = "stardust-xr-fusion"
|
name = "stardust-xr-fusion"
|
||||||
version = "0.45.0"
|
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 = [
|
dependencies = [
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
"dashmap",
|
"dashmap",
|
||||||
@@ -3145,7 +3129,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "stardust-xr-fusion-codegen"
|
name = "stardust-xr-fusion-codegen"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"convert_case",
|
"convert_case",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -3175,7 +3159,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "stardust-xr-schemas"
|
name = "stardust-xr-schemas"
|
||||||
version = "1.5.3"
|
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 = [
|
dependencies = [
|
||||||
"flatbuffers",
|
"flatbuffers",
|
||||||
"flexbuffers",
|
"flexbuffers",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = ["app_grid", "hexagon_launcher", "protostar", "single", "sirius"]
|
members = ["hexagon_launcher", "protostar", "single", "sirius"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
tokio = { version = "1.47.1", features = ["rt", "tokio-macros", "sync"] }
|
tokio = { version = "1.47.1", features = ["rt", "tokio-macros", "sync"] }
|
||||||
@@ -14,7 +14,7 @@ branch = "dev"
|
|||||||
git = "https://github.com/StardustXR/molecules.git"
|
git = "https://github.com/StardustXR/molecules.git"
|
||||||
branch = "dev"
|
branch = "dev"
|
||||||
|
|
||||||
[workspace.dependencies.asteroids]
|
[workspace.dependencies.stardust-xr-asteroids]
|
||||||
git = "https://github.com/StardustXR/asteroids.git"
|
git = "https://github.com/StardustXR/asteroids.git"
|
||||||
branch = "dev"
|
branch = "dev"
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
tracy = ["dep:tracing-tracy", "asteroids/tracy"]
|
tracy = ["dep:tracing-tracy", "stardust-xr-asteroids/tracy"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
protostar = { path = "../protostar" }
|
protostar = { path = "../protostar" }
|
||||||
@@ -24,7 +24,7 @@ tracing-tracy = { version = "0.11.4", default-features = false, features = [
|
|||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
stardust-xr-fusion = { workspace = true }
|
stardust-xr-fusion = { workspace = true }
|
||||||
asteroids = { workspace = true }
|
stardust-xr-asteroids = { workspace = true }
|
||||||
tracing = "0.1.41"
|
tracing = "0.1.41"
|
||||||
single = { path = "../single" }
|
single = { path = "../single" }
|
||||||
rayon = "1.11.0"
|
rayon = "1.11.0"
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
mod hex;
|
mod hex;
|
||||||
|
|
||||||
use asteroids::{
|
use stardust_xr_asteroids::{
|
||||||
ClientState, CustomElement, Element, Migrate, Reify, Transformable, client,
|
client, elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, ClientState, CustomElement, Element, Identifiable as _, Migrate, Reify, Transformable
|
||||||
elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial},
|
|
||||||
};
|
};
|
||||||
use glam::Quat;
|
use glam::Quat;
|
||||||
use hex::Hex;
|
use hex::Hex;
|
||||||
|
|||||||
@@ -18,4 +18,4 @@ tokio = { workspace = true }
|
|||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
stardust-xr-fusion = { workspace = true }
|
stardust-xr-fusion = { workspace = true }
|
||||||
stardust-xr-molecules = { workspace = true }
|
stardust-xr-molecules = { workspace = true }
|
||||||
asteroids = { workspace = true }
|
stardust-xr-asteroids = { workspace = true }
|
||||||
|
|||||||
@@ -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 glam::{Quat, Vec3};
|
||||||
use mint::{Quaternion, Vector3};
|
use mint::{Quaternion, Vector3};
|
||||||
use protostar::application::Application;
|
use protostar::application::Application;
|
||||||
use protostar::xdg::{DesktopFile, Icon, IconType};
|
use protostar::xdg::{DesktopFile, Icon, IconType};
|
||||||
use serde::{Deserialize, Serialize};
|
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::node::NodeError;
|
||||||
use stardust_xr_fusion::values::ResourceID;
|
use stardust_xr_fusion::values::ResourceID;
|
||||||
use stardust_xr_fusion::values::color::rgba_linear;
|
|
||||||
use stardust_xr_fusion::{
|
use stardust_xr_fusion::{
|
||||||
drawable::{MaterialParameter, XAlign, YAlign},
|
drawable::{MaterialParameter, XAlign, YAlign},
|
||||||
fields::{CylinderShape, Shape},
|
fields::{CylinderShape, Shape},
|
||||||
@@ -153,8 +152,8 @@ impl Reify for App {
|
|||||||
anchor_align_x: XAlign::Center,
|
anchor_align_x: XAlign::Center,
|
||||||
anchor_align_y: YAlign::Bottom,
|
anchor_align_y: YAlign::Bottom,
|
||||||
})
|
})
|
||||||
.text_align_x(XAlign::Center)
|
.align_x(XAlign::Center)
|
||||||
.text_align_y(YAlign::Bottom)
|
.align_y(YAlign::Bottom)
|
||||||
.pos([0.0, -APP_SIZE * 0.35, 0.002])
|
.pos([0.0, -APP_SIZE * 0.35, 0.002])
|
||||||
.build(),
|
.build(),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use asteroids::{CustomElement, ValidState};
|
use stardust_xr_asteroids::{CustomElement, ValidState};
|
||||||
use protostar::application::Application;
|
use protostar::application::Application;
|
||||||
use stardust_xr_fusion::{
|
use stardust_xr_fusion::{
|
||||||
node::{NodeError, NodeType},
|
node::{NodeError, NodeType},
|
||||||
@@ -23,8 +23,8 @@ impl<State: ValidState> CustomElement<State> for AppLauncher<State> {
|
|||||||
|
|
||||||
fn create_inner(
|
fn create_inner(
|
||||||
&self,
|
&self,
|
||||||
_asteroids_context: &asteroids::Context,
|
_asteroids_context: &stardust_xr_asteroids::Context,
|
||||||
info: asteroids::CreateInnerInfo,
|
info: stardust_xr_asteroids::CreateInnerInfo,
|
||||||
_resource: &mut Self::Resource,
|
_resource: &mut Self::Resource,
|
||||||
) -> Result<Self::Inner, Self::Error> {
|
) -> Result<Self::Inner, Self::Error> {
|
||||||
let spatial = Spatial::create(
|
let spatial = Spatial::create(
|
||||||
|
|||||||
@@ -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 clap::Parser;
|
||||||
use protostar::xdg::DesktopFile;
|
use protostar::xdg::DesktopFile;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
tracy = ["dep:tracing-tracy", "asteroids/tracy"]
|
tracy = ["dep:tracing-tracy", "stardust-xr-asteroids/tracy"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
protostar = { path = "../protostar" }
|
protostar = { path = "../protostar" }
|
||||||
@@ -18,7 +18,7 @@ tracing-tracy = { version = "0.11.4", optional = true }
|
|||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
stardust-xr-fusion = { workspace = true }
|
stardust-xr-fusion = { workspace = true }
|
||||||
asteroids = { workspace = true }
|
stardust-xr-asteroids = { workspace = true }
|
||||||
tracing = "0.1.41"
|
tracing = "0.1.41"
|
||||||
walkdir = "2.4.0"
|
walkdir = "2.4.0"
|
||||||
single = { path = "../single" }
|
single = { path = "../single" }
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use asteroids::{
|
use stardust_xr_asteroids::{
|
||||||
ClientState, CustomElement, Element, Migrate, Reify, Transformable, client,
|
client, elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, ClientState, CustomElement, Element, Identifiable as _, Migrate, Reify, Transformable
|
||||||
elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial},
|
|
||||||
};
|
};
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use glam::Quat;
|
use glam::Quat;
|
||||||
|
|||||||
Reference in New Issue
Block a user