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

v

Browse Source
This commit is contained in:
Daniel Mills 2020-10-26 04:05:58 -04:00
parent 6e294d1363
commit a33cd35ae8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/gen/v2/IrisTerrainGenerator.java
View File

@ -33,12 +33,12 @@ public class IrisTerrainGenerator
private <V, T> void fill2D(ProceduralStream<T> t, Hunk<V> h, double x, double z, ProceduralStream<V> v) private <V, T> void fill2D(ProceduralStream<T> t, Hunk<V> h, double x, double z, ProceduralStream<V> v)
{ {
t.fill2D(h, x * 16, z * 16, v); t.fill2D(h, x * 16, z * 16, v, 8);
} }
private <V, T> void fill2DYLock(ProceduralStream<T> t, Hunk<V> h, double x, double z, ProceduralStream<V> v) private <V, T> void fill2DYLock(ProceduralStream<T> t, Hunk<V> h, double x, double z, ProceduralStream<V> v)
{ {
t.fill2DYLocked(h, x * 16, z * 16, v); t.fill2DYLocked(h, x * 16, z * 16, v, 8);
} }
public void generateDecorations(int x, int z, Hunk<BlockData> blocks) public void generateDecorations(int x, int z, Hunk<BlockData> blocks)

10
src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/Hunk.java
View File

@ -273,7 +273,7 @@ public interface Hunk<T>
for(j = 0; j < getDepth(); j += d) for(j = 0; j < getDepth(); j += d)
{ {
int jj = j; int jj = j;
getSection(i, 0, j, i + w - 1, getHeight() - 1, j + d - 1, (h, r) -> v.accept(ii, 0, jj, h, r), inserter); getSection(i, 0, j, i + w, getHeight(), j + d, (h, r) -> v.accept(ii, 0, jj, h, r), inserter);
} }
} }
@ -296,7 +296,7 @@ public interface Hunk<T>
for(j = 0; j < getDepth(); j += d) for(j = 0; j < getDepth(); j += d)
{ {
int jj = j; int jj = j;
getAtomicSection(i, 0, j, i + w - 1, getHeight() - 1, j + d - 1, (h) -> v.accept(ii, 0, jj, h)); getAtomicSection(i, 0, j, i + w, getHeight(), j + d, (h) -> v.accept(ii, 0, jj, h));
} }
} }
@ -329,7 +329,7 @@ public interface Hunk<T>
for(k = 0; k < getDepth(); k += d) for(k = 0; k < getDepth(); k += d)
{ {
int kk = k; int kk = k;
getSection(i, j, k, i + w - 1, j + h - 1, k + d - 1, (hh, r) -> v.accept(ii, jj, kk, hh, r), inserter); getSection(i, j, k, i + w, j + h, k + d, (hh, r) -> v.accept(ii, jj, kk, hh, r), inserter);
} }
} }
} }
@ -358,7 +358,7 @@ public interface Hunk<T>
for(k = 0; k < getDepth(); k += d) for(k = 0; k < getDepth(); k += d)
{ {
int kk = k; int kk = k;
getAtomicSection(i, j, k, i + w - 1, j + h - 1, k + d - 1, (hh) -> v.accept(ii, jj, kk, hh)); getAtomicSection(i, j, k, i + w, j + h, k + d, (hh) -> v.accept(ii, jj, kk, hh));
} }
} }
} }
@ -394,7 +394,7 @@ public interface Hunk<T>
default void enforceBounds(int x, int y, int z, int w, int h, int d) default void enforceBounds(int x, int y, int z, int w, int h, int d)
{ {
if(x < 0 || x >= getWidth() || y < 0 || y >= getHeight() || z < 0 || z >= getDepth() || x + w < 0 || x + w >= getWidth() || y + h < 0 || y + h >= getHeight() || z + d < 0 || z + d >= getDepth()) if(x < 0 || x >= getWidth() || y < 0 || y >= getHeight() || z < 0 || z >= getDepth() || x + w < 0 || x + w > getWidth() || y + h < 0 || y + h > getHeight() || z + d < 0 || z + d > getDepth())
{ {
throw new IndexOutOfBoundsException("The hunk " + w + "," + h + "," + d + " with an offset of " + x + "," + y + "," + z + " does not fit within the parent hunk " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")"); throw new IndexOutOfBoundsException("The hunk " + w + "," + h + "," + d + " with an offset of " + x + "," + y + "," + z + " does not fit within the parent hunk " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")");
} }