diff --git a/Cargo.lock b/Cargo.lock index 1acc14b..022e819 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3079,7 +3079,7 @@ dependencies = [ [[package]] name = "stardust-xr-asteroids" version = "2.0.0" -source = "git+https://github.com/StardustXR/asteroids.git?branch=dev#6e94d9be18b7b38775d02dd49508d215d758500c" +source = "git+https://github.com/StardustXR/asteroids.git?branch=dev#565ca60902661011632d67f4b4ff70ab3dcea299" dependencies = [ "ashpd", "bumpalo", @@ -3090,7 +3090,6 @@ dependencies = [ "futures-util", "glam 0.30.3", "inotify", - "lazy_static", "map-range", "mint", "ouroboros", diff --git a/hexagon_launcher/src/main.rs b/hexagon_launcher/src/main.rs index f4c7ac2..bd73046 100644 --- a/hexagon_launcher/src/main.rs +++ b/hexagon_launcher/src/main.rs @@ -1,8 +1,5 @@ mod hex; -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; use mint::{Quaternion, Vector3}; @@ -10,6 +7,10 @@ use protostar::xdg::{DesktopFile, get_desktop_files}; use rayon::iter::{IntoParallelRefIterator, ParallelIterator}; use serde::{Deserialize, Serialize}; use single::{APP_SIZE, App, BTN_COLOR, BTN_SELECTED_COLOR, MODEL_SCALE}; +use stardust_xr_asteroids::{ + ClientState, CustomElement, Element, Migrate, Reify, Transformable, client, + elements::{Button, Grabbable, Model, ModelPart, PointerMode, Spatial}, +}; use stardust_xr_fusion::{ drawable::MaterialParameter, fields::{CylinderShape, Shape}, @@ -136,7 +137,6 @@ impl Reify for HexagonLauncher { Spatial::default() .pos(Hex::spiral(i + 1).get_coords()) .build() - .identify(&app.app.name()) .child(app.reify_substate(move |state: &mut HexagonLauncher| { state.apps.get_mut(i) })) diff --git a/single/src/app_launcher.rs b/single/src/app_launcher.rs index 2e9d0ed..abd8270 100644 --- a/single/src/app_launcher.rs +++ b/single/src/app_launcher.rs @@ -1,7 +1,8 @@ -use stardust_xr_asteroids::{CustomElement, ValidState}; use protostar::application::Application; +use stardust_xr_asteroids::{Context, CustomElement, ValidState}; use stardust_xr_fusion::{ node::{NodeError, NodeType}, + root::FrameInfo, spatial::{Spatial, SpatialAspect, SpatialRef, Transform}, }; use std::fmt::Debug; @@ -40,7 +41,8 @@ impl CustomElement for AppLauncher { fn frame( &self, - _info: &stardust_xr_fusion::root::FrameInfo, + _context: &Context, + _info: &FrameInfo, state: &mut State, inner: &mut Self::Inner, ) {