diff --git a/src/nodes/fields/box.rs b/src/nodes/fields/box.rs index c0cfe1d..8db5bbf 100644 --- a/src/nodes/fields/box.rs +++ b/src/nodes/fields/box.rs @@ -40,9 +40,9 @@ impl BoxField { } pub fn set_size_flex(node: &Node, _calling_client: Arc, 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(()) } } diff --git a/src/nodes/fields/cylinder.rs b/src/nodes/fields/cylinder.rs index 96c03d9..3ab79de 100644 --- a/src/nodes/fields/cylinder.rs +++ b/src/nodes/fields/cylinder.rs @@ -44,10 +44,9 @@ impl CylinderField { } pub fn set_size_flex(node: &Node, _calling_client: Arc, 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(()) } diff --git a/src/nodes/fields/sphere.rs b/src/nodes/fields/sphere.rs index e0e22aa..0cf6394 100644 --- a/src/nodes/fields/sphere.rs +++ b/src/nodes/fields/sphere.rs @@ -40,10 +40,8 @@ impl SphereField { } pub fn set_radius_flex(node: &Node, _calling_client: Arc, 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(()) } }