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

woops, we were double-drawing in debug mode. detected by trying to screenshot everything

Browse Source
This commit is contained in:
Dustin Carlino 2019-07-01 14:34:07 -05:00
parent 6bb5ed4407
commit f26289e176
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/screenshots/montlake/MANIFEST
View File

@ -1,21 +1,21 @@
3f52c25aa91b0f59a2e89f0a77cd650b ../data/screenshots/pending_montlake/01x01_i64.png
3f52c25aa91b0f59a2e89f0a77cd650b ../data/screenshots/pending_montlake/01x01_i63.png
1c0914c0325afa86300e1ae099b7318b ../data/screenshots/pending_montlake/02x01_i6.png
59205dc87d59ba7ee311873e13643434 ../data/screenshots/pending_montlake/03x01_i4.png
fa49334ad5234e99e8e8fe83f8c87530 ../data/screenshots/pending_montlake/03x01_i4.png
f6809ac654f1a4e44b9fff120742990d ../data/screenshots/pending_montlake/01x02_i14.png
0f590ee6c6f030ba6d03bcaf033ade3e ../data/screenshots/pending_montlake/02x02_i143.png
96aaaebcdd22b413e334ab3e9df7e872 ../data/screenshots/pending_montlake/03x02_i44.png
ea4c3507665ae51503ae35d5c5458c44 ../data/screenshots/pending_montlake/01x03_i110.png
0f590ee6c6f030ba6d03bcaf033ade3e ../data/screenshots/pending_montlake/02x02_i142.png
8eee68ba6269b12fe00ace31950ea3f3 ../data/screenshots/pending_montlake/03x02_i43.png
ea4c3507665ae51503ae35d5c5458c44 ../data/screenshots/pending_montlake/01x03_i109.png
ee918e6b57ac2ce07df175f228dda316 ../data/screenshots/pending_montlake/02x03_i10.png
d31596a93983e841c91427caae13df41 ../data/screenshots/pending_montlake/03x03_i21.png
2cd749b9d235947d8b031cc0f6347818 ../data/screenshots/pending_montlake/03x03_i21.png
477ab2de1f55ed3f16e71c034f2783ee ../data/screenshots/pending_montlake/01x04_i8.png
af0fe85afcade470782e1843def22081 ../data/screenshots/pending_montlake/02x04_i0.png
78d0c0b08ddc5bdc0ea84484f7f3fb52 ../data/screenshots/pending_montlake/03x04_i20.png
389124ee2a87a2566d141622a7e73311 ../data/screenshots/pending_montlake/01x05_i54.png
48306f1c0424ae23fd505a02bbf879eb ../data/screenshots/pending_montlake/02x05_i52.png
92ced729ca8d3658ea4a4fb4780f1ecc ../data/screenshots/pending_montlake/03x05_i30.png
91efe051fbc190f4da79bc48560bfa4b ../data/screenshots/pending_montlake/03x04_i20.png
389124ee2a87a2566d141622a7e73311 ../data/screenshots/pending_montlake/01x05_i53.png
48306f1c0424ae23fd505a02bbf879eb ../data/screenshots/pending_montlake/02x05_i51.png
34a3443b397ac7162e3e4897bb2cc534 ../data/screenshots/pending_montlake/03x05_i29.png
fb5bebac24bd173c80475027dfea358a ../data/screenshots/pending_montlake/01x06_i18.png
44421735e045b5608d363c65973c4bf0 ../data/screenshots/pending_montlake/02x06_i16.png
a8b2e09918dd51f23536885686062f02 ../data/screenshots/pending_montlake/03x06_i1.png
47653ef12e3755353b6742c3858ac983 ../data/screenshots/pending_montlake/01x07_i120.png
d5f14bb92e76aac680046b1de4610b2a ../data/screenshots/pending_montlake/02x07_i28.png
9265bdba53d5203d30f02ed6e5526432 ../data/screenshots/pending_montlake/03x07_i25.png
a8ad255829e29bef8d930f96268d1339 ../data/screenshots/pending_montlake/03x06_i1.png
47653ef12e3755353b6742c3858ac983 ../data/screenshots/pending_montlake/01x07_i119.png
d5f14bb92e76aac680046b1de4610b2a ../data/screenshots/pending_montlake/02x07_i27.png
ab473f663181bd57f42702ad210613bf ../data/screenshots/pending_montlake/03x07_i59.png

2
editor/confirm_screencap.sh
View File

@ -2,5 +2,5 @@
name=$1;
rm -rf ../data/screenshots/${name};
rm -rf ../data/screenshots/${name} diff;
mv ../data/screenshots/pending_${name} ../data/screenshots/${name};

7
editor/src/game.rs
View File

@ -125,6 +125,9 @@ impl GUI for Game {
if let Some(idx) = self.idx_draw_base {
self.states[idx].draw(g, &self.ui);
if idx != self.states.len() - 1 {
state.draw(g, &self.ui);
}
} else if state.draw_default_ui() {
self.ui.draw(
g,
@ -132,8 +135,10 @@ impl GUI for Game {
&self.ui.primary.sim,
&ShowEverything::new(),
);
}
state.draw(g, &self.ui);
} else {
state.draw(g, &self.ui);
}
/*println!(
"{} uploads, {} draw calls",