extract canvas size code from Scene into separate CanvasConfig class

chunky-dev · Mar 6, 2023 · 4288a6a · 4288a6a
1 parent 7ced041
commit 4288a6a
Show file tree

Hide file tree

Showing 19 changed files with 300 additions and 219 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/renderer/DefaultRenderManager.java b/chunky/src/java/se/llbit/chunky/renderer/DefaultRenderManager.java
@@ -374,9 +374,7 @@ private void updateRenderState(Scene scene) {
    * @return the current rendering speed in samples per second (SPS)
    */
   private int samplesPerSecond() {
-    int canvasWidth = bufferedScene.canvasWidth();
-    int canvasHeight = bufferedScene.canvasHeight();
-    long pixelsPerFrame = (long) canvasWidth * canvasHeight;
+    long pixelsPerFrame = bufferedScene.canvasConfig.getPixelCount();
     double renderTime = bufferedScene.renderTime / 1000.0;
     return (int) ((bufferedScene.spp * pixelsPerFrame) / renderTime);
   }
@@ -418,19 +416,21 @@ protected void finalizeFrame(boolean force) {
       if (filter instanceof PixelPostProcessingFilter) {
         PixelPostProcessingFilter pixelFilter = (PixelPostProcessingFilter) filter;
 
-        int width = bufferedScene.width;
-        int height = bufferedScene.height;
+        int width = bufferedScene.canvasConfig.getWidth();
+        int height = bufferedScene.canvasConfig.getHeight();
+        int totalPixelCount = bufferedScene.canvasConfig.getPixelCount();
+
         double[] sampleBuffer = bufferedScene.getSampleBuffer();
         double exposure = bufferedScene.getExposure();
 
         // Split up to 10 tasks per thread
         int tasksPerThread = 10;
-        int pixelsPerTask = (bufferedScene.width * bufferedScene.height) / (pool.threads * tasksPerThread - 1);
+        int pixelsPerTask = (totalPixelCount / (pool.threads * tasksPerThread - 1));
         ArrayList<RenderWorkerPool.RenderJobFuture> jobs = new ArrayList<>(pool.threads * tasksPerThread);
 
-        for (int i = 0; i < bufferedScene.width * bufferedScene.height; i += pixelsPerTask) {
+        for (int i = 0; i < totalPixelCount; i += pixelsPerTask) {
           int start = i;
-          int end = Math.min(bufferedScene.width * bufferedScene.height, i + pixelsPerTask);
+          int end = Math.min(totalPixelCount, i + pixelsPerTask);
           jobs.add(pool.submit(worker -> {
             double[] pixelbuffer = new double[3];
 
@@ -567,7 +567,8 @@ public RenderStatus getRenderStatus() {
   @Override
   public void withSampleBufferProtected(SampleBufferConsumer consumer) {
     synchronized (bufferedScene) {
-      consumer.accept(bufferedScene.getSampleBuffer(), bufferedScene.width, bufferedScene.height);
+      consumer.accept(bufferedScene.getSampleBuffer(),
+        bufferedScene.canvasConfig.getWidth(), bufferedScene.canvasConfig.getHeight());
     }
   }
 

diff --git a/chunky/src/java/se/llbit/chunky/renderer/PathTracingRenderer.java b/chunky/src/java/se/llbit/chunky/renderer/PathTracingRenderer.java
@@ -52,13 +52,12 @@ public String getDescription() {
   public void render(DefaultRenderManager manager) throws InterruptedException {
     Scene scene = manager.bufferedScene;
 
-    int width = scene.width;
-    int height = scene.height;
+    int width = scene.canvasConfig.getWidth();
 
-    int fullWidth = scene.getFullWidth();
-    int fullHeight = scene.getFullHeight();
-    int cropX = scene.getCropX();
-    int cropY = scene.getCropY();
+    int fullWidth = scene.canvasConfig.getCropWidth();
+    int fullHeight = scene.canvasConfig.getCropHeight();
+    int cropX = scene.canvasConfig.getCropX();
+    int cropY = scene.canvasConfig.getCropY();
 
     int sppPerPass = manager.context.sppPerPass();
     Camera cam = scene.camera();

diff --git a/chunky/src/java/se/llbit/chunky/renderer/PreviewRenderer.java b/chunky/src/java/se/llbit/chunky/renderer/PreviewRenderer.java
@@ -58,13 +58,12 @@ public void render(DefaultRenderManager manager) throws InterruptedException {
 
     Scene scene = manager.bufferedScene;
 
-    int width = scene.width;
-    int height = scene.height;
+    int width = scene.canvasConfig.getWidth();
 
-    int fullWidth = scene.getFullWidth();
-    int fullHeight = scene.getFullHeight();
-    int cropX = scene.getCropX();
-    int cropY = scene.getCropY();
+    int fullWidth = scene.canvasConfig.getCropWidth();
+    int fullHeight = scene.canvasConfig.getCropHeight();
+    int cropX = scene.canvasConfig.getCropX();
+    int cropY = scene.canvasConfig.getCropY();
 
     Camera cam = scene.camera();
     double halfWidth = fullWidth / (2.0 * fullHeight);

diff --git a/chunky/src/java/se/llbit/chunky/renderer/TileBasedRenderer.java b/chunky/src/java/se/llbit/chunky/renderer/TileBasedRenderer.java
@@ -87,10 +87,10 @@ protected void submitTiles(DefaultRenderManager manager, BiConsumer<WorkerState,
   }
 
   private void initTiles(DefaultRenderManager manager) {
-    Scene bufferedScene = manager.bufferedScene;
-    int width = bufferedScene.width;
-    int height = bufferedScene.height;
+    Scene scene = manager.bufferedScene;
     int tileWidth = manager.context.tileWidth();
+    int width = scene.canvasConfig.getWidth();
+    int height = scene.canvasConfig.getHeight();
 
     if (prevWidth != width || prevHeight != height) {
       prevWidth = width;

diff --git a/chunky/src/java/se/llbit/chunky/renderer/export/PfmExportFormat.java b/chunky/src/java/se/llbit/chunky/renderer/export/PfmExportFormat.java
@@ -50,7 +50,7 @@ public boolean isTransparencySupported() {
 
   @Override
   public void write(OutputStream out, Scene scene, TaskTracker taskTracker) throws IOException {
-    try (TaskTracker.Task task = taskTracker.task("Writing PFM rows", scene.canvasHeight());
+    try (TaskTracker.Task task = taskTracker.task("Writing PFM rows", scene.canvasConfig.getHeight());
         PfmFileWriter writer = new PfmFileWriter(out)) {
       writer.write(scene, task);
     }

diff --git a/chunky/src/java/se/llbit/chunky/renderer/export/PngExportFormat.java b/chunky/src/java/se/llbit/chunky/renderer/export/PngExportFormat.java
@@ -52,10 +52,11 @@ public void write(OutputStream out, Scene scene, TaskTracker taskTracker) throws
         PngFileWriter writer = new PngFileWriter(out)) {
       BitmapImage backBuffer = scene.getBackBuffer();
       if (scene.transparentSky()) {
-        writer.write(backBuffer.data, scene.getAlphaChannel(), scene.canvasWidth(),
-            scene.canvasHeight(), task);
+        writer.write(backBuffer.data, scene.getAlphaChannel(),
+          scene.canvasConfig.getWidth(), scene.canvasConfig.getHeight(), task);
       } else {
-        writer.write(backBuffer.data, scene.canvasWidth(), scene.canvasHeight(), task);
+        writer.write(backBuffer.data,
+          scene.canvasConfig.getWidth(), scene.canvasConfig.getHeight(), task);
       }
       if (scene.camera().getProjectionMode() == ProjectionMode.PANORAMIC
           && scene.camera().getFov() >= 179
@@ -85,10 +86,10 @@ private void writePanoramaMetaData(Scene scene, PngFileWriter writer) throws IOE
       "XML:com.adobe.xmp",
       String.format(
         PNG_PANORAMA_META_ADOBE_RDF_XML,
-        scene.canvasHeight(),
-        scene.canvasWidth(),
-        scene.canvasHeight(),
-        scene.canvasWidth()
+        scene.canvasConfig.getHeight(),
+        scene.canvasConfig.getWidth(),
+        scene.canvasConfig.getHeight(),
+        scene.canvasConfig.getWidth()
       )
     ));
   }

diff --git a/chunky/src/java/se/llbit/chunky/renderer/renderdump/AbstractDumpFormat.java b/chunky/src/java/se/llbit/chunky/renderer/renderdump/AbstractDumpFormat.java
@@ -65,30 +65,30 @@ public void load(DataInputStream inputStream, Scene scene, TaskTracker taskTrack
       throws IOException, IllegalStateException {
     double[] samples = scene.getSampleBuffer();
 
-    try (TaskTracker.Task task = taskTracker.task("Loading render dump", scene.width * scene.height)) {
+    try (TaskTracker.Task task = taskTracker.task("Loading render dump", scene.canvasConfig.getPixelCount())) {
       readHeader(inputStream, scene);
       readSamples(inputStream, scene, (index, r, g, b) -> {
         int offset = index * 3;
         samples[offset + 0] = r;
         samples[offset + 1] = g;
         samples[offset + 2] = b;
-      }, i -> task.updateInterval(i, scene.width));
+      }, i -> task.updateInterval(i, scene.canvasConfig.getWidth()));
     }
   }
 
   @Override
   public void save(DataOutputStream outputStream, Scene scene, TaskTracker taskTracker)
       throws IOException {
-    try (TaskTracker.Task task = taskTracker.task("Saving render dump", scene.width * scene.height)) {
+    try (TaskTracker.Task task = taskTracker.task("Saving render dump", scene.canvasConfig.getPixelCount())) {
       writeHeader(outputStream, scene);
-      writeSamples(outputStream, scene, i -> task.updateInterval(i, scene.width));
+      writeSamples(outputStream, scene, i -> task.updateInterval(i, scene.canvasConfig.getWidth()));
     }
   }
 
   @Override
   public void merge(DataInputStream inputStream, Scene scene, TaskTracker taskTracker)
       throws IOException, IllegalStateException {
-    try (TaskTracker.Task task = taskTracker.task("Merging render dump", scene.width * scene.height)) {
+    try (TaskTracker.Task task = taskTracker.task("Merging render dump", scene.canvasConfig.getPixelCount())) {
       int sceneSpp = scene.spp;
       long previousRenderTime = scene.renderTime;
 
@@ -104,7 +104,7 @@ public void merge(DataInputStream inputStream, Scene scene, TaskTracker taskTrac
         samples[offset + 0] = (samples[offset + 0] * sceneSpp + r * dumpSpp) * sinv;
         samples[offset + 1] = (samples[offset + 1] * sceneSpp + g * dumpSpp) * sinv;
         samples[offset + 2] = (samples[offset + 2] * sceneSpp + b * dumpSpp) * sinv;
-      }, i -> task.updateInterval(i, scene.width));
+      }, i -> task.updateInterval(i, scene.canvasConfig.getWidth()));
 
       scene.spp += sceneSpp;
       scene.renderTime += previousRenderTime;
@@ -115,7 +115,7 @@ protected void readHeader(DataInputStream inputStream, Scene scene) throws IOExc
     int width = inputStream.readInt();
     int height = inputStream.readInt();
 
-    if (width != scene.canvasWidth() || height != scene.canvasHeight()) {
+    if (width != scene.canvasConfig.getWidth() || height != scene.canvasConfig.getHeight()) {
       throw new IllegalStateException("Scene size does not match dump size");
     }
 
@@ -124,8 +124,8 @@ protected void readHeader(DataInputStream inputStream, Scene scene) throws IOExc
   }
 
   protected void writeHeader(DataOutputStream outputStream, Scene scene) throws IOException {
-    outputStream.writeInt(scene.width);
-    outputStream.writeInt(scene.height);
+    outputStream.writeInt(scene.canvasConfig.getWidth());
+    outputStream.writeInt(scene.canvasConfig.getHeight());
     outputStream.writeInt(scene.spp);
     outputStream.writeLong(scene.renderTime);
   }

diff --git a/chunky/src/java/se/llbit/chunky/renderer/renderdump/ClassicDumpFormat.java b/chunky/src/java/se/llbit/chunky/renderer/renderdump/ClassicDumpFormat.java
@@ -69,9 +69,9 @@ protected void readSamples(DataInputStream inputStream, Scene scene,
     double r, g, b;
 
     // Warning: This format writes in column major order
-    for (int x = 0; x < scene.width; x++) {
-      for (int y = 0; y < scene.height; y++) {
-        pixelIndex = (y * scene.width + x);
+    for (int x = 0; x < scene.canvasConfig.getWidth(); x++) {
+      for (int y = 0; y < scene.canvasConfig.getHeight(); y++) {
+        pixelIndex = (y * scene.canvasConfig.getWidth() + x);
         r = inputStream.readDouble();
         g = inputStream.readDouble();
         b = inputStream.readDouble();
@@ -90,9 +90,9 @@ protected void writeSamples(DataOutputStream outputStream, Scene scene,
     int done = 0;
 
     // Warning: This format writes in column major order
-    for (int x = 0; x < scene.width; ++x) {
-      for (int y = 0; y < scene.height; ++y) {
-        offset = (y * scene.width + x) * 3;
+    for (int x = 0; x < scene.canvasConfig.getWidth(); ++x) {
+      for (int y = 0; y < scene.canvasConfig.getHeight(); ++y) {
+        offset = (y * scene.canvasConfig.getWidth() + x) * 3;
         outputStream.writeDouble(samples[offset + 0]);
         outputStream.writeDouble(samples[offset + 1]);
         outputStream.writeDouble(samples[offset + 2]);