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

refactor: remove many unwrap calls

Browse Source
This commit is contained in:
Nova
2023-01-25 11:50:53 -05:00
parent 41ede661f7
commit 742780e34e
26 changed files with 163 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,11 +345,11 @@ pub fn find_reference_space(
find_spatial(calling_client, "Reference space", node_path)
}
pub fn create_interface(client: &Arc<Client>) {
pub fn create_interface(client: &Arc<Client>) -> Result<()> {
let node = Node::create(client, "", "spatial", false);
node.add_local_signal("create_spatial", create_spatial_flex);
node.add_local_signal("create_zone", create_zone_flex);
node.add_to_scenegraph();
node.add_to_scenegraph().map(|_| ())
}
pub fn create_spatial_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8]) -> Result<()> {
@@ -364,7 +364,7 @@ pub fn create_spatial_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8
let node = Node::create(&calling_client, "/spatial/spatial", info.name, true);
let parent = find_spatial_parent(&calling_client, info.parent_path)?;
let transform = parse_transform(info.transform, true, true, true);
let node = node.add_to_scenegraph();
let node = node.add_to_scenegraph()?;
Spatial::add_to(&node, Some(parent), transform, info.zoneable)?;
Ok(())
}

6
src/nodes/spatial/zone.rs
View File

@@ -122,7 +122,8 @@ impl Zone {
local_methods: vec!["get_transform"],
..Default::default()
},
)?;
)
.ok()?;
Some((zoneable.uid.clone(), alias))
})
.collect::<FxHashMap<String, Arc<Node>>>();
@@ -160,7 +161,8 @@ pub fn create_zone_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8])
let transform = parse_transform(info.transform, true, true, false);
let field = find_field(&calling_client, info.field_path)?;
let node = Node::create(&calling_client, "/spatial/zone", info.name, true).add_to_scenegraph();
let node =
Node::create(&calling_client, "/spatial/zone", info.name, true).add_to_scenegraph()?;
let space = Spatial::add_to(&node, Some(parent), transform, false)?;
Zone::add_to(&node, space, &field);
Ok(())