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

refactor(fields): use let else for getting field

Browse Source
This commit is contained in:
Nova
2022-11-24 18:56:59 -05:00
parent 3c708d1aaf
commit 8da778eaba
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nodes/fields/box.rs
View File

@@ -40,9 +40,9 @@ impl BoxField {
}
pub fn set_size_flex(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> {
if let Field::Box(box_field) = node.field.get().unwrap().as_ref() {
box_field.set_size(deserialize(data)?);
}
let Field::Box(box_field) = node.field.get().unwrap().as_ref() else { return Ok(()) };
box_field.set_size(deserialize(data)?);
Ok(())
}
}

9
src/nodes/fields/cylinder.rs
View File

@@ -44,10 +44,9 @@ impl CylinderField {
}
pub fn set_size_flex(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> {
if let Field::Cylinder(cylinder_field) = node.field.get().unwrap().as_ref() {
let (length, radius) = deserialize(data)?;
cylinder_field.set_size(length, radius);
}
let Field::Cylinder(cylinder_field) = node.field.get().unwrap().as_ref() else { return Ok(()) };
let (length, radius) = deserialize(data)?;
cylinder_field.set_size(length, radius);
Ok(())
}
}
@@ -84,6 +83,6 @@ pub fn create_cylinder_field_flex(
let transform = parse_transform(info.transform, true, true, false)?;
let node = node.add_to_scenegraph();
Spatial::add_to(&node, Some(parent), transform, false)?;
CylinderField::add_to(&node, dbg!(info.length), dbg!(info.radius))?;
CylinderField::add_to(&node, info.length, info.radius)?;
Ok(())
}

6
src/nodes/fields/sphere.rs
View File

@@ -40,10 +40,8 @@ impl SphereField {
}
pub fn set_radius_flex(node: &Node, _calling_client: Arc<Client>, data: &[u8]) -> Result<()> {
let radius = flexbuffers::Reader::get_root(data)?.get_f64()? as f32;
if let Field::Sphere(sphere_field) = node.field.get().unwrap().as_ref() {
sphere_field.set_radius(radius);
}
let Field::Sphere(sphere_field) = node.field.get().unwrap().as_ref() else { return Ok(()) };
sphere_field.set_radius(deserialize(data)?);
Ok(())
}
}