Jengamon/acerola_jam0_gam - Change MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC

fix: more modular

Created by Jengamon on March 3, 2024

MKB2A5XCWBZO2E6QFE6PD36LF3IGMJCGJB5TGMRAPSKCKHS75ISAC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 5 [7.49]
[5.9693]
[6.0]
```
mod debug;
```
Deletion in src/main.rs at line 9 [7.49]
B:BD[5.9712] → [8.0:33]
```
use std::collections::VecDeque;
```
Replacement in src/main.rs at line 14 [7.49]
∅:D[9.22] → [10.22:71]
∅:D[11.85] → [10.22:71]
∅:D[12.150] → [10.22:71]
B:BD[10.22] → [10.22:71]
```
use bevy_egui::{egui, EguiContexts, EguiPlugin};
```
[11.85]
[2.0]
```
use bevy_egui::EguiPlugin;
```

Replacement in src/main.rs at line 112 [7.49]

∅:D[4.3642] → [13.81:120]

B:BD[13.81] → [13.81:120]

                    debug_view_window,

[4.3642]

[14.0]

                    debug::debug_view_window,

Deletion in src/main.rs at line 513 [7.49]

∅:D[10.2005] → [7.93:95]

∅:D[11.6873] → [7.93:95]

B:BD[7.93] → [7.93:95]

B:BD[7.95] → [10.2006:2007]

B:BD[10.2007] → [15.475:512]

∅:D[15.512] → [13.1695:1791]

B:BD[10.2007] → [13.1695:1791]

∅:D[13.1791] → [10.2085:2117]

B:BD[10.2085] → [10.2085:2117]

B:BD[10.2117] → [16.901:928]

B:BD[16.928] → [8.358:524]

∅:D[8.524] → [10.2117:2121]

∅:D[16.928] → [10.2117:2121]

B:BD[10.2117] → [10.2117:2121]

B:BD[8.589] → [8.589:704]

B:BD[8.704] → [15.513:652]

∅:D[15.652] → [8.781:825]

B:BD[8.781] → [8.781:825]

∅:D[8.825] → [10.2121:2191]

B:BD[10.2121] → [10.2121:2191]

B:BD[8.827] → [8.827:982]

B:BD[8.982] → [15.653:711]

∅:D[15.711] → [8.1047:1156]

B:BD[8.1047] → [8.1047:1156]

∅:D[8.1156] → [16.929:930]

B:BD[11.6962] → [16.929:930]

B:BD[16.930] → [8.1157:1337]

B:BD[8.1563] → [8.1563:1915]

B:BD[8.2142] → [8.2142:2732]

B:BD[8.2732] → [15.712:777]

∅:D[15.777] → [8.2837:3183]

B:BD[8.2837] → [8.2837:3183]

∅:D[8.3183] → [16.930:1105]

B:BD[16.930] → [16.930:1105]

B:BD[16.1105] → [3.6:109]

∅:D[3.109] → [11.6962:6963]

∅:D[16.1105] → [11.6962:6963]

B:BD[11.6962] → [11.6962:6963]

B:BD[11.6963] → [13.1864:1977]

∅:D[13.1977] → [10.2234:2683]

∅:D[11.6963] → [10.2234:2683]

B:BD[10.2234] → [10.2234:2683]

B:BD[10.2683] → [9.23:465]

∅:D[9.465] → [10.2683:2782]

