Prevent locking camera from resetting render (#1658)

* Prevent locking camera from resetting render * Soft-refresh the scene when un/locking the camera and keep rendering after soft resets. --------- Co-authored-by: Maik Marschner <[email protected]>
chunky-dev · Oct 29, 2023 · c91e3e8 · c91e3e8
1 parent 5c91b71
commit c91e3e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Camera.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Camera.java
@@ -20,7 +20,6 @@
 import org.apache.commons.math3.util.FastMath;
 import se.llbit.chunky.entity.Entity;
 import se.llbit.chunky.renderer.ApertureShape;
-import se.llbit.chunky.renderer.Refreshable;
 import se.llbit.chunky.renderer.projection.ApertureProjector;
 import se.llbit.chunky.renderer.projection.FisheyeProjector;
 import se.llbit.chunky.renderer.projection.ForwardDisplacementProjector;
@@ -93,7 +92,7 @@ public static double clampedFovTan(double fov) {
    */
   public static final double MAX_SUBJECT_DISTANCE = 1000;
 
-  private final Refreshable scene;
+  private final Scene scene;
 
   private boolean lockCamera = false;
 
@@ -167,7 +166,7 @@ public static double clampedFovTan(double fov) {
   /**
    * @param scene The scene that will be refreshed after the camera view changes.
    */
-  public Camera(Refreshable scene) {
+  public Camera(Scene scene) {
     this.scene = scene;
     transform.setIdentity();
     initProjector();
@@ -788,7 +787,7 @@ public ApertureShape getApertureShape() {
 
   public void setCameraLocked(boolean value) {
     lockCamera = value;
-    scene.refresh();
+    scene.softRefresh();
   }
 
   public boolean getCameraLocked() {

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -1572,7 +1572,7 @@ public synchronized void startHeadlessRender() {
    * restarted
    */
   public boolean shouldRefresh() {
-    return resetReason != ResetReason.NONE;
+    return resetReason.shouldRerender();
   }
 
   /**
@@ -3068,7 +3068,7 @@ private synchronized void refresh(ResetReason reason) {
     if (mode == RenderMode.PAUSED) {
       mode = RenderMode.RENDERING;
     }
-    if (reason != ResetReason.NONE) {
+    if (reason.shouldRerender()) {
       spp = 0;
       renderTime = 0;
     }