refactor(engine): fix portion of clippy lints

1 files changed, 26 insertions, 41 deletions

diff --git a/engine/src/rendering/main_render_pass.rs b/engine/src/rendering/main_render_pass.rs
index c762231..cb38071 100644
--- a/engine/src/rendering/main_render_pass.rs
+++ b/engine/src/rendering/main_render_pass.rs
@@ -237,9 +237,9 @@ pub fn add_main_render_pass(
                 continue;
             }
 
-            let model_material = match model_spec.find_first_material(&assets) {
+            let model_material = match model_spec.find_first_material(assets) {
                 MaterialSearchResult::Found(model_material_asset)
-                    if let Some(model_material) = assets.get(&model_material_asset) =>
+                    if let Some(model_material) = assets.get(model_material_asset) =>
                 {
                     model_material
                 }
@@ -251,7 +251,7 @@ pub fn add_main_render_pass(
 
             if model_material
                 .textures()
-                .any(|texture_asset| !assets.is_loaded_and_has_type(&texture_asset))
+                .any(|texture_asset| !assets.is_loaded_and_has_type(texture_asset))
             {
                 continue;
             }
@@ -273,13 +273,7 @@ pub fn add_main_render_pass(
                 .commands
                 .push(Command::ActivateShader(shaders.main_3d_shader_obj_id));
 
-            if let Some(draw_flags) = draw_flags.as_deref().and_then(|draw_flags| {
-                if draw_flags.polygon_mode_config != PolygonModeConfig::default() {
-                    Some(draw_flags)
-                } else {
-                    None
-                }
-            }) {
+            if let Some(draw_flags) = draw_flags.as_deref().filter(|&draw_flags| draw_flags.polygon_mode_config != PolygonModeConfig::default()) {
                 render_pass.commands.push(Command::UpdateDrawProperties(
                     DrawProperties {
                         polygon_mode_config: draw_flags.polygon_mode_config.clone(),
@@ -310,7 +304,7 @@ pub fn add_main_render_pass(
         if let Some(scene_skybox) = &scene_skybox {
             let Some(sky_box_ids) = load_sky_box(
                 scene_ent_id,
-                &scene_skybox,
+                scene_skybox,
                 scene_skybox_state.as_deref(),
                 assets,
                 object_store,
@@ -489,9 +483,9 @@ fn add_renderable_creation_commands(
 
     debug_assert!(model_spec.materials.len() <= 1);
 
-    let model_material = match model_spec.find_first_material(&assets) {
+    let model_material = match model_spec.find_first_material(assets) {
         MaterialSearchResult::Found(model_material_asset) => {
-            let Some(model_material) = assets.get(&model_material_asset) else {
+            let Some(model_material) = assets.get(model_material_asset) else {
                 return;
             };
 
@@ -726,7 +720,7 @@ fn add_set_3d_shader_renderable_bindings(
 {
     let (material, material_flags, transform) = renderable;
 
-    let transform = match transform.as_deref() {
+    let transform = match transform {
         Some(transform) => transform,
         None => &Transform::default(),
     };
@@ -735,11 +729,10 @@ fn add_set_3d_shader_renderable_bindings(
     let inverted_model_matrix = model_matrix.inverse();
 
     let material_flags = material_flags
-        .as_deref()
         .unwrap_or(&const { MaterialFlags::builder().build() });
 
     let env_lighting = match &scene_env_lighting {
-        Some(env_lighting) => &env_lighting,
+        Some(env_lighting) => env_lighting,
         None => &EnvironmentalLighting::default(),
     };
 
@@ -754,8 +747,7 @@ fn add_set_3d_shader_renderable_bindings(
     let diffuse_map_obj_id = material
         .diffuse_map
         .as_ref()
-        .map(|diffuse_map| ObjectId::Asset(diffuse_map.id()))
-        .unwrap_or(white_1x1_tex_obj_id);
+        .map_or(white_1x1_tex_obj_id, |diffuse_map| ObjectId::Asset(diffuse_map.id()));
 
     render_pass.commands.extend(
         [
@@ -766,10 +758,8 @@ fn add_set_3d_shader_renderable_bindings(
                 .field("model_inverted")
                 .binding(inverted_model_matrix.into())?,
             material_shader_cursor.field("ambient").binding(
-                material_flags
-                    .use_ambient_color
-                    .then_some(&material.ambient)
-                    .unwrap_or(&env_lighting.ambient_color)
+                if material_flags
+                    .use_ambient_color { &material.ambient } else { &env_lighting.ambient_color }
                     .to_rgb_lossy()
                     .into(),
             )?,
@@ -784,8 +774,7 @@ fn add_set_3d_shader_renderable_bindings(
                     material
                         .ambient_map
                         .as_ref()
-                        .map(|ambient_map| ObjectId::Asset(ambient_map.id()))
-                        .unwrap_or(diffuse_map_obj_id),
+                        .map_or(diffuse_map_obj_id, |ambient_map| ObjectId::Asset(ambient_map.id())),
                     ShaderBindingTextureKind::Texture2D,
                 ),
             )?,
@@ -800,8 +789,7 @@ fn add_set_3d_shader_renderable_bindings(
                     material
                         .specular_map
                         .as_ref()
-                        .map(|specular_map| ObjectId::Asset(specular_map.id()))
-                        .unwrap_or(white_1x1_tex_obj_id),
+                        .map_or(white_1x1_tex_obj_id, |specular_map| ObjectId::Asset(specular_map.id())),
                     ShaderBindingTextureKind::Texture2D,
                 ),
             )?,
@@ -907,24 +895,21 @@ fn load_sky_box(
     actions: &mut Actions,
 ) -> Result<Option<SkyBoxIds>, crate::Error>
 {
-    let mesh_object_id = match &sky_box_state {
-        Some(sky_box_state) => sky_box_state.mesh_object_id,
-        None => {
-            let sky_box_mesh =
-                Mesh::cube(Dimens3 { width: 1.0, height: 1.0, depth: 1.0 });
+    let mesh_object_id = if let Some(sky_box_state) = &sky_box_state { sky_box_state.mesh_object_id } else {
+        let sky_box_mesh =
+            Mesh::cube(Dimens3 { width: 1.0, height: 1.0, depth: 1.0 });
 
-            let mesh_object_id = ObjectId::new_sequential();
+        let mesh_object_id = ObjectId::new_sequential();
 
-            object_store.insert_pending(mesh_object_id);
+        object_store.insert_pending(mesh_object_id);
 
-            render_pass.commands.push(Command::CreateMesh {
-                obj_id: mesh_object_id,
-                mesh: AssetOrValue::Value(sky_box_mesh),
-                usage: MeshUsage::Static,
-            });
+        render_pass.commands.push(Command::CreateMesh {
+            obj_id: mesh_object_id,
+            mesh: AssetOrValue::Value(sky_box_mesh),
+            usage: MeshUsage::Static,
+        });
 
-            mesh_object_id
-        }
+        mesh_object_id
     };
 
     let texture_object_id = match &sky_box {
@@ -952,7 +937,7 @@ fn load_sky_box(
                     })
                     .collect::<Vec<_>>()
                     .as_array::<6>()
-                    .cloned()
+                    .copied()
                 else {
                     return Ok(None);
                 };