mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-02 16:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move around guis

Browse Source
This commit is contained in:
Daniel Mills 2021-07-19 02:00:15 -04:00
parent b25bf70224
commit 1208b25b66
5 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/core/gui/IrisExplorer.java → src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java
View File

@ -38,7 +38,7 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.locks.ReentrantLock;
public class IrisExplorer extends JPanel implements MouseWheelListener {
public class NoiseExplorerGUI extends JPanel implements MouseWheelListener {
private static final long serialVersionUID = 2094606939770332040L;
@ -74,7 +74,7 @@ public class IrisExplorer extends JPanel implements MouseWheelListener {
double t;
double tz;
public IrisExplorer() {
public NoiseExplorerGUI() {
addMouseWheelListener(this);
addMouseMotionListener(new MouseMotionListener() {
@Override
@ -237,7 +237,7 @@ public class IrisExplorer extends JPanel implements MouseWheelListener {
private static void createAndShowGUI(Function2<Double, Double, Double> gen, String genName) {
JFrame frame = new JFrame("Noise Explorer: " + genName);
IrisExplorer nv = new IrisExplorer();
NoiseExplorerGUI nv = new NoiseExplorerGUI();
frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
JLayeredPane pane = new JLayeredPane();
nv.setSize(new Dimension(1440, 820));
@ -259,7 +259,7 @@ public class IrisExplorer extends JPanel implements MouseWheelListener {
private static void createAndShowGUI() {
JFrame frame = new JFrame("Noise Explorer");
IrisExplorer nv = new IrisExplorer();
NoiseExplorerGUI nv = new NoiseExplorerGUI();
frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
KList<String> li = new KList<>(NoiseStyle.values()).toStringList();
combo = new JComboBox<>(li.toArray(new String[0]));
@ -296,7 +296,7 @@ public class IrisExplorer extends JPanel implements MouseWheelListener {
}
public static void launch() {
EventQueue.invokeLater(IrisExplorer::createAndShowGUI);
EventQueue.invokeLater(NoiseExplorerGUI::createAndShowGUI);
}
static class HandScrollListener extends MouseAdapter {

2
src/main/java/com/volmit/iris/core/gui/IrisPregenerator.java → src/main/java/com/volmit/iris/core/gui/PregeneratorGUI.java
View File

@ -18,5 +18,5 @@
package com.volmit.iris.core.gui;
public class IrisPregenerator {
public class PregeneratorGUI {
}

7
src/main/java/com/volmit/iris/core/gui/IrisVision.java → src/main/java/com/volmit/iris/core/gui/VisionGUI.java
View File

@ -19,6 +19,7 @@
package com.volmit.iris.core.gui;
import com.volmit.iris.Iris;
import com.volmit.iris.core.gui.components.IrisRenderer;
import com.volmit.iris.core.gui.components.RenderType;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.framework.Engine;
@ -55,7 +56,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.BiFunction;
public class IrisVision extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener, MouseMotionListener, MouseInputListener {
private static final long serialVersionUID = 2094606939770332040L;
private RenderType currentType = RenderType.BIOME;
@ -129,7 +130,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
});
private BufferedImage texture;
public IrisVision(JFrame frame) {
public VisionGUI(JFrame frame) {
m.set(8);
rs.put(1);
addMouseWheelListener(this);
@ -729,7 +730,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
private static void createAndShowGUI(Engine r, int s, IrisWorld world) {
JFrame frame = new JFrame("Vision");
IrisVision nv = new IrisVision(frame);
VisionGUI nv = new VisionGUI(frame);
nv.world = world;
nv.engine = r;
nv.renderer = new IrisRenderer(r);

2
src/main/java/com/volmit/iris/core/gui/IrisRenderer.java → src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.volmit.iris.core.gui;
package com.volmit.iris.core.gui.components;
import com.volmit.iris.core.gui.components.RenderType;
import com.volmit.iris.engine.framework.Engine;

45
src/main/java/com/volmit/iris/core/gui/components/Pregenerator.java
View File

@ -30,7 +30,7 @@ import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.function.Consumer2;
import com.volmit.iris.util.function.Consumer3;
import com.volmit.iris.util.math.ChunkPosition;
import com.volmit.iris.util.math.Position2;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.math.RollingSequence;
import com.volmit.iris.util.math.Spiraler;
@ -60,6 +60,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReentrantLock;
@Deprecated
@Data
public class Pregenerator implements Listener {
private static Pregenerator instance;
@ -78,12 +79,12 @@ public class Pregenerator implements Listener {
private final NBTWorld directWriter;
private final AtomicBoolean active;
private final AtomicBoolean running;
private final KList<ChunkPosition> errors;
private final KList<Position2> errors;
private final KList<Runnable> onComplete;
private final ChunkPosition max;
private final ChunkPosition min;
private final Position2 max;
private final Position2 min;
private final MCAPregenGui gui;
private final KList<ChunkPosition> mcaDefer;
private final KList<Position2> mcaDefer;
private final AtomicInteger generated;
private final AtomicInteger generatedLast;
private final RollingSequence perSecond;
@ -99,8 +100,8 @@ public class Pregenerator implements Listener {
private final long elapsed;
private final ChronoLatch latch;
private IrisAccess access;
private final KList<ChunkPosition> regionReload;
private KList<ChunkPosition> wait = new KList<>();
private final KList<Position2> regionReload;
private KList<Position2> wait = new KList<>();
public Pregenerator(World world, int blockSize, Runnable onComplete) {
this(world, blockSize);
@ -137,8 +138,8 @@ public class Pregenerator implements Listener {
MultiBurst burst = new MultiBurst("Iris Pregenerator", 9, Runtime.getRuntime().availableProcessors());
int mcaSize = (((blockSize >> 4) + 2) >> 5) + 1;
onComplete = new KList<>();
max = new ChunkPosition(0, 0);
min = new ChunkPosition(0, 0);
max = new Position2(0, 0);
min = new Position2(0, 0);
KList<Runnable> draw = new KList<>();
new Spiraler(mcaSize, mcaSize, (xx, zz) -> {
min.setX(Math.min(xx << 5, min.getX()));
@ -153,7 +154,7 @@ public class Pregenerator implements Listener {
}
gui = dogui ? (IrisSettings.get().getGui().isLocalPregenGui() && IrisSettings.get().getGui().isUseServerLaunchedGuis() ? MCAPregenGui.createAndShowGUI(this) : null) : null;
flushWorld();
KList<ChunkPosition> order = computeChunkOrder();
KList<Position2> order = computeChunkOrder();
Consumer3<Integer, Integer, Consumer2<Integer, Integer>> mcaIteration =
(ox, oz, r) -> order.forEach((i)
-> r.accept(i.getX() + ox, i.getZ() + oz));
@ -184,7 +185,7 @@ public class Pregenerator implements Listener {
mcaDefer.removeDuplicates();
while (running.get() && mcaDefer.isNotEmpty()) {
ChunkPosition p = mcaDefer.popLast();
Position2 p = mcaDefer.popLast();
vmcax.set(p.getX());
vmcaz.set(p.getZ());
generateDeferedMCARegion(p.getX(), p.getZ(), burst, mcaIteration);
@ -259,7 +260,7 @@ public class Pregenerator implements Listener {
directWriter.save();
} else {
totalChunks.getAndAdd(1024);
mcaDefer.add(new ChunkPosition(x, z));
mcaDefer.add(new Position2(x, z));
e.complete();
return false;
}
@ -318,7 +319,7 @@ public class Pregenerator implements Listener {
}
mcaIteration.accept(mcaox, mcaoz, (ii, jj) -> {
ChunkPosition cx = new ChunkPosition(ii, jj);
Position2 cx = new Position2(ii, jj);
PaperLib.getChunkAtAsync(world, ii, jj).thenAccept((c) -> {
draw(ii, jj, COLOR_MCA_GENERATE_SLOW_ASYNC);
draw(ii, jj, COLOR_MCA_GENERATED);
@ -375,9 +376,9 @@ public class Pregenerator implements Listener {
}
}
private KList<ChunkPosition> computeChunkOrder() {
ChunkPosition center = new ChunkPosition(15, 15);
KList<ChunkPosition> p = new KList<>();
private KList<Position2> computeChunkOrder() {
Position2 center = new Position2(15, 15);
KList<Position2> p = new KList<>();
new Spiraler(33, 33, (x, z) -> {
int xx = x + 15;
int zz = z + 15;
@ -385,7 +386,7 @@ public class Pregenerator implements Listener {
return;
}
p.add(new ChunkPosition(xx, zz));
p.add(new Position2(xx, zz));
}).drain();
p.sort(Comparator.comparing((i) -> i.distance(center)));
return p;
@ -428,7 +429,7 @@ public class Pregenerator implements Listener {
private void draw(int cx, int cz, Color color) {
if (gui != null) {
gui.func.accept(new ChunkPosition(cx, cz), color);
gui.func.accept(new Position2(cx, cz), color);
}
}
@ -507,7 +508,7 @@ public class Pregenerator implements Listener {
Graphics2D bg;
private ReentrantLock l;
private final BufferedImage image = new BufferedImage(res, res, BufferedImage.TYPE_INT_RGB);
private Consumer2<ChunkPosition, Color> func;
private Consumer2<Position2, Color> func;
private JFrame frame;
public MCAPregenGui() {
@ -515,7 +516,7 @@ public class Pregenerator implements Listener {
}
public void paint(int x, int z, Color c) {
func.accept(new ChunkPosition(x, z), c);
func.accept(new Position2(x, z), c);
}
@Override
@ -558,7 +559,7 @@ public class Pregenerator implements Listener {
repaint();
}
private void draw(ChunkPosition p, Color c, Graphics2D bg) {
private void draw(Position2 p, Color c, Graphics2D bg) {
double pw = M.lerpInverse(job.getMin().getX(), job.getMax().getX(), p.getX());
double ph = M.lerpInverse(job.getMin().getZ(), job.getMax().getZ(), p.getZ());
double pwa = M.lerpInverse(job.getMin().getX(), job.getMax().getX(), p.getX() + 1);
@ -582,7 +583,7 @@ public class Pregenerator implements Listener {
nv.job = j;
nv.func = (c, b) ->
{
if (b.equals(Color.pink) && c.equals(new ChunkPosition(Integer.MAX_VALUE, Integer.MAX_VALUE))) {
if (b.equals(Color.pink) && c.equals(new Position2(Integer.MAX_VALUE, Integer.MAX_VALUE))) {
frame.hide();
}
nv.l.lock();