Add a hacky fix for when render passes are significantly longer than SPS_AVERAGE_TIME

Author: nib9888

chunky/src/java/se/llbit/chunky/renderer/DefaultRenderManager.java

@@ -374,7 +374,7 @@ private void updateRenderState(Scene scene) {
     }
   }
 
-  private static final int SPS_AVERAGE_TIME = 180;
+  private static final int SPS_AVERAGE_TIME = 1;
   private LinkedList<Integer> spp_history = new LinkedList<Integer>();
   private LinkedList<Double> spp_history_times = new LinkedList<Double>();
 
@@ -386,6 +386,12 @@ private int samplesPerSecond() {
     int canvasHeight = bufferedScene.canvasHeight();
     long pixelsPerFrame = (long) canvasWidth * canvasHeight;
     double renderTime = bufferedScene.renderTime / 1000.0;
+
+    // Avoid incorrect output if the average time per render pass were to exceed SPS_AVERAGE_TIME
+    // Somewhat hacky, as it will break if there is an outlier pass that's >SPS_AVERAGE_TIME, and 0 will be returned
+    if (renderTime / spp >= SPS_AVERAGE_TIME)
+      return (int) ((bufferedScene.spp * pixelsPerFrame) / renderTime);
+
     if (renderTime < SPS_AVERAGE_TIME) {
       return (int) ((bufferedScene.spp * pixelsPerFrame) / renderTime);
     } else {
@@ -417,6 +423,9 @@ private void updateRenderProgress() {
         spp_history_times.removeFirst();
         spp_history.removeFirst();
       }
+      System.out.println(renderTime);
+      System.out.println(Arrays.toString(spp_history.toArray()));
+      System.out.println(Arrays.toString(spp_history_times.toArray()));
       // Update render status display.
       renderStatusListeners.forEach(listener -> {
         listener.setRenderTime(bufferedScene.renderTime);