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

retain directory of screencap tiles, for faster diffing

Browse Source
This commit is contained in:
Dustin Carlino 2019-01-14 12:59:44 -08:00
parent 3f88eb2142
commit 6d4e958ea5
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/install.md
View File

@ -1,9 +1,16 @@
# Installation
I'm assuming a Linux-like environment with `bash`, `wget`, `unzip`, etc. The
import script also requires `osmosis` (on Ubuntu, `sudo apt-get install
osmosis` does the trick). In the future, I'll set up Github binary releases for
multiple platforms.
## Dependencies
To build, you need a Linux-like environment with `bash`, `wget`, `unzip`, etc.
You also need `python` for the editor crate to build, and `osmosis` for the
import script.
At runtime if you want to use the screen-capture plugin, you need `scrot`.
## One-time setup
In the future, I'll set up Github binary releases for multiple platforms.
1. Install Rust, at least 1.31. https://www.rust-lang.org/tools/install

15
ezgui/src/runner.rs
View File

@ -208,7 +208,7 @@ impl<T, G: GUI<T>> State<T, G> {
"100",
"--focused",
"--silent",
&format!("screen{:02}x{:02}.png", cap.tile_x, cap.tile_y),
&format!("screencap/{:02}x{:02}.png", cap.tile_x, cap.tile_y),
])
.status()
.unwrap()
@ -259,6 +259,7 @@ impl ScreenCaptureState {
let num_tiles_y = (max_y * zoom / canvas.window_height).floor() as usize;
let mut timer = Timer::new("capturing screen");
timer.start_iter("capturing images", num_tiles_x * num_tiles_y);
fs::create_dir("screencap").unwrap();
let state = ScreenCaptureState {
tile_x: 1,
tile_y: 1,
@ -282,14 +283,14 @@ impl ScreenCaptureState {
let mut args = Vec::new();
for y in 1..=self.num_tiles_y {
for x in 1..=self.num_tiles_x {
args.push(format!("screen{:02}x{:02}.png", x, y));
args.push(format!("screencap/{:02}x{:02}.png", x, y));
}
}
args.push("-mode".to_string());
args.push("Concatenate".to_string());
args.push("-tile".to_string());
args.push(format!("{}x{}", self.num_tiles_x, self.num_tiles_y));
args.push("screencap.png".to_string());
args.push("screencap/full.png".to_string());
if !process::Command::new("montage")
.args(&args)
.status()
@ -302,14 +303,8 @@ impl ScreenCaptureState {
return;
}
for x in 1..=self.num_tiles_x {
for y in 1..=self.num_tiles_y {
fs::remove_file(format!("screen{:02}x{:02}.png", x, y)).unwrap();
}
}
self.timer.stop("combining tiles");
self.timer.done();
println!("Produced screencap.png");
println!("Produced screencap/");
}
}