Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: in text UIs, show render progress in one line (#257)

Browse Source 
The text UI gets quite messy during the render process, as it takes at least one extra line of the screen per second. This PR fixes that issue and also shows an ASCII bar to show the render progress.
This commit is contained in:
Luis Uguina
2020-06-17 18:24:59 +10:00
committed by GitHub
parent ce756db69d
commit b91bf3c0c5
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/sheepit/client/Job.java
View File

@@ -293,10 +293,11 @@ import lombok.Getter;
try {
int progress = -1;
Pattern tilePattern = Pattern.compile(" ([0-9]+)\\s?\\/\\s?([0-9]+) ");
Pattern tilePattern = Pattern.compile(" (Rendered|Path Tracing Tile|Rendering) (\\d+)\\s?\\/\\s?(\\d+)( Tiles| samples|,)");
// Initialise the progress bar in the icon (0% completed at this time)
// Initialise the progress bar in the icon and the UI (0% completed at this time)
gui.updateTrayIcon(0);
gui.status("Preparing scene", 0);
while ((line = input.readLine()) != null) {
log.debug(line);
@@ -458,15 +459,16 @@ import lombok.Getter;
int newProgress = currentProgress;
if (standardTileInfo.find()) {
int tileJustProcessed = Integer.parseInt(standardTileInfo.group(1));
int totalTilesInJob = Integer.parseInt(standardTileInfo.group(2));
int tileJustProcessed = Integer.parseInt(standardTileInfo.group(2));
int totalTilesInJob = Integer.parseInt(standardTileInfo.group(3));
newProgress = Math.abs((tileJustProcessed * 100) / totalTilesInJob);
}
// Only update the tray icon if percentage has changed
// Only update the tray icon and the screen if percentage has changed
if (newProgress != currentProgress) {
gui.updateTrayIcon(newProgress);
gui.status("Rendering", newProgress);
}
return newProgress;