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

fIXES

Browse Source
This commit is contained in:
Daniel Mills 2020-01-08 14:20:42 -05:00
parent 431eea9152
commit ce8127456c
6 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ninja/bytecode/iris/CommandIris.java
View File

@ -37,11 +37,9 @@ public class CommandIris implements CommandExecutor
if(args[0].equalsIgnoreCase("timings")) if(args[0].equalsIgnoreCase("timings"))
{ {
double t = Iris.profiler.getResult("terrain").getAverage(); double t = Iris.profiler.getResult("terrain").getAverage();
double c = Iris.profiler.getResult("caves").getAverage();
double d = Iris.profiler.getResult("decor").getAverage(); double d = Iris.profiler.getResult("decor").getAverage();
msg(sender, "Generation: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t + d, 2)); msg(sender, "Generation: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t + d, 2));
msg(sender, " \\Terrain: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t, 2)); msg(sender, " \\Terrain: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(t, 2));
msg(sender, " \\Caves: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(c, 2));
msg(sender, " \\Decor: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(d, 2)); msg(sender, " \\Decor: " + ChatColor.BOLD + ChatColor.WHITE + F.duration(d, 2));
} }

2
src/main/java/ninja/bytecode/iris/Settings.java
View File

@ -32,7 +32,7 @@ public class Settings
public double superHeightScale = 0.95; public double superHeightScale = 0.95;
public double baseHeight = 0.165; public double baseHeight = 0.165;
public int seaLevel = 63; public int seaLevel = 63;
public double caveDensity = 1; public double caveDensity = 0;
public double biomeScale = 2; public double biomeScale = 2;
public boolean flatBedrock = false; public boolean flatBedrock = false;
public boolean doSchematics = true; public boolean doSchematics = true;

2
src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java
View File

@ -206,7 +206,7 @@ public class IrisGenerator extends ParallelChunkGenerator
setBlock(x, i, z, mb.material, mb.data); setBlock(x, i, z, mb.material, mb.data);
} }
plan.caveMs(glCaves.genCaves(wxx, wzx, x, z, height, this)); glCaves.genCaves(wxx, wzx, x, z, height, this);
return biome.getRealBiome(); return biome.getRealBiome();
} }

6
src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java
View File

@ -9,7 +9,6 @@ import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.generator.IrisGenerator;
import ninja.bytecode.iris.util.GenLayer; import ninja.bytecode.iris.util.GenLayer;
import ninja.bytecode.iris.util.MaxingGenerator; import ninja.bytecode.iris.util.MaxingGenerator;
import ninja.bytecode.shuriken.bench.PrecisionStopwatch;
import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.CNG;
import ninja.bytecode.shuriken.math.RNG; import ninja.bytecode.shuriken.math.RNG;
@ -30,9 +29,8 @@ public class GenLayerCaves extends GenLayer
} }
public double genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g) public void genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g)
{ {
PrecisionStopwatch p = PrecisionStopwatch.start();
for(double itr = 0; itr < 0.1 * Iris.settings.gen.caveDensity; itr += 0.1) for(double itr = 0; itr < 0.1 * Iris.settings.gen.caveDensity; itr += 0.1)
{ {
double thickness = 0.25 + itr + (0.5 * caveClamp.noise(wxx, wzx)); double thickness = 0.25 + itr + (0.5 * caveClamp.noise(wxx, wzx));
@ -71,8 +69,6 @@ public class GenLayerCaves extends GenLayer
} }
} }
return p.getMilliseconds();
} }
@Override @Override

11
src/main/java/ninja/bytecode/iris/util/ChunkPlan.java
View File

@ -13,7 +13,6 @@ public class ChunkPlan
private final GMap<ChunkedVector, Double> heightCache; private final GMap<ChunkedVector, Double> heightCache;
private final GMap<ChunkedVector, IrisBiome> biomeCache; private final GMap<ChunkedVector, IrisBiome> biomeCache;
private final GMap<BlockVector, Schematic> schematics; private final GMap<BlockVector, Schematic> schematics;
private double caveMs;
public ChunkPlan() public ChunkPlan()
{ {
@ -22,11 +21,6 @@ public class ChunkPlan
this.biomeCache = new GMap<>(); this.biomeCache = new GMap<>();
} }
public double getCaveMs()
{
return caveMs;
}
public void planSchematic(BlockVector b, Schematic s) public void planSchematic(BlockVector b, Schematic s)
{ {
schematics.put(b, s); schematics.put(b, s);
@ -74,9 +68,4 @@ public class ChunkPlan
{ {
setHeight(new ChunkedVector(x, z), h); setHeight(new ChunkedVector(x, z), h);
} }
public void caveMs(double genCaves)
{
caveMs += genCaves;
}
} }

2
src/main/java/ninja/bytecode/iris/util/ParallelChunkGenerator.java
View File

@ -8,7 +8,6 @@ import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator;
import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.Iris;
import ninja.bytecode.shuriken.Shuriken;
import ninja.bytecode.shuriken.execution.ChronoLatch; import ninja.bytecode.shuriken.execution.ChronoLatch;
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup;
import ninja.bytecode.shuriken.execution.TaskExecutor.TaskResult; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskResult;
@ -75,7 +74,6 @@ public abstract class ParallelChunkGenerator extends ChunkGenerator
TaskResult r = tg.execute(); TaskResult r = tg.execute();
onPostChunk(world, x, z, random, data, plan.get()); onPostChunk(world, x, z, random, data, plan.get());
rs.put(r.timeElapsed); rs.put(r.timeElapsed);
Iris.profiler.getResult("caves").put(plan.get().getCaveMs());
cg++; cg++;
} }