a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-29 04:35:51 +03:00
Code Issues Projects Releases Wiki Activity

try to wrangle the complexities of synchronizing menus with analytics and colorschemes, which can be separately modified. added something for gridlock mode too.

Browse Source
This commit is contained in:
Dustin Carlino 2019-11-01 10:30:36 -07:00
parent d187332734
commit e564a67ad4
2 changed files with 101 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ezgui/src/widgets/modal_menu.rs
View File

@ -205,6 +205,17 @@ impl ModalMenu {
panic!("Menu doesn't have {}", old_label);
}
pub fn maybe_change_action(&mut self, old_label: &str, new_label: &str, ctx: &EventCtx) {
for c in self.choices.iter_mut() {
if c.label == old_label {
c.label = new_label.to_string();
self.recalculate_dims(ctx);
return;
}
}
// Don't panic
}
pub fn swap_action(&mut self, old_label: &str, new_label: &str, ctx: &EventCtx) -> bool {
if self.action(old_label) {
self.change_action(old_label, new_label, ctx);

130
game/src/sandbox/gameplay.rs
View File

@ -1,4 +1,5 @@
use crate::game::{Transition, WizardState};
use crate::render::AgentColorScheme;
use crate::sandbox::{analytics, bus_explorer, spawner, SandboxMode};
use crate::ui::UI;
use abstutil::prettyprint_usize;
@ -30,7 +31,6 @@ enum State {
OptimizeBus {
route: BusRouteID,
time: Duration,
show_analytics: bool,
stat: Statistic,
},
CreateGridlock {
@ -91,7 +91,6 @@ impl GameplayState {
state: State::OptimizeBus {
route: route.id,
time: Duration::ZERO,
show_analytics: false,
stat: Statistic::Max,
},
},
@ -101,7 +100,14 @@ impl GameplayState {
GameplayMode::CreateGridlock => (
GameplayState {
mode,
menu: ModalMenu::new("Cause gridlock", vec![(hotkey(Key::H), "help")], ctx)
menu: ModalMenu::new(
"Cause gridlock",
vec![
(hotkey(Key::E), "show agent delay"),
(hotkey(Key::H), "help"),
],
ctx,
)
.disable_standalone_layout(),
state: State::CreateGridlock {
time: Duration::ZERO,
@ -188,52 +194,32 @@ impl GameplayState {
State::OptimizeBus {
route,
ref mut time,
ref mut show_analytics,
ref mut stat,
} => {
// Something else might've changed analytics.
if *show_analytics {
self.menu.event(ctx);
if manage_analytics(
&mut self.menu,
ctx,
"show bus route",
"hide bus route",
analytics,
match analytics {
analytics::Analytics::BusRoute(_) => {}
_ => {
*show_analytics = false;
self.menu
.change_action("hide bus route", "show bus route", ctx);
}
}
analytics::Analytics::BusRoute(_) => true,
_ => false,
},
*time != ui.primary.sim.time(),
) {
*analytics = analytics::Analytics::BusRoute(bus_explorer::ShowBusRoute::new(
ui.primary.map.get_br(route),
ui,
ctx,
));
}
// TODO Expensive
if *time != ui.primary.sim.time() {
*time = ui.primary.sim.time();
self.menu.set_info(ctx, bus_route_panel(route, ui, *stat));
if *show_analytics {
*analytics = analytics::Analytics::BusRoute(
bus_explorer::ShowBusRoute::new(ui.primary.map.get_br(route), ui, ctx),
);
}
}
self.menu.event(ctx);
if !*show_analytics
&& self
.menu
.swap_action("show bus route", "hide bus route", ctx)
{
*analytics = analytics::Analytics::BusRoute(bus_explorer::ShowBusRoute::new(
ui.primary.map.get_br(route),
ui,
ctx,
));
*show_analytics = true;
} else if *show_analytics
&& self
.menu
.swap_action("hide bus route", "show bus route", ctx)
{
*analytics = analytics::Analytics::Inactive;
*show_analytics = false;
}
if self.menu.action("change statistic") {
@ -277,12 +263,21 @@ impl GameplayState {
}
}
State::CreateGridlock { ref mut time } => {
self.menu.event(ctx);
manage_acs(
&mut self.menu,
ctx,
ui,
"show agent delay",
"hide agent delay",
AgentColorScheme::Delay,
);
if *time != ui.primary.sim.time() {
*time = ui.primary.sim.time();
self.menu.set_info(ctx, gridlock_panel(ui));
}
self.menu.event(ctx);
if self.menu.action("help") {
return Some(help(vec![
"You might notice a few places in the map where gridlock forms already.",
@ -392,3 +387,56 @@ fn help(lines: Vec<&'static str>) -> Transition {
}
})))
}
// Must call menu.event first. Returns true if the caller should set the analytics to the custom
// thing.
fn manage_analytics(
menu: &mut ModalMenu,
ctx: &mut EventCtx,
show: &str,
hide: &str,
analytics: &mut analytics::Analytics,
active_originally: bool,
time_changed: bool,
) -> bool {
// Synchronize menus if needed. Player can change these separately.
if active_originally {
menu.maybe_change_action(show, hide, ctx);
} else {
menu.maybe_change_action(hide, show, ctx);
}
if !active_originally && menu.swap_action(show, hide, ctx) {
true
} else if active_originally && menu.swap_action(hide, show, ctx) {
*analytics = analytics::Analytics::Inactive;
false
} else {
active_originally && time_changed
}
}
// Must call menu.event first.
fn manage_acs(
menu: &mut ModalMenu,
ctx: &mut EventCtx,
ui: &mut UI,
show: &str,
hide: &str,
acs: AgentColorScheme,
) {
let active_originally = ui.agent_cs == acs;
// Synchronize menus if needed. Player can change these separately.
if active_originally {
menu.maybe_change_action(show, hide, ctx);
} else {
menu.maybe_change_action(hide, show, ctx);
}
if !active_originally && menu.swap_action(show, hide, ctx) {
ui.agent_cs = acs;
} else if active_originally && menu.swap_action(hide, show, ctx) {
ui.agent_cs = AgentColorScheme::VehicleTypes;
}
}