fix: cargo fmt

This commit is contained in:
Nova
2023-02-07 18:04:20 -05:00
parent 33d12787c9
commit 4620e0ca09
4 changed files with 109 additions and 103 deletions

View File

@@ -2,7 +2,7 @@ use super::scenegraph::Scenegraph;
use crate::{ use crate::{
core::{registry::OwnedRegistry, task}, core::{registry::OwnedRegistry, task},
nodes::{ nodes::{
data, drawable, fields, hmd, input, items, audio, audio, data, drawable, fields, hmd, input, items,
root::Root, root::Root,
spatial, spatial,
startup::{self, StartupSettings, STARTUP_SETTINGS}, startup::{self, StartupSettings, STARTUP_SETTINGS},

View File

@@ -5,7 +5,7 @@ mod objects;
mod wayland; mod wayland;
use crate::core::destroy_queue; use crate::core::destroy_queue;
use crate::nodes::{drawable, hmd, input, audio}; use crate::nodes::{audio, drawable, hmd, input};
use crate::objects::input::mouse_pointer::MousePointer; use crate::objects::input::mouse_pointer::MousePointer;
use crate::objects::input::sk_controller::SkController; use crate::objects::input::sk_controller::SkController;
use crate::objects::input::sk_hand::SkHand; use crate::objects::input::sk_hand::SkHand;

View File

@@ -1,11 +1,11 @@
use super::Node; use super::Node;
use crate::core::client::Client; use crate::core::client::Client;
use crate::core::destroy_queue; use crate::core::destroy_queue;
use crate::core::resource::ResourceID;
use crate::core::registry::Registry; use crate::core::registry::Registry;
use crate::nodes::spatial::{Spatial, find_spatial_parent, parse_transform}; use crate::core::resource::ResourceID;
use crate::nodes::spatial::{find_spatial_parent, parse_transform, Spatial};
use color_eyre::eyre::{ensure, eyre, Result}; use color_eyre::eyre::{ensure, eyre, Result};
use glam::Vec4Swizzles; use glam::{vec3a, Vec4Swizzles};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use parking_lot::Mutex; use parking_lot::Mutex;
use send_wrapper::SendWrapper; use send_wrapper::SendWrapper;
@@ -13,7 +13,7 @@ use serde::Deserialize;
use stardust_xr::schemas::flex::deserialize; use stardust_xr::schemas::flex::deserialize;
use stardust_xr::values::Transform; use stardust_xr::values::Transform;
use std::ops::DerefMut; use std::ops::DerefMut;
use std::{sync::Arc, path::PathBuf, ffi::OsStr, fmt::Error}; use std::{ffi::OsStr, fmt::Error, path::PathBuf, sync::Arc};
use stereokit::sound::Sound as SKSound; use stereokit::sound::Sound as SKSound;
use stereokit::sound::SoundInstance; use stereokit::sound::SoundInstance;
@@ -55,7 +55,7 @@ impl Sound {
.base_resource_prefixes .base_resource_prefixes
.lock() .lock()
.clone(), .clone(),
&[OsStr::new("wav"), OsStr::new("mp3")] &[OsStr::new("wav"), OsStr::new("mp3")],
) )
.ok_or_else(|| eyre!("Resource not found"))?, .ok_or_else(|| eyre!("Resource not found"))?,
); );
@@ -81,7 +81,14 @@ impl Sound {
}) })
.ok(); .ok();
if let Some(sk_sound) = sk_sound { if let Some(sk_sound) = sk_sound {
sound.instance.lock().replace(sk_sound.play_sound(sound.space.global_transform().to_scale_rotation_translation().2, sound.volume)); let position = sound
.space
.global_transform()
.transform_point3a(vec3a(0.0, 0.0, 0.0));
sound
.instance
.lock()
.replace(sk_sound.play_sound(position, sound.volume));
} }
Ok(()) Ok(())
@@ -133,5 +140,4 @@ impl Drop for Sound {
} }
SOUND_REGISTRY.remove(self); SOUND_REGISTRY.remove(self);
} }
} }

View File

@@ -1,4 +1,5 @@
pub mod alias; pub mod alias;
pub mod audio;
pub mod data; pub mod data;
pub mod drawable; pub mod drawable;
pub mod fields; pub mod fields;
@@ -8,7 +9,6 @@ pub mod items;
pub mod root; pub mod root;
pub mod spatial; pub mod spatial;
pub mod startup; pub mod startup;
pub mod audio;
use color_eyre::eyre::{eyre, Result}; use color_eyre::eyre::{eyre, Result};
use nanoid::nanoid; use nanoid::nanoid;
@@ -33,13 +33,13 @@ use crate::core::registry::Registry;
use self::alias::Alias; use self::alias::Alias;
use self::data::{PulseReceiver, PulseSender}; use self::data::{PulseReceiver, PulseSender};
use self::audio::Sound;
use self::drawable::lines::Lines; use self::drawable::lines::Lines;
use self::drawable::model::Model; use self::drawable::model::Model;
use self::drawable::text::Text; use self::drawable::text::Text;
use self::fields::Field; use self::fields::Field;
use self::input::{InputHandler, InputMethod}; use self::input::{InputHandler, InputMethod};
use self::items::{Item, ItemAcceptor, ItemUI}; use self::items::{Item, ItemAcceptor, ItemUI};
use self::audio::Sound;
use self::spatial::zone::Zone; use self::spatial::zone::Zone;
use self::spatial::Spatial; use self::spatial::Spatial;
use self::startup::StartupSettings; use self::startup::StartupSettings;