mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-25 13:30:08 +00:00
Remove the generation load views from the map
The Objects, Decorators and Layers load views coloured each biome by a rough count from its file: object density times chance, decorator chance and the number of palette layers. They measured nothing and the Palettes view shows the same contents in detail, so they go, together with their render types, biome colours and the engine's per-biome maximums that only they used. Model used: Claude Opus 5.5
This commit is contained in:
1 parent
88c2688662
commit
5a99091193
7 files changed
+3
-74
No files matched your search
@@ -36,12 +36,6 @@ enum MapView {
|
||||
SEA_BIOMES("Sea biomes", "The sea biome each spot would get, also where the land is",
|
||||
Group.BIOME_STREAMS, RenderType.BIOME_SEA, KeyEvent.VK_6),
|
||||
CAVE_BIOMES("Cave biomes", "The cave biome under each spot", Group.BIOME_STREAMS, RenderType.CAVE_LAND, KeyEvent.VK_7),
|
||||
OBJECT_LOAD("Objects", "How densely each biome places objects, brighter is denser",
|
||||
Group.LOAD, RenderType.OBJECT_LOAD, KeyEvent.VK_8),
|
||||
DECORATOR_LOAD("Decorators", "How densely each biome places decorations, brighter is denser",
|
||||
Group.LOAD, RenderType.DECORATOR_LOAD, KeyEvent.VK_9),
|
||||
LAYER_LOAD("Layers", "How many block layers each biome stacks, brighter is more",
|
||||
Group.LOAD, RenderType.LAYER_LOAD, KeyEvent.VK_0),
|
||||
PALETTES("Palettes", "The blocks each biome's palette layers place, with their textures",
|
||||
Group.BLOCKS, null, KeyEvent.VK_P),
|
||||
NOISE("Noise", "The pack's noise generators and Iris' built-in noise styles",
|
||||
@@ -104,7 +98,6 @@ enum MapView {
|
||||
enum Group {
|
||||
WORLD("World"),
|
||||
BIOME_STREAMS("Biome layers"),
|
||||
LOAD("Generation load"),
|
||||
BLOCKS("Blocks"),
|
||||
GENERATORS("Generators");
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ final class VisionOverlay {
|
||||
Optional<String> openInEditor(double worldX, double worldZ, RenderType type) {
|
||||
IrisComplex complex = engine.getComplex();
|
||||
File file = switch (type) {
|
||||
case BIOME, LAYER_LOAD, DECORATOR_LOAD, OBJECT_LOAD, HEIGHT ->
|
||||
case BIOME, HEIGHT ->
|
||||
complex.getTrueBiomeStream().get(worldX, worldZ).openInVSCode();
|
||||
case BIOME_LAND -> complex.getLandBiomeStream().get(worldX, worldZ).openInVSCode();
|
||||
case BIOME_SEA -> complex.getSeaBiomeStream().get(worldX, worldZ).openInVSCode();
|
||||
|
||||
@@ -174,7 +174,7 @@ public final class IrisRenderer {
|
||||
case BIOME_LAND -> complex.getLandBiomeStream();
|
||||
case BIOME_SEA -> complex.getSeaBiomeStream();
|
||||
case CAVE_LAND -> complex.getCaveBiomeStream();
|
||||
case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD, HEIGHT, CONTINENT, REGION -> complex.getBaseBiomeStream();
|
||||
case BIOME, HEIGHT, CONTINENT, REGION -> complex.getBaseBiomeStream();
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -19,5 +19,5 @@
|
||||
package com.volmit.iris.core.gui.components;
|
||||
|
||||
public enum RenderType {
|
||||
BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, CONTINENT, LAYER_LOAD
|
||||
BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, CONTINENT
|
||||
}
|
||||
@@ -100,9 +100,6 @@ public class IrisEngine implements Engine {
|
||||
private boolean failing;
|
||||
private boolean closed;
|
||||
private int cacheId;
|
||||
private double maxBiomeObjectDensity;
|
||||
private double maxBiomeLayerDensity;
|
||||
private double maxBiomeDecoratorDensity;
|
||||
private IrisComplex complex;
|
||||
|
||||
public IrisEngine(EngineTarget target, boolean studio) {
|
||||
@@ -181,7 +178,6 @@ public class IrisEngine implements Engine {
|
||||
mantle.hotload();
|
||||
setupMode();
|
||||
getDimension().getEngineScripts().forEach(execution::execute);
|
||||
J.a(this::computeBiomeMaxes);
|
||||
J.a(() -> {
|
||||
File[] roots = getData().getLoaders()
|
||||
.values()
|
||||
@@ -342,32 +338,6 @@ public class IrisEngine implements Engine {
|
||||
return studio;
|
||||
}
|
||||
|
||||
private void computeBiomeMaxes() {
|
||||
for (IrisBiome i : getDimension().getAllBiomes(this)) {
|
||||
double density = 0;
|
||||
|
||||
for (IrisObjectPlacement j : i.getObjects()) {
|
||||
density += j.getDensity() * j.getChance();
|
||||
}
|
||||
|
||||
maxBiomeObjectDensity = Math.max(maxBiomeObjectDensity, density);
|
||||
density = 0;
|
||||
|
||||
for (IrisDecorator j : i.getDecorators()) {
|
||||
density += Math.max(j.getStackMax(), 1) * j.getChance();
|
||||
}
|
||||
|
||||
maxBiomeDecoratorDensity = Math.max(maxBiomeDecoratorDensity, density);
|
||||
density = 0;
|
||||
|
||||
for (IrisBiomePaletteLayer j : i.getLayers()) {
|
||||
density++;
|
||||
}
|
||||
|
||||
maxBiomeLayerDensity = Math.max(maxBiomeLayerDensity, density);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBlockUpdatesPerSecond() {
|
||||
return buds.get();
|
||||
|
||||
@@ -112,12 +112,6 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
|
||||
|
||||
EngineEnvironment getExecution();
|
||||
|
||||
double getMaxBiomeObjectDensity();
|
||||
|
||||
double getMaxBiomeDecoratorDensity();
|
||||
|
||||
double getMaxBiomeLayerDensity();
|
||||
|
||||
boolean isClosed();
|
||||
|
||||
EngineWorldManager getWorldManager();
|
||||
|
||||
@@ -62,9 +62,6 @@ public class IrisBiome extends IrisRegistrant implements IRare {
|
||||
private final transient AtomicCache<KList<IrisObjectPlacement>> surfaceObjectsCache = new AtomicCache<>();
|
||||
private final transient AtomicCache<KList<IrisObjectPlacement>> carveObjectsCache = new AtomicCache<>();
|
||||
private final transient AtomicCache<Color> cacheColor = new AtomicCache<>();
|
||||
private final transient AtomicCache<Color> cacheColorObjectDensity = new AtomicCache<>();
|
||||
private final transient AtomicCache<Color> cacheColorDecoratorLoad = new AtomicCache<>();
|
||||
private final transient AtomicCache<Color> cacheColorLayerLoad = new AtomicCache<>();
|
||||
private final transient AtomicCache<Color> cacheColorDepositLoad = new AtomicCache<>();
|
||||
private final transient AtomicCache<CNG> childrenCell = new AtomicCache<>();
|
||||
private final transient AtomicCache<CNG> biomeGenerator = new AtomicCache<>();
|
||||
@@ -688,31 +685,6 @@ public class IrisBiome extends IrisRegistrant implements IRare {
|
||||
}
|
||||
});
|
||||
}
|
||||
case OBJECT_LOAD -> {
|
||||
return cacheColorObjectDensity.aquire(() -> {
|
||||
double density = 0;
|
||||
|
||||
for (IrisObjectPlacement i : getObjects()) {
|
||||
density += i.getDensity() * i.getChance();
|
||||
}
|
||||
|
||||
return Color.getHSBColor(0.225f, (float) (density / engine.getMaxBiomeObjectDensity()), 1f);
|
||||
});
|
||||
}
|
||||
case DECORATOR_LOAD -> {
|
||||
return cacheColorDecoratorLoad.aquire(() -> {
|
||||
double density = 0;
|
||||
|
||||
for (IrisDecorator i : getDecorators()) {
|
||||
density += i.getChance() * Math.min(1, i.getStackMax()) * 256;
|
||||
}
|
||||
|
||||
return Color.getHSBColor(0.41f, (float) (density / engine.getMaxBiomeDecoratorDensity()), 1f);
|
||||
});
|
||||
}
|
||||
case LAYER_LOAD -> {
|
||||
return cacheColorLayerLoad.aquire(() -> Color.getHSBColor(0.625f, (float) (getLayers().size() / engine.getMaxBiomeLayerDensity()), 1f));
|
||||
}
|
||||
}
|
||||
|
||||
return Color.black;
|
||||
|
||||
Reference in new issue
Block a user