Skip to content

Add a moving average for SPS #1497

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

Open
nib9888 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add a moving average for SPS #1497

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8facfc6
Add a moving average for SPS
nib9888 Oct 23, 2022
4e59cc1
Revert "Add a moving average for SPS"
nib9888 Oct 23, 2022
d09db86
Add a moving average for SPS based on time
nib9888 Oct 23, 2022
9895155
Fix SPS rolling average for long render passes
nib9888 Oct 23, 2022
3f53593
Remove hacky fix in favour of slight refactor, fixing the issue properly
nib9888 Oct 24, 2022
5f3cbec
Cleanly handle first render pass
nib9888 Oct 26, 2022
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
24 changes: 23 additions & 1 deletion chunky/src/java/se/llbit/chunky/renderer/DefaultRenderManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ public void run() {
getRenderer().sceneReset(this, reason, resetCount);
getPreviewRenderer().sceneReset(this, reason, resetCount);

// Reset sps rolling average
spp_history.clear();
spp_history_times.clear();
spp_history.addLast(0);
spp_history_times.addLast(0.0);

// Select the correct renderer
Renderer render = mode == RenderMode.PREVIEW ? getPreviewRenderer() : getRenderer();

Expand Down Expand Up @@ -370,6 +376,10 @@ private void updateRenderState(Scene scene) {
}
}

private static final int SPS_AVERAGE_TIME = 30;
private LinkedList<Integer> spp_history = new LinkedList<Integer>();
private LinkedList<Double> spp_history_times = new LinkedList<Double>();

/**
* @return the current rendering speed in samples per second (SPS)
*/
Expand All @@ -378,7 +388,10 @@ private int samplesPerSecond() {
int canvasHeight = bufferedScene.canvasHeight();
long pixelsPerFrame = (long) canvasWidth * canvasHeight;
double renderTime = bufferedScene.renderTime / 1000.0;
return (int) ((bufferedScene.spp * pixelsPerFrame) / renderTime);

double timeDiff = renderTime - spp_history_times.getFirst();
int sppDiff = bufferedScene.spp - spp_history.getFirst();
return (int) (sppDiff * pixelsPerFrame / timeDiff);
}

private void updateRenderProgress() {
Expand All @@ -398,6 +411,15 @@ private void updateRenderProgress() {
}

synchronized (this) {
// Update list of spp values
spp_history_times.addLast(renderTime);
spp_history.addLast(bufferedScene.spp);
// These lists shouldn't contain information older than SPS_AVERAGE_TIME, but must contain at least one old value
while ((spp_history_times.getFirst() + SPS_AVERAGE_TIME < renderTime) && (spp_history_times.size() > 2)) {
spp_history_times.removeFirst();
spp_history.removeFirst();
}

// Update render status display.
renderStatusListeners.forEach(listener -> {
listener.setRenderTime(bufferedScene.renderTime);
Expand Down