|
|
|
|
@ -1,15 +1,17 @@
|
|
|
|
|
// TODO:
|
|
|
|
|
// * Fix randomly audio not working
|
|
|
|
|
// * Lock down system scheduling/run_if conditions
|
|
|
|
|
// * UI widget explaining rules/hotkeys
|
|
|
|
|
// * Lock down system scheduling/run_if conditions
|
|
|
|
|
// * Performance: have a limit on per-note+octave sounds
|
|
|
|
|
// * Use a finite set of N audio entities and scale volume instead of
|
|
|
|
|
// spawning a bunch of audio entities which is causing issues at >100
|
|
|
|
|
// cells
|
|
|
|
|
// * Stop creating cells when I didn't mean to (clicking UI, click + dragging)
|
|
|
|
|
// * Keep some controls open when main ui panel is closed
|
|
|
|
|
// * Exclude power button from web build
|
|
|
|
|
// * Show shadow of piece (same tile, just with alpha transparency)
|
|
|
|
|
// * Start with an interesting pattern
|
|
|
|
|
// * UI minimize widgets (mostly done)
|
|
|
|
|
// * Indicate to click on the UI
|
|
|
|
|
// * Add "follow action" that adjusts camera to zoom in/out/move to see everything
|
|
|
|
|
// * Dark mode
|
|
|
|
|
// * Make click and drag feel better
|
|
|
|
|
// * Add arrow keys to move around
|
|
|
|
|
// * web/wasm build
|
|
|
|
|
// * "Follow" enhancement: Zoom in/out
|
|
|
|
|
#![allow(clippy::complexity)]
|
|
|
|
|
// Only because of FromTemplat macros unfortunately...
|
|
|
|
|
#![allow(dead_code)]
|
|
|
|
|
@ -52,23 +54,52 @@ fn main() {
|
|
|
|
|
load_meshes,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
.configure_sets(
|
|
|
|
|
Update,
|
|
|
|
|
(GameSet::Plan, GameSet::Apply, GameSet::React).chain(),
|
|
|
|
|
)
|
|
|
|
|
// Cell management/Simulation
|
|
|
|
|
.add_systems(
|
|
|
|
|
Update,
|
|
|
|
|
(
|
|
|
|
|
default_board.run_if(run_once),
|
|
|
|
|
cell_lifecycle.run_if(on_message::<Lifecycle>),
|
|
|
|
|
update_grid_position.run_if(on_message::<CursorMoved>),
|
|
|
|
|
de_spawn_cells
|
|
|
|
|
.run_if(not(is_ui_hovered))
|
|
|
|
|
.run_if(not(is_panning))
|
|
|
|
|
.run_if(input_just_released(MouseButton::Left)),
|
|
|
|
|
simulation_step
|
|
|
|
|
.run_if(in_state(SimulationPlayback::Run))
|
|
|
|
|
.run_if(cooldown_secs(SIM_FRAME_DURATION)),
|
|
|
|
|
simulation_step.run_if(state_changed::<SimulationPlayback>),
|
|
|
|
|
pause_simulation.run_if(in_state(SimulationPlayback::Step)),
|
|
|
|
|
update_material,
|
|
|
|
|
// Produce lifecycle messages
|
|
|
|
|
(
|
|
|
|
|
default_board.run_if(run_once),
|
|
|
|
|
update_grid_position.run_if(on_message::<CursorMoved>),
|
|
|
|
|
de_spawn_cells
|
|
|
|
|
.run_if(not(is_ui_hovered))
|
|
|
|
|
.run_if(not(is_panning))
|
|
|
|
|
.run_if(input_just_released(MouseButton::Left)),
|
|
|
|
|
simulation_step.run_if(
|
|
|
|
|
in_state(SimulationPlayback::Run)
|
|
|
|
|
.and_then(cooldown_secs(SIM_FRAME_DURATION))
|
|
|
|
|
.or_else(state_changed::<SimulationPlayback>),
|
|
|
|
|
),
|
|
|
|
|
pause_simulation.run_if(in_state(SimulationPlayback::Step)),
|
|
|
|
|
)
|
|
|
|
|
.in_set(GameSet::Plan),
|
|
|
|
|
// Apply lifecycle message
|
|
|
|
|
cell_lifecycle
|
|
|
|
|
.run_if(on_message::<Lifecycle>)
|
|
|
|
|
.in_set(GameSet::Apply),
|
|
|
|
|
// React to board changes
|
|
|
|
|
(
|
|
|
|
|
reassign_cell_pitch.run_if(resource_changed::<PitchMap>),
|
|
|
|
|
update_material.run_if(
|
|
|
|
|
any_component_added::<CellPitch>
|
|
|
|
|
.or_else(any_component_changed::<CellPitch>),
|
|
|
|
|
),
|
|
|
|
|
camera_follow
|
|
|
|
|
.run_if(in_state(SimulationPlayback::Run))
|
|
|
|
|
.run_if(any_component_changed::<Coordinates>),
|
|
|
|
|
update_camera_position
|
|
|
|
|
.run_if(in_state(SimulationPlayback::Run))
|
|
|
|
|
.run_if(not(query_condition_empty::<(
|
|
|
|
|
With<Camera>,
|
|
|
|
|
Changed<Coordinates>,
|
|
|
|
|
)>)),
|
|
|
|
|
)
|
|
|
|
|
.in_set(GameSet::React),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
// Audio Systems
|
|
|
|
|
@ -77,19 +108,29 @@ fn main() {
|
|
|
|
|
(
|
|
|
|
|
control_volume,
|
|
|
|
|
update_pitch_map_resource_ui.run_if(resource_changed::<PitchMap>),
|
|
|
|
|
reassign_cell_pitch.run_if(resource_changed::<PitchMap>),
|
|
|
|
|
update_audio,
|
|
|
|
|
update_audio
|
|
|
|
|
.run_if(
|
|
|
|
|
any_component_added::<CellPitch>
|
|
|
|
|
.or_else(any_component_changed::<CellPitch>),
|
|
|
|
|
)
|
|
|
|
|
.in_set(GameSet::React),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
// Debugging
|
|
|
|
|
.add_systems(
|
|
|
|
|
Update,
|
|
|
|
|
(
|
|
|
|
|
assert_cell_uniqueness.run_if(any_with_component::<Cell>),
|
|
|
|
|
grid_gizmo,
|
|
|
|
|
update_debug_info_cell_count,
|
|
|
|
|
update_debug_info_coordinates,
|
|
|
|
|
update_debug_info_active,
|
|
|
|
|
(
|
|
|
|
|
assert_cell_uniqueness
|
|
|
|
|
.run_if(any_with_component::<Cell>)
|
|
|
|
|
.after(update_material)
|
|
|
|
|
.after(update_audio),
|
|
|
|
|
update_debug_info_cell_count,
|
|
|
|
|
update_debug_info_active,
|
|
|
|
|
)
|
|
|
|
|
.in_set(GameSet::React),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
// Ui Controllers
|
|
|
|
|
@ -116,6 +157,13 @@ fn main() {
|
|
|
|
|
|
|
|
|
|
const SCALE: f32 = 100.0;
|
|
|
|
|
|
|
|
|
|
#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
|
|
|
|
|
enum GameSet {
|
|
|
|
|
Plan,
|
|
|
|
|
Apply,
|
|
|
|
|
React,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Component, PartialEq, Clone, Default)]
|
|
|
|
|
enum DebugInfo {
|
|
|
|
|
CellCount,
|
|
|
|
|
@ -157,11 +205,6 @@ enum UiButton {
|
|
|
|
|
ZoomIn,
|
|
|
|
|
PlayAudio,
|
|
|
|
|
MuteAudio,
|
|
|
|
|
AddHighOctave,
|
|
|
|
|
SubHighOctave,
|
|
|
|
|
AddLowOctave,
|
|
|
|
|
SubLowOctave,
|
|
|
|
|
Note,
|
|
|
|
|
Reset,
|
|
|
|
|
Wipe,
|
|
|
|
|
#[default]
|
|
|
|
|
@ -179,11 +222,6 @@ impl UiButton {
|
|
|
|
|
Self::ZoomIn => "zoomIn.png",
|
|
|
|
|
Self::PlayAudio => "audioOn.png",
|
|
|
|
|
Self::MuteAudio => "audioOff.png",
|
|
|
|
|
Self::AddHighOctave => "todo.png",
|
|
|
|
|
Self::SubHighOctave => "todo.png",
|
|
|
|
|
Self::AddLowOctave => "todo.png",
|
|
|
|
|
Self::SubLowOctave => "todo.png",
|
|
|
|
|
Self::Note => "todo.png",
|
|
|
|
|
Self::Reset => "return.png",
|
|
|
|
|
Self::Wipe => "trashcan.png",
|
|
|
|
|
Self::None => todo!(),
|
|
|
|
|
@ -264,6 +302,7 @@ fn ui_toggle_button<A: Scene, B: Scene>(
|
|
|
|
|
fn the_camera() -> impl Scene {
|
|
|
|
|
bsn! {
|
|
|
|
|
Camera2d
|
|
|
|
|
Coordinates
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -434,6 +473,171 @@ fn primary_ui() -> impl Scene {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn description_text() -> impl Scene {
|
|
|
|
|
bsn! {
|
|
|
|
|
subpane()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Column,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
text_setup()
|
|
|
|
|
Children [
|
|
|
|
|
Text("Welcome to a little experiment I made: adding sound to Conways Game of Life") ThemedText,
|
|
|
|
|
Text("---") ThemedText,
|
|
|
|
|
Text("The buttons above control (in order)") ThemedText,
|
|
|
|
|
Text("Quit the game") ThemedText,
|
|
|
|
|
Text("Start/Pause the simulation") ThemedText,
|
|
|
|
|
Text("Step the simulation") ThemedText,
|
|
|
|
|
Text("Reset the world state") ThemedText,
|
|
|
|
|
Text("Wipe the world state") ThemedText,
|
|
|
|
|
Text("Zoom in/out") ThemedText,
|
|
|
|
|
Text("Toggle sound on/off") ThemedText,
|
|
|
|
|
Text("---") ThemedText,
|
|
|
|
|
Text("Below that are the notes you can toggle on/off") ThemedText,
|
|
|
|
|
Text("And below that are the number of octaves for each note") ThemedText,
|
|
|
|
|
Text("Notes are color coded horizontally") ThemedText,
|
|
|
|
|
Text("Octaves are color coded vertically") ThemedText,
|
|
|
|
|
Text("---") ThemedText,
|
|
|
|
|
Text("The camera automatically follows the action") ThemedText,
|
|
|
|
|
Text("---") ThemedText,
|
|
|
|
|
Text("Hotkyes") ThemedText,
|
|
|
|
|
Text("* Space: Play/Pause Simulation") ThemedText,
|
|
|
|
|
Text("* m: Mute/Play Audio") ThemedText,
|
|
|
|
|
Text("* r: Reset Simulation") ThemedText,
|
|
|
|
|
Text("* n: Next Simulation Step") ThemedText,
|
|
|
|
|
Text("* -/=: Zoom In/Out") ThemedText,
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn controls() -> impl Scene {
|
|
|
|
|
bsn! {
|
|
|
|
|
subpane()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Nav") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
ui_button(UiButton::Power)
|
|
|
|
|
ActionSource<Action>(Action::Quit),
|
|
|
|
|
ui_toggle_button((UiButton::Pause, bsn! { SimulationPlayback::Pause }), (UiButton::Play, bsn! { SimulationPlayback::Run }))
|
|
|
|
|
ActionSource<SimAction>(SimAction::Toggle),
|
|
|
|
|
ui_button(UiButton::Step)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Step),
|
|
|
|
|
ui_button(UiButton::Reset)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Reset),
|
|
|
|
|
ui_button(UiButton::Wipe)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Wipe),
|
|
|
|
|
ui_button(UiButton::ZoomOut)
|
|
|
|
|
ActionSource<ZoomAction>(ZoomAction::ZoomOut),
|
|
|
|
|
ui_button(UiButton::ZoomIn)
|
|
|
|
|
ActionSource<ZoomAction>(ZoomAction::ZoomIn),
|
|
|
|
|
ui_toggle_button((UiButton::MuteAudio, bsn! { AudioPlayback::Mute }), (UiButton::PlayAudio, bsn! { AudioPlayback::Play }))
|
|
|
|
|
ActionSource<AudioAction>(AudioAction::Toggle),
|
|
|
|
|
]
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn notes() -> impl Scene {
|
|
|
|
|
bsn! {
|
|
|
|
|
subpane()
|
|
|
|
|
Children [
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Notes") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
ui_checkbox("A")
|
|
|
|
|
template_value(Note::A)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("A#")
|
|
|
|
|
template_value(Note::ASharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("B")
|
|
|
|
|
template_value(Note::B)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("C")
|
|
|
|
|
template_value(Note::C)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("C#")
|
|
|
|
|
template_value(Note::CSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("D")
|
|
|
|
|
template_value(Note::D)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("D#")
|
|
|
|
|
template_value(Note::DSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("E")
|
|
|
|
|
template_value(Note::E)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("F")
|
|
|
|
|
template_value(Note::F)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("F#")
|
|
|
|
|
template_value(Note::FSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("G")
|
|
|
|
|
template_value(Note::G)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("G#")
|
|
|
|
|
template_value(Note::GSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
]
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn octaves() -> impl Scene {
|
|
|
|
|
bsn! {
|
|
|
|
|
subpane()
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Octaves") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
@FeathersSlider { @max: 11., @value: 5., @min: 1. }
|
|
|
|
|
SliderStep(2.)
|
|
|
|
|
SliderPrecision(0)
|
|
|
|
|
on(|value_change: On<ValueChange<f32>>, mut pitch_map: ResMut<PitchMap>| {
|
|
|
|
|
if value_change.is_final {
|
|
|
|
|
pitch_map.octaves = value_change.value as usize;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
on(slider_self_update),
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bsn! {
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
@ -447,134 +651,16 @@ fn primary_ui() -> impl Scene {
|
|
|
|
|
on(toggle_main_ui)
|
|
|
|
|
// todo: toggle main ui
|
|
|
|
|
Children [
|
|
|
|
|
Text("Conways Game of Life With Sound") ThemedText,
|
|
|
|
|
Text("Conways Game of Life With Sound (click here to open control panel)") ThemedText,
|
|
|
|
|
],
|
|
|
|
|
pane_body()
|
|
|
|
|
MainUi::Visible
|
|
|
|
|
ToggleStateVisible
|
|
|
|
|
Children [
|
|
|
|
|
subpane()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Nav") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
ui_button(UiButton::Power)
|
|
|
|
|
ActionSource<Action>(Action::Quit),
|
|
|
|
|
ui_toggle_button((UiButton::Pause, bsn! { SimulationPlayback::Pause }), (UiButton::Play, bsn! { SimulationPlayback::Run }))
|
|
|
|
|
ActionSource<SimAction>(SimAction::Toggle),
|
|
|
|
|
ui_button(UiButton::Step)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Step),
|
|
|
|
|
ui_button(UiButton::Reset)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Reset),
|
|
|
|
|
ui_button(UiButton::Wipe)
|
|
|
|
|
ActionSource<SimAction>(SimAction::Wipe),
|
|
|
|
|
ui_button(UiButton::ZoomOut)
|
|
|
|
|
ActionSource<ZoomAction>(ZoomAction::ZoomOut),
|
|
|
|
|
ui_button(UiButton::ZoomIn)
|
|
|
|
|
ActionSource<ZoomAction>(ZoomAction::ZoomIn),
|
|
|
|
|
ui_toggle_button((UiButton::MuteAudio, bsn! { AudioPlayback::Mute }), (UiButton::PlayAudio, bsn! { AudioPlayback::Play }))
|
|
|
|
|
ActionSource<AudioAction>(AudioAction::Toggle),
|
|
|
|
|
]
|
|
|
|
|
],
|
|
|
|
|
subpane()
|
|
|
|
|
Children [
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Notes") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
ui_checkbox("A")
|
|
|
|
|
template_value(Note::A)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("A#")
|
|
|
|
|
template_value(Note::ASharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("B")
|
|
|
|
|
template_value(Note::B)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("C")
|
|
|
|
|
template_value(Note::C)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("C#")
|
|
|
|
|
template_value(Note::CSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("D")
|
|
|
|
|
template_value(Note::D)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("D#")
|
|
|
|
|
template_value(Note::DSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("E")
|
|
|
|
|
template_value(Note::E)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("F")
|
|
|
|
|
template_value(Note::F)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("F#")
|
|
|
|
|
template_value(Note::FSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("G")
|
|
|
|
|
template_value(Note::G)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
ui_checkbox("G#")
|
|
|
|
|
template_value(Note::GSharp)
|
|
|
|
|
on(toggle_note),
|
|
|
|
|
]
|
|
|
|
|
],
|
|
|
|
|
subpane()
|
|
|
|
|
subpane_header() Children [
|
|
|
|
|
Text("Octaves") ThemedText
|
|
|
|
|
]
|
|
|
|
|
subpane_body()
|
|
|
|
|
Node {
|
|
|
|
|
display: Display::Flex,
|
|
|
|
|
flex_direction: FlexDirection::Row,
|
|
|
|
|
align_items: AlignItems::Stretch,
|
|
|
|
|
justify_content: JustifyContent::Start,
|
|
|
|
|
}
|
|
|
|
|
Children [
|
|
|
|
|
@FeathersSlider { @max: 5., @value: 3., @min: 1. }
|
|
|
|
|
SliderStep(1.)
|
|
|
|
|
SliderPrecision(0)
|
|
|
|
|
on(|value_change: On<ValueChange<f32>>, mut pitch_map: ResMut<PitchMap>| {
|
|
|
|
|
if value_change.is_final {
|
|
|
|
|
pitch_map.octaves_up = value_change.value as usize;
|
|
|
|
|
debug!("(octave up) Updated pitch map: {:#?}", pitch_map);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
on(slider_self_update),
|
|
|
|
|
@FeathersSlider { @max: 5., @value: 3., @min: 1. }
|
|
|
|
|
SliderStep(1.)
|
|
|
|
|
SliderPrecision(0)
|
|
|
|
|
on(|value_change: On<ValueChange<f32>>, mut pitch_map: ResMut<PitchMap>| {
|
|
|
|
|
if value_change.is_final {
|
|
|
|
|
pitch_map.octaves_down = value_change.value as usize;
|
|
|
|
|
debug!("(octave down) Updated pitch map: {:#?}", pitch_map);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
on(slider_self_update),
|
|
|
|
|
],
|
|
|
|
|
controls(),
|
|
|
|
|
notes(),
|
|
|
|
|
octaves(),
|
|
|
|
|
description_text(),
|
|
|
|
|
]
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
@ -641,10 +727,10 @@ impl Coordinates {
|
|
|
|
|
/// For the purposes of creating assests, what does the given coordinate translate to CellPitch wise
|
|
|
|
|
fn to_cell_pitch(&self, pm: &PitchMap) -> CellPitch {
|
|
|
|
|
let rows = pm.notes.len();
|
|
|
|
|
let cols = pm.octaves_up + pm.octaves_down + 1;
|
|
|
|
|
let cols = pm.octaves;
|
|
|
|
|
|
|
|
|
|
let this_x = self.x.rem_euclid(rows as isize);
|
|
|
|
|
let this_y = self.y.rem_euclid(cols as isize) - (pm.octaves_down as isize);
|
|
|
|
|
let this_y = self.y.rem_euclid(cols as isize) - (pm.octaves as isize / 2);
|
|
|
|
|
|
|
|
|
|
debug_assert!(this_x >= 0);
|
|
|
|
|
|
|
|
|
|
@ -1091,15 +1177,11 @@ fn load_meshes(mut cell_assets: ResMut<CellAssets>, mut meshes: ResMut<Assets<Me
|
|
|
|
|
|
|
|
|
|
fn default_board(mut writer: MessageWriter<Lifecycle>) {
|
|
|
|
|
// https://playgameoflife.com/lexicon/R-pentomino
|
|
|
|
|
[
|
|
|
|
|
(0,0),
|
|
|
|
|
(0,-1),
|
|
|
|
|
(-1,0),
|
|
|
|
|
(0,1),
|
|
|
|
|
(1,1),
|
|
|
|
|
].into_iter().for_each(|(x, y)| {
|
|
|
|
|
writer.write(Lifecycle::Alive(Coordinates { x, y }));
|
|
|
|
|
});
|
|
|
|
|
[(0, 0), (0, -1), (-1, 0), (0, 1), (1, 1)]
|
|
|
|
|
.into_iter()
|
|
|
|
|
.for_each(|(x, y)| {
|
|
|
|
|
writer.write(Lifecycle::Alive(Coordinates { x, y }));
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: Do not place piece if panning
|
|
|
|
|
@ -1185,16 +1267,14 @@ fn manage_interactive<T: Component + States + PartialEq>(
|
|
|
|
|
#[derive(Resource, Debug)]
|
|
|
|
|
struct PitchMap {
|
|
|
|
|
notes: Vec<Note>,
|
|
|
|
|
octaves_up: usize,
|
|
|
|
|
octaves_down: usize,
|
|
|
|
|
octaves: usize,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Default for PitchMap {
|
|
|
|
|
fn default() -> Self {
|
|
|
|
|
Self {
|
|
|
|
|
notes: vec![Note::A, Note::B, Note::CSharp, Note::E, Note::FSharp],
|
|
|
|
|
octaves_up: 3,
|
|
|
|
|
octaves_down: 3,
|
|
|
|
|
octaves: 5,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -1215,8 +1295,7 @@ impl PitchMap {
|
|
|
|
|
fn test_cell_pitch() {
|
|
|
|
|
let pm = PitchMap {
|
|
|
|
|
notes: vec![Note::A, Note::B, Note::C],
|
|
|
|
|
octaves_up: 1,
|
|
|
|
|
octaves_down: 1,
|
|
|
|
|
octaves: 3,
|
|
|
|
|
};
|
|
|
|
|
let xs = -6..=5;
|
|
|
|
|
let ys = -6..=4;
|
|
|
|
|
@ -1335,3 +1414,41 @@ fn toggle_state_visible<S: States + Component>(
|
|
|
|
|
};
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn camera_follow(
|
|
|
|
|
mut camera: Query<&mut Coordinates, With<Camera>>,
|
|
|
|
|
cells: Query<&Coordinates, (With<Cell>, Without<Camera>)>,
|
|
|
|
|
) {
|
|
|
|
|
camera.iter_mut().for_each(|mut c| {
|
|
|
|
|
let left = cells
|
|
|
|
|
.iter()
|
|
|
|
|
.map(|Coordinates { x, .. }| *x)
|
|
|
|
|
.min()
|
|
|
|
|
.unwrap_or(0);
|
|
|
|
|
let right = cells
|
|
|
|
|
.iter()
|
|
|
|
|
.map(|Coordinates { x, .. }| *x)
|
|
|
|
|
.max()
|
|
|
|
|
.unwrap_or(0);
|
|
|
|
|
|
|
|
|
|
let top = cells
|
|
|
|
|
.iter()
|
|
|
|
|
.map(|Coordinates { y, .. }| *y)
|
|
|
|
|
.max()
|
|
|
|
|
.unwrap_or(0);
|
|
|
|
|
let bottom = cells
|
|
|
|
|
.iter()
|
|
|
|
|
.map(|Coordinates { y, .. }| *y)
|
|
|
|
|
.min()
|
|
|
|
|
.unwrap_or(0);
|
|
|
|
|
|
|
|
|
|
c.x = (right + left) / 2;
|
|
|
|
|
c.y = (top + bottom) / 2;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn update_camera_position(mut query: Query<(&Coordinates, &mut Transform), With<Camera>>) {
|
|
|
|
|
query.iter_mut().for_each(|(c, mut t)| {
|
|
|
|
|
t.translation = c.as_translation();
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
Elijah Voigt
23 hours ago