mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-25 13:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:

Browse Source 
- Replaced IrisGeneratorStyle.create with createNoCache in IrisDecorator
- Removed @ExpectedToFailUntilFixed from the IrisDecorator test

Ref.: https://github.com/VolmitSoftware/Iris/issues/1251
This commit is contained in:
CeeVeeR committed 2026-10-02 12:17:57 +02:00
1 parent 700dc53559
commit 00601678d9
2 files changed
+1 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/art/arcane/iris/generation/decoration/IrisDecorator.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class IrisDecorator {
} }
private CNG createVarianceGenerator(RNG rng, IrisData data) { private CNG createVarianceGenerator(RNG rng, IrisData data) {
return variance.create(deriveVarianceSeed(rng, data), data).scale(1D / variance.getZoom()); return variance.createNoCache(deriveVarianceSeed(rng, data), data).scale(1D / variance.getZoom());
} }
RNG deriveVarianceSeed(RNG rng, IrisData data) { RNG deriveVarianceSeed(RNG rng, IrisData data) {
core/src/test/java/art/arcane/iris/generation/decoration/IrisDecoratorVarianceGeneratorTest.java
-10
View File
@@ -4,21 +4,15 @@ import art.arcane.iris.generation.block.IrisBlockData;
import art.arcane.iris.generation.noise.IrisGeneratorStyle; import art.arcane.iris.generation.noise.IrisGeneratorStyle;
import art.arcane.iris.generation.noise.NoiseStyle; import art.arcane.iris.generation.noise.NoiseStyle;
import art.arcane.iris.pack.loading.IrisData; import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.testsupport.ExpectedToFailUntilFixed;
import art.arcane.iris.testsupport.ExpectedToFailUntilFixedRule;
import art.arcane.iris.testsupport.RunningEnginePackData; import art.arcane.iris.testsupport.RunningEnginePackData;
import art.arcane.volmlib.util.collection.KList; import art.arcane.volmlib.util.collection.KList;
import art.arcane.volmlib.util.math.RNG; import art.arcane.volmlib.util.math.RNG;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks; import static art.arcane.iris.testsupport.GeneratorSampling.sampleAtBlocks;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
public class IrisDecoratorVarianceGeneratorTest { public class IrisDecoratorVarianceGeneratorTest {
private static final String SHARED_VARIANCE_STYLE_GENERATOR_BUG =
"IrisDecorator scales the shared variance style generator instead of its own. "
+ "Ref.: https://github.com/VolmitSoftware/Iris/issues/1251";
private static final long WORLD_SEED = 7L; private static final long WORLD_SEED = 7L;
private static final double VARIANCE_ZOOM = 4D; private static final double VARIANCE_ZOOM = 4D;
private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}}; private static final double[][] SAMPLE_BLOCKS = {{1000D, -2000D}, {12.5D, -7.25D}, {-517D, 333D}};
@@ -26,10 +20,6 @@ public class IrisDecoratorVarianceGeneratorTest {
private final IrisData packData = RunningEnginePackData.create(); private final IrisData packData = RunningEnginePackData.create();
private final IrisDecorator decorator = createDecoratorWithZoomedSimplexVariance(); private final IrisDecorator decorator = createDecoratorWithZoomedSimplexVariance();
@Rule
public final ExpectedToFailUntilFixedRule expectedFailures = new ExpectedToFailUntilFixedRule();
@ExpectedToFailUntilFixed(SHARED_VARIANCE_STYLE_GENERATOR_BUG)
@Test @Test
public void doesBuildingTheVarianceGeneratorLeaveTheSharedVarianceStyleGeneratorUnscaled() { public void doesBuildingTheVarianceGeneratorLeaveTheSharedVarianceStyleGeneratorUnscaled() {
assertArrayEquals(sampleUntouchedSharedVarianceStyleGenerator(), sampleSharedVarianceStyleGeneratorAfterVarianceBuilt(), 0D); assertArrayEquals(sampleUntouchedSharedVarianceStyleGenerator(), sampleSharedVarianceStyleGeneratorAfterVarianceBuilt(), 0D);