From ae79f9be6617f295f8ce44439d606b55d7f67b39 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 22 Aug 2021 03:45:48 -0400 Subject: [PATCH] Fix noise explorer --- .../iris/core/gui/NoiseExplorerGUI.java | 2 +- .../iris/util/parallel/BurstExecutor.java | 27 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java index 36a631e17..66ab5bd39 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -213,7 +213,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List }); } - e.complete(1000); + e.complete(); gg.drawImage(img, 0, 0, getParent().getWidth() * accuracy, getParent().getHeight() * accuracy, (img, infoflags, x, y, width, height) -> true); } diff --git a/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java index b7edc9e89..c81e47f77 100644 --- a/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/util/parallel/BurstExecutor.java @@ -110,31 +110,4 @@ public class BurstExecutor { } } } - - public boolean complete(long maxDur) { - if(!multicore) - { - return true; - } - - synchronized (futures) { - if (futures.isEmpty()) { - return true; - } - - try { - try { - CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get(maxDur, TimeUnit.MILLISECONDS); - } catch (TimeoutException e) { - return false; - } - futures.clear(); - } catch (InterruptedException | ExecutionException e) { - e.printStackTrace(); - Iris.reportError(e); - } - } - - return false; - } }