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

better faces. go back to hiding a few things in debug mode [rebuild]

Browse Source
This commit is contained in:
Dustin Carlino 2020-05-29 13:09:46 -07:00
parent 2bb36124bd
commit 27179ee87d
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1061,7 +1061,7 @@ dependencies = [
"reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"sim 0.1.0", "sim 0.1.0",
"svg_face 0.1.0 (git+https://github.com/dabreegster/svg_face)", "svg_face 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webbrowser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "webbrowser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"xmltree 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xmltree 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3283,8 +3283,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "svg_face" name = "svg_face"
version = "0.1.0" version = "0.1.2"
source = "git+https://github.com/dabreegster/svg_face#61b3c9f099b36d12935048233072e7058a0e7f2d" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -4527,7 +4527,7 @@ dependencies = [
"checksum strsim 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" "checksum strsim 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" "checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
"checksum svg_face 0.1.0 (git+https://github.com/dabreegster/svg_face)" = "<none>" "checksum svg_face 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24250a6facea1335447ffe5db20842749c5c231e259548e14f7e4fda26132b8f"
"checksum svgtypes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff" "checksum svgtypes 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff"
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"

2
game/Cargo.toml
View File

@ -30,7 +30,7 @@ rand = "0.7.0"
rand_xorshift = "0.2.0" rand_xorshift = "0.2.0"
reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] } reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] }
serde = "1.0.110" serde = "1.0.110"
svg_face = { git = "https://github.com/dabreegster/svg_face" } svg_face = "0.1.2"
sim = { path = "../sim" } sim = { path = "../sim" }
webbrowser = "0.5.2" webbrowser = "0.5.2"
xmltree = "0.10.0" xmltree = "0.10.0"

13
game/src/info/person.rs
View File

@ -234,14 +234,11 @@ pub fn bio(
let nickname = petname::Petnames::default().generate(&mut rng, 2, " "); let nickname = petname::Petnames::default().generate(&mut rng, 2, " ");
let age = rng.gen_range(5, 100); let age = rng.gen_range(5, 100);
rows.extend(make_table( let mut table = vec![("Nickname", nickname), ("Age", age.to_string())];
ctx, if app.opts.dev {
vec![ table.push(("Debug ID", format!("{:?}", person.orig_id)));
("Nickname", nickname), }
("Age", age.to_string()), rows.extend(make_table(ctx, table));
("Debug ID", format!("{:?}", person.orig_id)),
],
));
// TODO Mad libs! // TODO Mad libs!
// - Keeps a collection of ___ at all times // - Keeps a collection of ___ at all times
// - Origin story: accidentally fell into a vat of cheese curds // - Origin story: accidentally fell into a vat of cheese curds

7
game/src/layer/mod.rs
View File

@ -70,16 +70,19 @@ impl PickLayer {
hotkey_btn(ctx, app, "None", Key::N), hotkey_btn(ctx, app, "None", Key::N),
hotkey_btn(ctx, app, "map edits", Key::E), hotkey_btn(ctx, app, "map edits", Key::E),
hotkey_btn(ctx, app, "worst traffic jams", Key::J), hotkey_btn(ctx, app, "worst traffic jams", Key::J),
hotkey_btn(ctx, app, "elevation", Key::S),
hotkey_btn(ctx, app, "parking occupancy", Key::P), hotkey_btn(ctx, app, "parking occupancy", Key::P),
hotkey_btn(ctx, app, "delay", Key::D), hotkey_btn(ctx, app, "delay", Key::D),
hotkey_btn(ctx, app, "throughput", Key::T), hotkey_btn(ctx, app, "throughput", Key::T),
hotkey_btn(ctx, app, "backpressure", Key::Z),
hotkey_btn(ctx, app, "bike network", Key::B), hotkey_btn(ctx, app, "bike network", Key::B),
hotkey_btn(ctx, app, "bus network", Key::U), hotkey_btn(ctx, app, "bus network", Key::U),
hotkey_btn(ctx, app, "population map", Key::X), hotkey_btn(ctx, app, "population map", Key::X),
hotkey_btn(ctx, app, "amenities", Key::A), hotkey_btn(ctx, app, "amenities", Key::A),
]); ]);
if app.opts.dev {
// These need some work.
col.push(hotkey_btn(ctx, app, "backpressure", Key::Z));
col.push(hotkey_btn(ctx, app, "elevation", Key::S));
}
if app.primary.sim.get_pandemic_model().is_some() { if app.primary.sim.get_pandemic_model().is_some() {
col.push(hotkey_btn(ctx, app, "pandemic model", Key::Y)); col.push(hotkey_btn(ctx, app, "pandemic model", Key::Y));
} }