Fix doctests, Clippy warnings, and formatting

Author: idanarye

examples/custom_camera3d.rs

@@ -242,7 +242,7 @@ fn orbital_camera_movement(
             let direction = (camera_transform.translation - look_at).normalize();
             camera_transform.translation += direction * zoom * 10.0 * time.delta_secs();
         }
-        
+
         camera_transform.look_at(look_at, Vec3::Y);
     }
 }
@@ -261,7 +261,9 @@ fn populate_cube(
         cmd.insert(VpeolWillContainClickableChildren);
         if ctx.is_first_time() {
             let mesh = mesh
-                .get_or_insert_with(|| mesh_assets.add(Mesh::from(Cuboid::from_size(Vec3::splat(2.0)))))
+                .get_or_insert_with(|| {
+                    mesh_assets.add(Mesh::from(Cuboid::from_size(Vec3::splat(2.0))))
+                })
                 .clone();
             let material = material
                 .get_or_insert_with(|| material_assets.add(Color::from(css::BLUE)))
@@ -294,4 +296,3 @@ fn populate_sphere(
         }
     });
 }
-

examples/example2d.rs

@@ -1,11 +1,11 @@
 use std::path::Path;
 
-use bevy::{asset::RenderAssetUsages, log::LogPlugin};
 use bevy::color::palettes::css;
 use bevy::ecs::system::SystemState;
 use bevy::mesh::Indices;
 use bevy::prelude::*;
 use bevy::render::render_resource::PrimitiveTopology;
+use bevy::{asset::RenderAssetUsages, log::LogPlugin};
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
 
 use bevy_yoleck::prelude::*;
