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

only 3 colors for turn icons... match current state, not possible changes

Browse Source
This commit is contained in:
Dustin Carlino 2018-12-04 13:37:52 -08:00
parent 33f36954c8
commit accfeaf457
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,31 +285,17 @@ impl Plugin for TrafficSignalEditor {
}
let cycle = &ctx.map.get_traffic_signal(*i).cycles[*current_cycle];
let could_be_priority = cycle.could_be_priority_turn(t, ctx.map);
match cycle.get_priority(t) {
Some(match cycle.get_priority(t) {
TurnPriority::Priority => {
Some(ctx.cs.get("priority turn in current cycle", Color::GREEN))
ctx.cs.get("priority turn in current cycle", Color::GREEN)
}
TurnPriority::Yield => if could_be_priority {
Some(
ctx.cs
.get("yield turn that could be priority turn", Color::YELLOW),
)
} else {
Some(
ctx.cs
.get("yield turn in current cycle", Color::rgb(255, 105, 180)),
)
},
TurnPriority::Stop => if could_be_priority {
Some(ctx.cs.get("stop turn that could be priority", Color::RED))
} else {
Some(
ctx.cs
.get("turn conflicts with current cycle", Color::BLACK),
)
},
}
TurnPriority::Yield => ctx
.cs
.get("yield turn in current cycle", Color::rgb(255, 105, 180)),
TurnPriority::Stop => ctx
.cs
.get("turn conflicts with current cycle", Color::BLACK),
})
}
_ => None,
}