B:BD[10.2683] → [10.2683:2782]

}
#[allow(clippy::too_many_arguments)]
fn debug_view_window(
    query: Query<(&ActionState<PlayerAction>, &DashState), With<Player>>,
    mut contexts: EguiContexts,
    you: Option<Res<You>>,
    mut fundsp_output: NonSendMut<fundsp_kira::FundspAudioOutput>,
    mut track: ResMut<fundsp_kira::MainTrack>,
    mut sample_pairs: Local<VecDeque<(f32, f32)>>,
) {
    const SAMPLES_TO_KEEP: usize = 512;
    // Update main track data
    let samples_stored = sample_pairs.len();
    // Remove old samples
    if samples_stored >= SAMPLES_TO_KEEP {
        // Remove old sampels
        sample_pairs.pop_front();
    }
    sample_pairs.push_back(track.sample());
    egui::Window::new("Action State").show(contexts.ctx_mut(), |ui| {
        if ui.button("Noisy").clicked() {
            use fundsp::hacker32::*;
            fundsp_output.play(
                &fundsp_kira::Machine::new(
                    pink() * envelope(|t| exp(-5.0 * t)),
                    // pink() * 0.2,
                ),
                &mut track,
            );
        }
        ui.collapsing("Audio Details", |ui| {
            // TODO Abstract this away into an egui widget for an *oscilloscope*
            use egui_plot::{Line, Plot, PlotPoints};
            let left_wave: PlotPoints = sample_pairs
                .iter()
                .enumerate()
                .map(|(t, (s, _))| [t as f64, *s as f64])
                .chain((samples_stored..SAMPLES_TO_KEEP).map(|i| [i as f64, 0.0]))
                .collect();
            let left_line = Line::new(left_wave).color(egui::Color32::BLUE);
            let right_wave: PlotPoints = sample_pairs
                .iter()
                .enumerate()
                .map(|(t, (_, s))| [t as f64, *s as f64])
                .chain((samples_stored..SAMPLES_TO_KEEP).map(|i| [i as f64, 0.0]))
                .collect();
            let right_line = Line::new(right_wave).color(egui::Color32::RED);
            ui.label("Main Track Oscilloscope");
            Plot::new("waveform")
                .view_aspect(4.0)
                .auto_bounds(egui::Vec2b::new(false, false))
                .show_grid(egui::Vec2b::new(false, true))
                .include_y(-1.0)
                .include_y(1.0)
                .include_x(0.0)
                .include_x(SAMPLES_TO_KEEP as f64)
                .show_axes(false)
                .show(ui, |plot_ui| {
                    plot_ui.line(left_line);
                    plot_ui.line(right_line);
                });
            ui.label(format!("MainTrack RMS: {:?}", track.rms()));
        });
        if let Some(you) = you.and_then(|you| you.0) {
            ui.label(format!("You are {}.", you));
        } else {
            ui.label("There is no You.");
        }
        let Ok((action_state, dash_state)) = query.get_single() else {
            return;
        };
        ui.label(if dash_state.0 {
            "Dashing"
        } else {
            "Not Dashing"
        });
        if let Some(dad) = action_state.clamped_axis_pair(&PlayerAction::Move) {
            ui.label(format!("X movement: {}", dad.x()));
            ui.label(format!("Y movement: {}", dad.y()));
        } else {
            ui.label("!! Move action not (properly) bound !!");
        }
        if let Some(hand_dad) = action_state.clamped_axis_pair(&PlayerAction::Hand) {
            _ = hand_dad;
            ui.label("Hand action connected!");
            ui.label(format!(
                "Hand actions: [{}]",
                [
                    (hand_dad.x() > 0.5).then_some("HandMoveRight"),
                    (hand_dad.x() < -0.5).then_some("HandMoveLeft"),
                    (hand_dad.y() > 0.5).then_some("HandUse"),
                ]
                .into_iter()
                .flatten()
                .collect::<Vec<_>>()
                .join(", ")
            ));
        } else {
            ui.label("!! Hand action not (properly) bound !!");
        }
    });

File addition: debug.rs (----------)

[7.15]

use std::collections::VecDeque;
use crate::{fundsp_kira, PlayerAction, You};
use crate::{DashState, Player};
use bevy::prelude::*;
use bevy_egui::{egui, EguiContexts};
use leafwing_input_manager::prelude::*;
#[allow(clippy::too_many_arguments)]
pub fn debug_view_window(
    query: Query<(&ActionState<PlayerAction>, &DashState), With<Player>>,
    mut contexts: EguiContexts,
    you: Option<Res<You>>,
    mut fundsp_output: NonSendMut<fundsp_kira::FundspAudioOutput>,
    mut track: ResMut<fundsp_kira::MainTrack>,
    mut sample_pairs: Local<VecDeque<(f32, f32)>>,
) {
    const SAMPLES_TO_KEEP: usize = 512;
    // Update main track data
    let samples_stored = sample_pairs.len();
    // Remove old samples
    if samples_stored >= SAMPLES_TO_KEEP {
        // Remove old sampels
        sample_pairs.pop_front();
    }
    sample_pairs.push_back(track.sample());
    egui::Window::new("Action State").show(contexts.ctx_mut(), |ui| {
        if ui.button("Noisy").clicked() {
            use fundsp::hacker32::*;
            fundsp_output.play(
                &fundsp_kira::Machine::new(
                    pink() * envelope(|t| exp(-5.0 * t)),
                    // pink() * 0.2,
                ),
                &mut track,
            );
        }
        ui.collapsing("Audio Details", |ui| {
            // TODO Abstract this away into an egui widget for an *oscilloscope*
            use egui_plot::{Line, Plot, PlotPoints};
            let left_wave: PlotPoints = sample_pairs
                .iter()
                .enumerate()
                .map(|(t, (s, _))| [t as f64, *s as f64])
                .chain((samples_stored..SAMPLES_TO_KEEP).map(|i| [i as f64, 0.0]))
                .collect();
            let left_line = Line::new(left_wave).color(egui::Color32::BLUE);
            let right_wave: PlotPoints = sample_pairs
                .iter()
                .enumerate()
                .map(|(t, (_, s))| [t as f64, *s as f64])
                .chain((samples_stored..SAMPLES_TO_KEEP).map(|i| [i as f64, 0.0]))
                .collect();
            let right_line = Line::new(right_wave).color(egui::Color32::RED);
            ui.label("Main Track Oscilloscope");
            Plot::new("waveform")
                .view_aspect(4.0)
                .auto_bounds(egui::Vec2b::new(false, false))
                .show_grid(egui::Vec2b::new(false, true))
                .include_y(-1.0)
                .include_y(1.0)
                .include_x(0.0)
                .include_x(SAMPLES_TO_KEEP as f64)
                .show_axes(false)
                .show(ui, |plot_ui| {
                    plot_ui.line(left_line);
                    plot_ui.line(right_line);
                });
            ui.label(format!("MainTrack RMS: {:?}", track.rms()));
        });
        if let Some(you) = you.and_then(|you| you.0) {
            ui.label(format!("You are {}.", you));
        } else {
            ui.label("There is no You.");
        }
        let Ok((action_state, dash_state)) = query.get_single() else {
            return;
        };
        ui.label(if dash_state.0 {
            "Dashing"
        } else {
            "Not Dashing"
        });
        if let Some(dad) = action_state.clamped_axis_pair(&PlayerAction::Move) {
            ui.label(format!("X movement: {}", dad.x()));
            ui.label(format!("Y movement: {}", dad.y()));
        } else {
            ui.label("!! Move action not (properly) bound !!");
        }
        if let Some(hand_dad) = action_state.clamped_axis_pair(&PlayerAction::Hand) {
            _ = hand_dad;
            ui.label("Hand action connected!");
            ui.label(format!(
                "Hand actions: [{}]",
                [
                    (hand_dad.x() > 0.5).then_some("HandMoveRight"),
                    (hand_dad.x() < -0.5).then_some("HandMoveLeft"),
                    (hand_dad.y() > 0.5).then_some("HandUse"),
                ]
                .into_iter()
                .flatten()
                .collect::<Vec<_>>()
                .join(", ")
            ));
        } else {
            ui.label("!! Hand action not (properly) bound !!");
        }
    });
}