Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delay highlighting #363

Merged
merged 19 commits into from
Oct 10, 2020
Merged

Delay highlighting #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
81bd040
Initial storing of intersection delays
Sep 27, 2020
ed367d4
Initial highlighting of delays on route
Sep 28, 2020
25c098b
Added label of delay
Sep 30, 2020
b17dac2
Merge remote-tracking branch 'upstream/master' into delay_along_route
Sep 30, 2020
3717e5e
Info overlay works
Oct 1, 2020
fc0df6e
Added supoprt for pedestrian delays (only intersection delay currently)
Oct 1, 2020
a6f6ceb
Merge branch 'master' into delay_highlighting
Oct 2, 2020
16bc362
Capitalised describe trip phase
Oct 2, 2020
df85964
Nearly complete, just fmting and a crash to fix
Oct 5, 2020
a84be68
Fixed text font colour crash
Oct 7, 2020
e7be3ba
Cargo +nightly fmt
Oct 7, 2020
6a078bd
Merge branch 'master' into delay_highlighting
Oct 7, 2020
75f37cd
Cargo +nightly fmt
Oct 7, 2020
f804d9b
Clion auto import formatting
Oct 7, 2020
556f6d6
Fixing merge issues
Oct 7, 2020
14bb85e
Fixing icon placement issues
Oct 7, 2020
6c54cad
Requested changes (Part 1)
Oct 8, 2020
b4ad546
Requested changes (Part 2)
Oct 8, 2020
3cff938
Merge branch 'master' into delay_highlighting
dabreegster Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ data/system/prebaked_results
data/system/scenarios

importer.json

.idea/
10 changes: 10 additions & 0 deletions game/src/colors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ pub struct ColorScheme {
pub signal_spinner: Color,
pub signal_turn_block_bg: Color,

// Timeline delay highlighting
pub very_slow_intersection: Color,
pub slow_intersection: Color,
pub normal_slow_intersection: Color,

// Other static elements
pub void_background: Color,
pub map_background: Fill,
Expand Down Expand Up @@ -210,6 +215,11 @@ impl ColorScheme {
signal_spinner: hex("#F2994A"),
signal_turn_block_bg: Color::grey(0.6),

// Timeline delay highlighting
very_slow_intersection: Color::RED,
slow_intersection: Color::YELLOW,
normal_slow_intersection: Color::GREEN,

// Other static elements
void_background: Color::BLACK,
map_background: Color::grey(0.87).into(),
Expand Down
Loading