diff --git a/Cargo.toml b/Cargo.toml index 3659dd5..e10d81e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,24 +10,22 @@ homepage = "https://stardustxr.org" [dependencies] color-eyre = { version = "0.6.2", default-features = false } -clap = { version = "4.1.1", features = ["derive"] } +clap = { version = "4.1.6", features = ["derive"] } dashmap = "5.4.0" -flatbuffers = "22.9.29" -flexbuffers = "2.0.0" -glam = {version = "0.22.0", features = ["mint"]} +glam = {version = "0.23.0", features = ["mint"]} lazy_static = "1.4.0" mint = "0.5.9" nanoid = "0.4.0" -once_cell = "1.17.0" +once_cell = "1.17.1" parking_lot = "0.12.1" portable-atomic = {version = "1.0.1", features = ["float", "std"]} rustc-hash = "1.1.0" -tokio = { version = "1", features = ["rt-multi-thread", "signal"] } +tokio = { version = "1.25.0", features = ["rt-multi-thread", "signal"] } send_wrapper = "0.6.0" prisma = "0.1.1" slog = "2.7.0" xkbcommon = { version = "0.5.0", default-features = false, optional = true } -stardust-xr = "0.10.5" +stardust-xr = "0.11.0" directories = "4.0.1" serde = { version = "1.0.152", features = ["derive"] } tracing = "0.1.37" @@ -39,7 +37,7 @@ rand = "0.8.5" [dependencies.stereokit] default-features = false features = ["linux-egl", "color_named", "prisma"] -version = "0.14.1" +version = "0.15.1" [dependencies.smithay] git = "https://github.com/technobaboo/smithay.git" # Until we get stereokit to understand OES samplers and external textures @@ -53,7 +51,7 @@ version = "0.1.8" optional = true [dependencies.tracing-chrome] -version = "0.7.0" +version = "0.7.1" optional = true [features] diff --git a/src/nodes/audio.rs b/src/nodes/audio.rs index fa20e04..c31ba49 100644 --- a/src/nodes/audio.rs +++ b/src/nodes/audio.rs @@ -14,8 +14,8 @@ use stardust_xr::schemas::flex::deserialize; use stardust_xr::values::Transform; use std::ops::DerefMut; use std::{ffi::OsStr, fmt::Error, path::PathBuf, sync::Arc}; -use stereokit::sound::Sound as SKSound; use stereokit::sound::SoundInstance; +use stereokit::sound::{Sound as SKSound, SoundT}; static SOUND_REGISTRY: Registry = Registry::new(); diff --git a/src/nodes/data.rs b/src/nodes/data.rs index 4fa65c4..f368230 100644 --- a/src/nodes/data.rs +++ b/src/nodes/data.rs @@ -12,7 +12,7 @@ use glam::vec3a; use mint::{Quaternion, Vector3}; use nanoid::nanoid; use serde::{Deserialize, Serialize}; -use stardust_xr::schemas::flex::{deserialize, serialize}; +use stardust_xr::schemas::flex::{deserialize, flexbuffers, serialize}; use stardust_xr::values::Transform; use std::sync::{Arc, Weak}; diff --git a/src/nodes/input/mod.rs b/src/nodes/input/mod.rs index ae3f68b..0be6497 100644 --- a/src/nodes/input/mod.rs +++ b/src/nodes/input/mod.rs @@ -20,8 +20,11 @@ use nanoid::nanoid; use parking_lot::Mutex; use portable_atomic::AtomicBool; use serde::Deserialize; -use stardust_xr::schemas::flat::{Datamap, InputDataType}; use stardust_xr::schemas::{flat::InputData, flex::deserialize}; +use stardust_xr::schemas::{ + flat::{Datamap, InputDataType}, + flex::flexbuffers, +}; use stardust_xr::values::Transform; use std::ops::Deref; use std::sync::atomic::Ordering; diff --git a/src/nodes/items/environment.rs b/src/nodes/items/environment.rs index cbd9671..3282670 100644 --- a/src/nodes/items/environment.rs +++ b/src/nodes/items/environment.rs @@ -14,7 +14,7 @@ use color_eyre::eyre::{eyre, Result}; use lazy_static::lazy_static; use serde::Deserialize; use stardust_xr::{ - schemas::flex::{deserialize, serialize}, + schemas::flex::{deserialize, flexbuffers, serialize}, values::Transform, }; use std::sync::Arc; diff --git a/src/nodes/items/mod.rs b/src/nodes/items/mod.rs index 7bf06d1..12af9a7 100644 --- a/src/nodes/items/mod.rs +++ b/src/nodes/items/mod.rs @@ -17,7 +17,7 @@ use nanoid::nanoid; use parking_lot::Mutex; use portable_atomic::Ordering; use serde::Deserialize; -use stardust_xr::schemas::flex::{deserialize, serialize}; +use stardust_xr::schemas::flex::{deserialize, flexbuffers, serialize}; use stardust_xr::values::Transform; use std::hash::Hash; use std::ops::Deref; diff --git a/src/nodes/startup.rs b/src/nodes/startup.rs index a549eab..ed9bf63 100644 --- a/src/nodes/startup.rs +++ b/src/nodes/startup.rs @@ -9,7 +9,7 @@ use color_eyre::eyre::Result; use glam::Mat4; use parking_lot::Mutex; use rustc_hash::FxHashMap; -use stardust_xr::schemas::flex::{deserialize, serialize}; +use stardust_xr::schemas::flex::{deserialize, flexbuffers, serialize}; use std::{ fmt::Debug, sync::{Arc, Weak}, diff --git a/src/objects/input/mouse_pointer.rs b/src/objects/input/mouse_pointer.rs index 48d8d71..77f4f0c 100644 --- a/src/objects/input/mouse_pointer.rs +++ b/src/objects/input/mouse_pointer.rs @@ -12,7 +12,7 @@ use color_eyre::eyre::Result; use glam::{vec3, Mat4, Vec3}; use nanoid::nanoid; use serde::Serialize; -use stardust_xr::schemas::flat::Datamap; +use stardust_xr::schemas::{flat::Datamap, flex::flexbuffers}; use std::{convert::TryFrom, sync::Arc}; use stereokit::input::{ButtonState, Key, Ray as SkRay, StereoKitInput}; use tracing::instrument; diff --git a/src/objects/input/sk_controller.rs b/src/objects/input/sk_controller.rs index ba58fb3..fd9db74 100644 --- a/src/objects/input/sk_controller.rs +++ b/src/objects/input/sk_controller.rs @@ -3,7 +3,10 @@ use crate::nodes::{ spatial::Spatial, }; use glam::Mat4; -use stardust_xr::{schemas::flat::Datamap, values::Transform}; +use stardust_xr::{ + schemas::{flat::Datamap, flex::flexbuffers}, + values::Transform, +}; use std::sync::{Arc, Weak}; use stereokit::input::{ButtonState, Handed, StereoKitInput}; use tracing::instrument; diff --git a/src/objects/input/sk_hand.rs b/src/objects/input/sk_hand.rs index 868b591..57652be 100644 --- a/src/objects/input/sk_hand.rs +++ b/src/objects/input/sk_hand.rs @@ -3,7 +3,10 @@ use crate::nodes::{ spatial::Spatial, }; use glam::Mat4; -use stardust_xr::schemas::flat::{Datamap, Hand as FlatHand, Joint}; +use stardust_xr::schemas::{ + flat::{Datamap, Hand as FlatHand, Joint}, + flex::flexbuffers, +}; use std::sync::{Arc, Weak}; use stereokit::{ input::{ButtonState, Handed, Joint as SkJoint, StereoKitInput},