@@ -15,13 +15,11 @@ use serde::{Deserialize, Serialize};
 
 fn main() {
     let mut app = App::new();
-    app.add_plugins(
-        DefaultPlugins.set(LogPlugin {
-            custom_layer: bevy_yoleck::console_layer_factory,
-            ..default()
-        })
-    );
-    
+    app.add_plugins(DefaultPlugins.set(LogPlugin {
+        custom_layer: bevy_yoleck::console_layer_factory,
+        ..default()
+    }));
+
     let level = std::env::args().nth(1);
     if let Some(level) = level {
         app.add_plugins(EguiPlugin::default());
@@ -323,17 +321,13 @@ fn duplicate_fruit(
     };
     if ui.button("Duplicate").clicked() {
         writer.write(
-            YoleckDirective::spawn_entity(
-                belongs_to_level.level,
-                "Fruit",
-                true,
-            )
-            .with(Vpeol2dPosition(*position - 100.0 * Vec2::Y))
-            .with(FruitType {
-                index: fruit_type.index,
-            })
-            .modify_exclusive_systems(|queue| queue.clear())
-            .into(),
+            YoleckDirective::spawn_entity(belongs_to_level.level, "Fruit", true)
+                .with(Vpeol2dPosition(*position - 100.0 * Vec2::Y))
+                .with(FruitType {
+                    index: fruit_type.index,
+                })
+                .modify_exclusive_systems(|queue| queue.clear())
+                .into(),
         );
     }
 }

examples/example3d.rs

@@ -1,20 +1,18 @@
 use std::path::Path;
 
-use bevy::{color::palettes::css, log::LogPlugin};
 use bevy::prelude::*;
+use bevy::{color::palettes::css, log::LogPlugin};
 use bevy_egui::EguiPlugin;
 use bevy_yoleck::prelude::*;
 use bevy_yoleck::vpeol::prelude::*;
 use serde::{Deserialize, Serialize};
 
 fn main() {
     let mut app = App::new();
-    app.add_plugins(
-        DefaultPlugins.set(LogPlugin {
-            custom_layer: bevy_yoleck::console_layer_factory,
-            ..default()
-        })
-    );
+    app.add_plugins(DefaultPlugins.set(LogPlugin {
+        custom_layer: bevy_yoleck::console_layer_factory,
+        ..default()
+    }));
 
     let level = std::env::args().nth(1);
     if let Some(level) = level {

src/console.rs

@@ -81,19 +81,11 @@ impl Default for YoleckConsoleLogHistory {
 }
 
 /// Resource containing the current state of the console UI.
-#[derive(Resource)]
+#[derive(Resource, Default)]
 pub struct YoleckConsoleState {
     pub log_filters: LogFilters,
 }
 
-impl Default for YoleckConsoleState {
-    fn default() -> Self {
-        Self {
-            log_filters: LogFilters::default(),
-        }
-    }
-}
-
 /// Filters for controlling which log levels are displayed in the console.
 #[derive(Resource)]
 pub struct LogFilters {
@@ -138,22 +130,10 @@ pub fn console_panel_section(
         ui.horizontal(|ui| {
             ui.label("Filters:");
 
-            if ui
-                .checkbox(&mut console_state.log_filters.show_debug, "DEBUG")
-                .changed()
-            {}
-            if ui
-                .checkbox(&mut console_state.log_filters.show_info, "INFO")
-                .changed()
-            {}
-            if ui
-                .checkbox(&mut console_state.log_filters.show_warn, "WARN")
-                .changed()
-            {}
-            if ui
-                .checkbox(&mut console_state.log_filters.show_error, "ERROR")
-                .changed()
-            {}
+            ui.checkbox(&mut console_state.log_filters.show_debug, "DEBUG");
+            ui.checkbox(&mut console_state.log_filters.show_info, "INFO");
+            ui.checkbox(&mut console_state.log_filters.show_warn, "WARN");
+            ui.checkbox(&mut console_state.log_filters.show_error, "ERROR");
 
             ui.separator();
 
@@ -263,8 +243,8 @@ fn store_log_messages(
 /// # Example
 ///
 /// ```no_run
-/// use bevy::prelude::*;
-/// use bevy_yoleck::console_layer_factory;
+/// # use bevy::{prelude::*, log::LogPlugin};
+/// # use bevy_yoleck::console_layer_factory;
 ///
 /// fn main() {
 ///     App::new()

src/editor.rs

@@ -357,7 +357,12 @@ pub fn entity_selection_section(
 
     let mut system_state = SystemState::<(
         Res<YoleckEntityConstructionSpecs>,
-        Query<(Entity, &YoleckManaged, Option<&YoleckEditMarker>, Option<&YoleckEntityUuid>)>,
+        Query<(
+            Entity,
+            &YoleckManaged,
+            Option<&YoleckEditMarker>,
+            Option<&YoleckEntityUuid>,
+        )>,
         Res<State<YoleckEditorState>>,
         MessageWriter<YoleckDirective>,
         Option<Res<YoleckActiveExclusiveSystem>>,
@@ -404,34 +409,34 @@ pub fn entity_selection_section(
                 continue;
             }
             let is_selected = edit_marker.is_some();
-            
+
             if let Some(entity_uuid) = entity_uuid {
                 let uuid = entity_uuid.get();
                 let sense = egui::Sense::click_and_drag();
                 let caption = format_caption(entity, yoleck_managed);
-                let response = ui.selectable_label(is_selected, caption.clone())
+                let response = ui
+                    .selectable_label(is_selected, caption.clone())
                     .interact(sense);
-                
+
                 if response.drag_started() {
                     egui::DragAndDrop::set_payload(ui.ctx(), uuid);
                 }
-                
+
                 if response.dragged() {
                     ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing);
-                    
+
                     if let Some(pointer_pos) = ui.ctx().pointer_interact_pos() {
                         egui::Area::new(egui::Id::new("dragged_entity_preview"))
                             .fixed_pos(pointer_pos + egui::vec2(10.0, 10.0))
                             .order(egui::Order::Tooltip)
                             .show(ui.ctx(), |ui| {
-                                egui::Frame::popup(ui.style())
-                                    .show(ui, |ui| {
-                                        ui.label(&caption);
-                                    });
+                                egui::Frame::popup(ui.style()).show(ui, |ui| {
+                                    ui.label(&caption);
+                                });
                             });
                     }
                 }
-                
+
                 if response.clicked() && !response.drag_started() {
                     if ui.input(|input| input.modifiers.shift) {
                         writer.write(YoleckDirective::toggle_selected(entity));
@@ -441,18 +446,16 @@ pub fn entity_selection_section(
                         writer.write(YoleckDirective::set_selected(Some(entity)));
                     }
                 }
-            } else {
-                if ui
-                    .selectable_label(is_selected, format_caption(entity, yoleck_managed))
-                    .clicked()
-                {
-                    if ui.input(|input| input.modifiers.shift) {
-                        writer.write(YoleckDirective::toggle_selected(entity));
-                    } else if is_selected {
-                        writer.write(YoleckDirective::set_selected(None));
-                    } else {
-                        writer.write(YoleckDirective::set_selected(Some(entity)));
-                    }
+            } else if ui
+                .selectable_label(is_selected, format_caption(entity, yoleck_managed))
+                .clicked()
+            {
+                if ui.input(|input| input.modifiers.shift) {
+                    writer.write(YoleckDirective::toggle_selected(entity));
+                } else if is_selected {
+                    writer.write(YoleckDirective::set_selected(None));
+                } else {
+                    writer.write(YoleckDirective::set_selected(Some(entity)));
                 }
             }
         }

src/editor_window.rs

@@ -3,10 +3,10 @@ use bevy::window::PrimaryWindow;
 use bevy_egui::{egui, EguiContext, PrimaryEguiContext};
 
 use crate::util::EditSpecificResources;
-use crate::YoleckEditorRightPanelSections;
+use crate::YoleckEditorBottomPanelSections;
 use crate::YoleckEditorLeftPanelSections;
+use crate::YoleckEditorRightPanelSections;
 use crate::YoleckEditorTopPanelSections;
-use crate::YoleckEditorBottomPanelSections;
 
 #[derive(Resource, Default)]
 pub struct YoleckEditorViewportRect {
@@ -116,30 +116,30 @@ pub(crate) fn yoleck_editor_window(
                 |world, mut yoleck_editor_bottom_sections: Mut<YoleckEditorBottomPanelSections>| {
                     world.resource_scope(|world, mut edit_specific: Mut<EditSpecificResources>| {
                         edit_specific.inject_to_world(world);
-                        
+
                         let inner_margin = 3.;
                         ui.add_space(inner_margin);
-                        
+
                         let mut new_active_tab = yoleck_editor_bottom_sections.active_tab;
                         ui.horizontal(|ui| {
                             for (i, tab) in yoleck_editor_bottom_sections.tabs.iter().enumerate() {
-                                if ui.selectable_label(
-                                    new_active_tab == i,
-                                    &tab.name
-                                ).clicked() {
+                                if ui
+                                    .selectable_label(new_active_tab == i, &tab.name)
+                                    .clicked()
+                                {
                                     new_active_tab = i;
                                 }
                             }
                         });
                         yoleck_editor_bottom_sections.active_tab = new_active_tab;
-                        
+
                         ui.separator();
-                        
+
                         let active_tab = yoleck_editor_bottom_sections.active_tab;
                         if let Some(tab) = yoleck_editor_bottom_sections.tabs.get_mut(active_tab) {
                             tab.section.0.invoke(world, ui).unwrap();
                         }
-                        
+
                         edit_specific.take_from_world(world);
                     });
                 },

src/entity_ref.rs

@@ -4,7 +4,6 @@ use uuid::Uuid;
 
 use crate::entity_uuid::YoleckUuidRegistry;
 
-
 /// A reference to another Yoleck entity, stored by UUID for persistence.
 ///
 /// This allows one entity to reference another entity in a way that survives saving and loading.

src/level_files_manager.rs

@@ -562,17 +562,15 @@ pub fn playtest_buttons_section(
                     .id();
                 playtest_level.0 = None;
             }
-        } else {
-            if ui.button("Playtest").clicked() {
-                let level = gen_raw_level_file();
-                clear_level(&mut commands);
-                next_editor_state.set(YoleckEditorState::GameActive);
-                let level_asset_handle = level_assets.add(level.clone());
-                yoleck.level_being_edited = commands
-                    .spawn((YoleckLevelInPlaytest, YoleckLoadLevel(level_asset_handle)))
-                    .id();
-                playtest_level.0 = Some(level);
-            }
+        } else if ui.button("Playtest").clicked() {
+            let level = gen_raw_level_file();
+            clear_level(&mut commands);
+            next_editor_state.set(YoleckEditorState::GameActive);
+            let level_asset_handle = level_assets.add(level.clone());
+            yoleck.level_being_edited = commands
+                .spawn((YoleckLevelInPlaytest, YoleckLoadLevel(level_asset_handle)))
+                .id();
+            playtest_level.0 = Some(level);
         }
 
         ui.separator();

src/vpeol.rs

@@ -27,14 +27,14 @@ pub mod prelude {
     };
     #[cfg(feature = "vpeol_2d")]
     pub use crate::vpeol_2d::{
-        Vpeol2dCameraControl, Vpeol2dPluginForEditor, Vpeol2dPluginForGame,
-        Vpeol2dPosition, Vpeol2dRotatation, Vpeol2dScale,
+        Vpeol2dCameraControl, Vpeol2dPluginForEditor, Vpeol2dPluginForGame, Vpeol2dPosition,
+        Vpeol2dRotatation, Vpeol2dScale,
     };
     #[cfg(feature = "vpeol_3d")]
     pub use crate::vpeol_3d::{
-        Vpeol3dCameraControl, Vpeol3dCameraMode, Vpeol3dKnobsConfig, Vpeol3dKnobsMode, Vpeol3dPluginForEditor, 
-        Vpeol3dPluginForGame, Vpeol3dPosition, Vpeol3dRotation, Vpeol3dScale,
-        YoleckCameraChoices,
+        Vpeol3dCameraControl, Vpeol3dCameraMode, Vpeol3dKnobsConfig, Vpeol3dKnobsMode,
+        Vpeol3dPluginForEditor, Vpeol3dPluginForGame, Vpeol3dPosition, Vpeol3dRotation,
+        Vpeol3dScale, YoleckCameraChoices,
     };
 }