StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

start to convert ad-hoc errors to explicit types

Browse Source
This commit is contained in:
ash lea
2024-12-30 15:28:39 -05:00
committed by Nova
parent 3b996c46e2
commit a5f087d29f
23 changed files with 166 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nodes/spatial/mod.rs
View File

@@ -4,10 +4,12 @@ use self::zone::Zone;
use super::alias::Alias;
use super::fields::{Field, FieldTrait};
use super::{Aspect, AspectIdentifier};
use crate::bail;
use crate::core::client::Client;
use crate::core::error::Result;
use crate::core::registry::Registry;
use crate::nodes::{Node, OWNED_ASPECT_ALIAS_INFO};
use color_eyre::eyre::{eyre, OptionExt, Result};
use color_eyre::eyre::OptionExt;
use glam::{vec3a, Mat4, Quat, Vec3};
use mint::Vector3;
use once_cell::sync::OnceCell;
@@ -208,7 +210,7 @@ impl Spatial {
.map(|parent| self.is_ancestor_of((*parent).clone()))
.unwrap_or(false);
if is_ancestor {
return Err(eyre!("Setting spatial parent would cause a loop"));
bail!("Setting spatial parent would cause a loop");
}
self.set_parent(parent);
@@ -223,7 +225,7 @@ impl Spatial {
.map(|parent| self.is_ancestor_of((*parent).clone()))
.unwrap_or(false);
if is_ancestor {
return Err(eyre!("Setting spatial parent would cause a loop"));
bail!("Setting spatial parent would cause a loop");
}
self.set_local_transform(Spatial::space_to_space_matrix(
@@ -458,7 +460,7 @@ impl InterfaceAspect for Interface {
calling_client: Arc<Client>,
uid: u64,
) -> Result<Arc<Node>> {
EXPORTED_SPATIALS
Ok(EXPORTED_SPATIALS
.lock()
.get(&uid)
.map(|s| {
@@ -470,6 +472,6 @@ impl InterfaceAspect for Interface {
)
.unwrap()
})
.ok_or_eyre("Couldn't find spatial with that ID")
.ok_or_eyre("Couldn't find spatial with that ID")?)
}
}