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

Fix text renderer

Browse Source
This commit is contained in:
Daniel Mills 2020-08-31 16:20:24 -04:00
parent 57cb8d5bda
commit 8c0cbfe93a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java
View File

@ -226,7 +226,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
return getParallaxChunk(x >> 4, z >> 4).getStructure(this, y); return getParallaxChunk(x >> 4, z >> 4).getStructure(this, y);
} }
protected void onGenerateParallax(RNG random, int x, int z) protected void onGenerateParallax(RNG randomx, int x, int z)
{ {
String key = "par." + x + "." + z; String key = "par." + x + "." + z;
ChunkPosition rad = getDimension().getParallaxSize(this); ChunkPosition rad = getDimension().getParallaxSize(this);
@ -240,6 +240,8 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
{ {
int j = jj; int j = jj;
RNG random = getMasterRandom().nextParallelRNG(i).nextParallelRNG(j);
if(isParallaxGenerated(ii, jj)) if(isParallaxGenerated(ii, jj))
{ {
continue; continue;
@ -254,7 +256,6 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
{ {
IrisBiome b = sampleTrueBiome((i * 16) + 7, (j * 16) + 7).getBiome(); IrisBiome b = sampleTrueBiome((i * 16) + 7, (j * 16) + 7).getBiome();
RNG ro = getMasterRandom().nextParallelRNG(496888 + i + j); RNG ro = getMasterRandom().nextParallelRNG(496888 + i + j);
int g = 1; int g = 1;
searching: for(IrisBiomeMutation k : getDimension().getMutations()) searching: for(IrisBiomeMutation k : getDimension().getMutations())
@ -294,7 +295,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
lockq.lock(); lockq.lock();
q.add(() -> q.add(() ->
{ {
k.place(this, random.nextParallelRNG(-7228), i, j); k.place(this, random.nextParallelRNG(-7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j);
}); });
lockq.unlock(); lockq.unlock();
} }
@ -304,7 +305,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
lockq.lock(); lockq.lock();
q.add(() -> q.add(() ->
{ {
k.place(this, random.nextParallelRNG(-4228), i, j); k.place(this, random.nextParallelRNG(-4228 + -7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j);
}); });
lockq.unlock(); lockq.unlock();
} }
@ -314,7 +315,7 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple
lockq.lock(); lockq.lock();
q.add(() -> q.add(() ->
{ {
k.place(this, random.nextParallelRNG(-22228), i, j); k.place(this, random.nextParallelRNG(-22228 + -4228 + -7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j);
}); });
lockq.unlock(); lockq.unlock();
} }

13
src/main/java/com/volmit/iris/object/IrisTextPlacement.java
View File

@ -1,6 +1,5 @@
package com.volmit.iris.object; package com.volmit.iris.object;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.ParallaxChunkGenerator; import com.volmit.iris.gen.ParallaxChunkGenerator;
import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.gen.atomics.AtomicCache;
import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.ArrayType;
@ -107,16 +106,16 @@ public class IrisTextPlacement
return m; return m;
} }
public void place(ParallaxChunkGenerator g, RNG rngf, int x, int z) public void place(ParallaxChunkGenerator g, RNG rng, int x, int z)
{ {
RNG rngg = rngf.nextParallelRNG(x).nextParallelRNG(z); int tr = getConfig().getTriesForChunk(rng);
for(int i = 0; i < getConfig().getTriesForChunk(rngg); i++)
for(int i = 0; i < tr; i++)
{ {
RNG rng = rngg.nextParallelRNG((i * 3 + 8) - 23040); rng = rng.nextParallelRNG((i * 3 + 8) - 23040);
int xb = (x * 16) + rng.nextInt(16); int xb = (x * 16) + rng.nextInt(16);
int zb = (z * 16) + rng.nextInt(16); int zb = (z * 16) + rng.nextInt(16);
Iris.info("Placing at " + xb + " " + zb); getRender().get(rng.nextInt(getRender().size())).place(g, rng, getConfig(), xb, zb);
getRender().get(rng.nextInt(getRender().size())).place(g, rngg, getConfig(), xb, zb);
} }
} }
} }