Use y-clipping settings from the map view when creating a new scene o…

…r loading chunks from it and fix requiring two reloads after changing the y-clipping settings of a scene.
chunky-dev · Sep 23, 2024 · 48d2c8f · 48d2c8f
1 parent 16b409c
commit 48d2c8f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/SynchronousSceneManager.java b/chunky/src/java/se/llbit/chunky/renderer/scene/SynchronousSceneManager.java
@@ -235,15 +235,21 @@ public void saveScene(SceneIOProvider ioContext, Scene scene) throws Interrupted
 
   @Override public void loadFreshChunks(World world, Collection<ChunkPosition> chunksToLoad) {
     synchronized (scene) {
+      int yClipMin = scene.getYClipMin();
+      int yClipMax = scene.getYClipMax();
       scene.clear();
-      scene.loadChunks(taskTracker, world, chunksToLoad);
       scene.resetScene(null, context.getChunky().getSceneFactory());
+      scene.setYClipMin(yClipMin);
+      scene.setYClipMax(yClipMax);
       context.setSceneDirectory(new File(context.getChunky().options.sceneDir, scene.name));
+      scene.loadChunks(taskTracker, world, chunksToLoad);
       scene.refresh();
       scene.setResetReason(ResetReason.SCENE_LOADED);
       scene.setRenderMode(RenderMode.PREVIEW);
     }
+    System.out.println(scene.getYClipMin()+" min, 2 max "+scene.getYClipMax());
     onSceneLoaded.run();
+    System.out.println(scene.getYClipMin()+" min, 3 max "+scene.getYClipMax());
   }
 
   @Override public void loadChunks(World world, Collection<ChunkPosition> chunksToLoad) {
@@ -253,19 +259,19 @@ public void saveScene(SceneIOProvider ioContext, Scene scene) throws Interrupted
       if (prevChunkCount == 0) {
         scene.moveCameraToCenter();
       }
-      scene.refresh();
       scene.setResetReason(ResetReason.SCENE_LOADED);
       scene.setRenderMode(RenderMode.PREVIEW);
+      scene.refresh();
     }
     onChunksLoaded.run();
   }
 
   @Override public void reloadChunks() {
     synchronized (scene) {
       scene.reloadChunks(taskTracker);
-      scene.refresh();
       scene.setResetReason(ResetReason.SCENE_LOADED);
       scene.setRenderMode(RenderMode.PREVIEW);
+      scene.refresh();
     }
     onChunksLoaded.run();
   }

diff --git a/chunky/src/java/se/llbit/chunky/ui/ChunkMap.java b/chunky/src/java/se/llbit/chunky/ui/ChunkMap.java
@@ -159,16 +159,22 @@ public ChunkMap(WorldMapLoader loader, ChunkyFxController controller,
     newScene.setGraphic(new ImageView(Icon.sky.fxImage()));
     newScene.setOnAction(event -> {
       SceneManager sceneManager = controller.getRenderController().getSceneManager();
-      sceneManager
-          .loadFreshChunks(mapLoader.getWorld(), controller.getChunkSelection().getSelection());
+      sceneManager.getSceneProvider().withEditSceneProtected(scene -> {
+        scene.setYClipMin(mapView.getYMin());
+        scene.setYClipMax(mapView.getYMax());
+      });
+      sceneManager.loadFreshChunks(mapLoader.getWorld(), controller.getChunkSelection().getSelection());
     });
     newScene.setDisable(chunkSelection.isEmpty());
 
     MenuItem loadSelection = new MenuItem("Load selected chunks");
     loadSelection.setOnAction(event -> {
       SceneManager sceneManager = controller.getRenderController().getSceneManager();
-      sceneManager
-          .loadChunks(mapLoader.getWorld(), controller.getChunkSelection().getSelection());
+      sceneManager.getSceneProvider().withEditSceneProtected(scene -> {
+        scene.setYClipMin(mapView.getYMin());
+        scene.setYClipMax(mapView.getYMax());
+      });
+      sceneManager.loadChunks(mapLoader.getWorld(), controller.getChunkSelection().getSelection());
     });
     loadSelection.setDisable(chunkSelection.isEmpty());
 

diff --git a/chunky/src/java/se/llbit/chunky/ui/render/tabs/GeneralTab.java b/chunky/src/java/se/llbit/chunky/ui/render/tabs/GeneralTab.java
@@ -187,6 +187,12 @@ public GeneralTab() throws IOException {
     canvasSizeInput.setSize(scene.canvasConfig.getCropWidth(), scene.canvasConfig.getCropHeight());
   }
 
+  @Override
+  public void onChunksLoaded() {
+    yMin.set(scene.getYClipMin());
+    yMax.set(scene.getYClipMax());
+  }
+
   @Override public String getTabTitle() {
     return "Scene";
   }