a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-25 23:43:25 +03:00
Code Issues Projects Releases Wiki Activity

one key to toggle through priorities

Browse Source
This commit is contained in:
Dustin Carlino 2018-12-04 13:51:19 -08:00
parent 843281ee62
commit 11f89c0ee5
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
editor/src/plugins/traffic_signal_editor.rs
View File

@ -110,18 +110,32 @@ impl Plugin for TrafficSignalEditor {
let mut signal = ctx.primary.map.get_traffic_signal(*i).clone();
{
let cycle = &mut signal.cycles[*current_cycle];
if cycle.get_priority(id) != TurnPriority::Stop
&& input.key_pressed(Key::Backspace, "remove this turn from this cycle")
{
cycle.edit_turn(id, TurnPriority::Stop, &ctx.primary.map);
} else if cycle.could_be_priority_turn(id, &ctx.primary.map) && input
.key_pressed(Key::Space, "add this turn to this cycle as priority")
{
cycle.edit_turn(id, TurnPriority::Priority, &ctx.primary.map);
} else if cycle.could_be_yield_turn(id, &ctx.primary.map) && input
.key_pressed(Key::Y, "add this turn to this cycle as yield")
{
cycle.edit_turn(id, TurnPriority::Yield, &ctx.primary.map);
// Just one key to toggle between the 3 states
let next_priority = match cycle.get_priority(id) {
TurnPriority::Stop => {
if ctx.primary.map.get_t(id).turn_type == TurnType::Crosswalk {
if cycle.could_be_priority_turn(id, &ctx.primary.map) {
Some(TurnPriority::Priority)
} else {
None
}
} else {
Some(TurnPriority::Yield)
}
}
TurnPriority::Yield => {
if cycle.could_be_priority_turn(id, &ctx.primary.map) {
Some(TurnPriority::Priority)
} else {
Some(TurnPriority::Stop)
}
}
TurnPriority::Priority => Some(TurnPriority::Stop),
};
if let Some(pri) = next_priority {
if input.key_pressed(Key::Space, &format!("make {:?} {:?}", id, pri)) {
cycle.edit_turn(id, pri, &ctx.primary.map);
}
}
}

4
map_model/src/traffic_signals.rs
View File

@ -87,10 +87,6 @@ impl Cycle {
true
}
pub fn could_be_yield_turn(&self, t: TurnID, map: &Map) -> bool {
!self.yield_turns.contains(&t) && map.get_t(t).turn_type != TurnType::Crosswalk
}
pub fn get_priority(&self, t: TurnID) -> TurnPriority {
if self.priority_turns.contains(&t) {
TurnPriority::Priority