update: stardust xr core
This commit is contained in:
@@ -254,7 +254,7 @@ async fn main() -> Result<AppExit, JoinError> {
|
||||
#[derive(ScheduleLabel, Hash, Debug, PartialEq, Eq, Clone, Copy)]
|
||||
pub struct PreFrameWait;
|
||||
#[derive(Resource, Deref)]
|
||||
pub struct ObjectRegistryRes(ObjectRegistry);
|
||||
pub struct ObjectRegistryRes(Arc<ObjectRegistry>);
|
||||
#[derive(Resource, Deref)]
|
||||
pub struct DbusConnection(Connection);
|
||||
|
||||
@@ -263,7 +263,7 @@ fn bevy_loop(
|
||||
_project_dirs: Option<ProjectDirs>,
|
||||
args: CliArgs,
|
||||
dbus_connection: Connection,
|
||||
object_registry: ObjectRegistry,
|
||||
object_registry: Arc<ObjectRegistry>,
|
||||
) -> AppExit {
|
||||
let mut app = App::new();
|
||||
app.insert_resource(DbusConnection(dbus_connection));
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
use super::camera::CameraItemAcceptor;
|
||||
use super::{create_item_acceptor_flex, register_item_ui_flex};
|
||||
use crate::bail;
|
||||
use crate::core::error::Result;
|
||||
use crate::nodes::items::ITEM_ACCEPTOR_ASPECT_ALIAS_INFO;
|
||||
use crate::nodes::items::ITEM_ASPECT_ALIAS_INFO;
|
||||
use crate::nodes::{Aspect, AspectIdentifier};
|
||||
use crate::nodes::{
|
||||
Aspect, AspectIdentifier,
|
||||
items::{ITEM_ACCEPTOR_ASPECT_ALIAS_INFO, ITEM_ASPECT_ALIAS_INFO, ITEM_UI_ASPECT_ALIAS_INFO},
|
||||
};
|
||||
use crate::{
|
||||
core::{
|
||||
client::{Client, INTERNAL_CLIENT, get_env, state},
|
||||
error::Result,
|
||||
registry::Registry,
|
||||
},
|
||||
nodes::{
|
||||
|
||||
@@ -27,10 +27,7 @@ use rustc_hash::{FxHashMap, FxHasher};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use slotmap::{DefaultKey, Key as SlotKey};
|
||||
use stardust_xr::{
|
||||
schemas::dbus::{
|
||||
interfaces::FieldRefProxy,
|
||||
object_registry::{ObjectInfo, ObjectRegistry},
|
||||
},
|
||||
schemas::dbus::{ObjectInfo, interfaces::FieldRefProxy, object_registry::ObjectRegistry},
|
||||
values::Datamap,
|
||||
};
|
||||
use std::sync::{Arc, Weak};
|
||||
|
||||
Reference in New Issue
Block a user