fix show / hide stats

Author: feschber

solitaire-game/src/hints.rs

@@ -8,7 +8,6 @@ pub struct HintsPlugin;
 
 impl Plugin for HintsPlugin {
     fn build(&self, app: &mut App) {
-        app.insert_resource(ShowHints);
         app.add_plugins(Shape2dPlugin::default());
         app.add_observer(update_hints);
         app.add_systems(

solitaire-game/src/lib.rs

@@ -1,6 +1,6 @@
 use bevy::{camera::ScalingMode, prelude::*};
 use bevy_vector_shapes::{prelude::ShapePainter, shapes::DiscPainter};
-use solitaire_solver::{Board, Solution};
+use solitaire_solver::Board;
 
 use crate::{
     animation::PegAnimation,

solitaire-game/src/stats.rs

@@ -1,11 +1,60 @@
-use bevy::{prelude::*, sprite::Anchor, text::TextBounds, window::RequestRedraw};
+use bevy::{
+    ecs::entity_disabling::Disabled, prelude::*, sprite::Anchor, text::TextBounds,
+    window::RequestRedraw,
+};
 
 use crate::{
-    BoardPosition, CurrentBoard, SolutionEvent,
+    BoardPosition, CurrentBoard,
     solver::{FeasibleConstellations, RandomMoveChances},
     total_progress::TotalProgress,
 };
 
+#[derive(Default, Event)]
+pub struct ToggleStats;
+
+#[derive(Resource)]
+struct ShowStats;
+
+fn toggle_stats(
+    _: On<ToggleStats>,
+    mut commands: Commands,
+    show_stats: Option<Res<ShowStats>>,
+    stats: Query<
+        Entity,
+        (
+            Or<(
+                With<SolutionText>,
+                With<OverallSuccessRatioText>,
+                With<TotalProgressText>,
+                With<NextMoveChanceText>,
+            )>,
+            Or<(With<Disabled>, Without<Disabled>)>,
+        ),
+    >,
+) {
+    if show_stats.is_none() {
+        info!("Hiding Stats");
+        commands.insert_resource(ShowStats);
+        let mut i = 0;
+        for e in &stats {
+            info!("Hiding Stats ({i})");
+            i += 1;
+            let mut e = commands.entity(e);
+            e.insert(Disabled);
+        }
+    } else {
+        info!("Showing Stats");
+        commands.remove_resource::<ShowStats>();
+        let mut i = 0;
+        for e in &stats {
+            info!("Showing Stats ({i})");
+            i += 1;
+            let mut e = commands.entity(e);
+            e.remove::<Disabled>();
+        }
+    }
+}
+
 pub struct StatsPlugin;
 
 impl Plugin for StatsPlugin {
@@ -23,6 +72,7 @@ impl Plugin for StatsPlugin {
         app.add_observer(update_overall_success);
         app.add_observer(update_total_progress);
         app.add_observer(update_solution_count);
+        app.add_observer(toggle_stats);
     }
 }
 
@@ -39,7 +89,7 @@ struct TotalProgressText;
 struct SolutionText;
 
 #[derive(Component)]
-struct OverallSuccessRatio;
+struct OverallSuccessRatioText;
 
 fn update_stats(mut commands: Commands) {
     commands.trigger(UpdateStats);
@@ -70,25 +120,20 @@ fn add_text(mut commands: Commands, asset_server: Res<AssetServer>) {
         Vec3::from((BoardPosition { x: 4, y: 1 }.to_world_space(), 1.)) + Vec3::new(0.5, -0.5, 0.0);
     let title_pos_3 =
         Vec3::from((BoardPosition { x: 1, y: 1 }.to_world_space(), 1.)) + Vec3::new(0.5, -0.5, 0.0);
-    let text_pos = title_pos - 1.0 * Vec3::Y;
     commands
         .spawn((
             Text2d::new("\u{1D4AB}(\u{1D437}) \u{2248} "),
             Transform::from_scale(Vec3::new(0.005, 0.005, 0.005)).with_translation(title_pos),
             medium_font.clone(),
             TextLayout::new_with_justify(Justify::Left),
             Anchor::TOP_LEFT,
-            OverallSuccessRatio,
+            OverallSuccessRatioText,
         ))
-        .with_child((TextSpan(" ... ?".into()), medium_font.clone()));
-    commands.spawn((
-        Text2d::new("“chance of winning by chosing moves at random”"),
-        Transform::from_scale(Vec3::new(0.004, 0.004, 0.004)).with_translation(text_pos),
-        small_font.clone(),
-        TextLayout::new(Justify::Center, LineBreak::WordBoundary),
-        TextBounds::from(Vec2::new(600.0, 300.0)),
-        Anchor::TOP_LEFT,
-    ));
+        .with_child((TextSpan(" ... ?".into()), medium_font.clone()))
+        .with_child((
+            TextSpan("\n“chance of winning by\nchosing moves at random”".into()),
+            small_font.clone(),
+        ));
     commands
         .spawn((
             Text2d::new(""),
@@ -137,7 +182,7 @@ fn add_text(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 fn update_overall_success(
     _trigger: On<UpdateStats>,
-    overall_success_text: Query<Entity, With<OverallSuccessRatio>>,
+    overall_success_text: Query<Entity, With<OverallSuccessRatioText>>,
     board: Res<CurrentBoard>,
     p_success: Option<Res<RandomMoveChances>>,
     mut writer: TextUiWriter,

solitaire-game/src/total_progress.rs

@@ -22,6 +22,8 @@ pub struct TotalProgressPlugin;
 pub struct TotalProgress {
     /// all states that have ever been seen
     pub explored_states: HashSet<Board>,
+    /// explored states by number of pegs
+    pub explored_states_by_pegs: [HashSet<Board>; Board::SLOTS - 1],
     /// all unique solutions that have been explored
     pub unique_solutions: HashSet<Solution>,
     /// number of times the boared has been solved
@@ -41,7 +43,9 @@ fn update_total_progress(
     mut total_progress: ResMut<TotalProgress>,
     board: Res<CurrentBoard>,
 ) {
-    total_progress.explored_states.insert(board.0);
+    let board = board.0;
+    total_progress.explored_states.insert(board);
+    total_progress.explored_states_by_pegs[board.count_balls() as usize - 1].insert(board);
 }
 
 fn update_solutions(solution: On<SolutionEvent>, mut total_progress: ResMut<TotalProgress>) {