Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More lighting fixes

Browse Source
This commit is contained in:
Jesse Boyd 2016-11-28 17:19:23 +11:00
parent 8122c9d415
commit 57a2bd73dd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
5 changed files with 88 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java
View File

@ -394,6 +394,9 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, SECTION> extends FaweQueue {
int cx = x >> 4;
int cz = z >> 4;
int cy = y >> 4;
if (y >= FaweChunk.HEIGHT) {
return 15;
}
if (cx != lastChunkX || cz != lastChunkZ) {
lastChunkX = cx;
lastChunkZ = cz;
@ -404,12 +407,12 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, SECTION> extends FaweQueue {
lastSection = getCachedSection(lastChunkSections, cy);
} else if (cy != lastChunkY) {
if (lastChunkSections == null) {
return 0;
return getSkyLight(x, y + 16, z);
}
lastSection = getCachedSection(lastChunkSections, cy);
}
if (lastSection == null) {
return 0;
return getSkyLight(x, y + 16, z);
}
return getSkyLight(lastSection, x, y, z);
}

20
core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
View File

@ -70,12 +70,22 @@ public abstract class NMSMappedFaweQueue<WORLD, CHUNK, CHUNKSECTION, SECTION> ex
}
CharFaweChunk cfc = (CharFaweChunk) chunk;
boolean relight = false;
boolean[] fix = new boolean[(maxY + 1) >> 4];
byte[] fix = new byte[(maxY + 1) >> 4];
boolean sky = hasSky();
for (int i = 0; i < cfc.ids.length; i++) {
if ((sky && ((cfc.getAir(i) & 4095) != 0 || (cfc.getCount(i) & 4095) != 0))) {
relight = true;
fix[i] = true;
if (sky) {
for (int i = cfc.ids.length - 1; i >= 0; i--) {
int air = cfc.getAir(i);
int solid = cfc.getCount(i);
if (air == 4096) {
fix[i] = Relighter.SkipReason.AIR;
} else if (air == 0 && solid == 4096) {
fix[i] = Relighter.SkipReason.SOLID;
} else if (solid == 0 && relight == false) {
fix[i] = Relighter.SkipReason.AIR;
} else {
fix[i] = Relighter.SkipReason.NONE;
relight = true;
}
}
}
if (relight) {

92
core/src/main/java/com/boydti/fawe/example/NMSRelighter.java
View File

@ -46,7 +46,7 @@ public class NMSRelighter implements Relighter{
return skyToRelight.isEmpty() && lightQueue.isEmpty();
}
public boolean addChunk(int cx, int cz, boolean[] fix, int bitmask) {
public boolean addChunk(int cx, int cz, byte[] fix, int bitmask) {
long pair = MathMan.pairInt(cx, cz);
RelightSkyEntry toPut = new RelightSkyEntry(cx, cz, fix, bitmask);
RelightSkyEntry existing = skyToRelight.put(pair, toPut);
@ -54,7 +54,7 @@ public class NMSRelighter implements Relighter{
toPut.bitmask |= existing.bitmask;
if (fix != null) {
for (int i = 0; i < fix.length; i++) {
toPut.fix[i] |= existing.fix[i];
toPut.fix[i] &= existing.fix[i];
}
}
}
@ -62,7 +62,11 @@ public class NMSRelighter implements Relighter{
}
public void removeLighting() {
for (Map.Entry<Long, RelightSkyEntry> entry : skyToRelight.entrySet()) {
Iterator<Map.Entry<Long, RelightSkyEntry>> iter = skyToRelight.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<Long, RelightSkyEntry> entry = iter.next();
iter.remove();
chunksToSend.add(entry.getKey());
RelightSkyEntry chunk = entry.getValue();
queue.ensureChunkLoaded(chunk.x, chunk.z);
Object sections = queue.getCachedSections(queue.getWorld(), chunk.x, chunk.z);
@ -255,6 +259,29 @@ public class NMSRelighter implements Relighter{
}
}
public void fill(byte[] mask, int chunkX, int y, int chunkZ, byte reason) {
if (y >= FaweChunk.HEIGHT) {
Arrays.fill(mask, (byte) 15);
return;
}
switch (reason) {
case SkipReason.SOLID: {
Arrays.fill(mask, (byte) 0);
return;
}
case SkipReason.AIR: {
int bx = chunkX << 4;
int bz = chunkZ << 4;
int index = 0;
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
mask[index++] = (byte) queue.getSkyLight(bx + x, y, bz + z);
}
}
}
}
}
private void fixSkyLighting(List<RelightSkyEntry> sorted) {
RelightSkyEntry[] chunks = sorted.toArray(new RelightSkyEntry[sorted.size()]);
byte[] cacheX = FaweCache.CACHE_X[0];
@ -262,10 +289,15 @@ public class NMSRelighter implements Relighter{
for (int y = FaweChunk.HEIGHT - 1; y > 0; y--) {
for (RelightSkyEntry chunk : chunks) { // Propogate skylight
int layer = y >> 4;
if (!chunk.fix[layer])continue;
byte[] mask = chunk.mask;
if (chunk.fix[layer] != SkipReason.NONE) {
if ((y & 15) == 0 && layer != 0 && chunk.fix[layer - 1] == SkipReason.NONE) {
fill(mask, chunk.x, y, chunk.z, chunk.fix[layer]);
}
continue;
}
int bx = chunk.x << 4;
int bz = chunk.z << 4;
byte[] mask = chunk.mask;
queue.ensureChunkLoaded(chunk.x, chunk.z);
Object sections = queue.getCachedSections(queue.getWorld(), chunk.x, chunk.z);
if (sections == null)continue;
@ -290,30 +322,22 @@ public class NMSRelighter implements Relighter{
continue;
}
break;
case 2:
case 4:
case 6:
case 8:
case 10:
case 12:
case 14:
// if (opacity == 0) {
// mask[j] = --value;
// } else {
// mask[j] = (byte) Math.max(0, value - opacity);
// }
// queue.setSkyLight(section, x, y, z, value);
// continue;
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
case 11:
case 12:
case 13:
case 14:
if (opacity >= value) {
mask[j] = 0;
queue.setBlockLight(section, x, y, z, 0);
queue.setSkyLight(section, x, y, z, 0);
continue;
}
@ -347,7 +371,6 @@ public class NMSRelighter implements Relighter{
}
}
}
}
public void smoothSkyLight(RelightSkyEntry chunk, int y, boolean direction) {
@ -360,7 +383,7 @@ public class NMSRelighter implements Relighter{
Object section = queue.getCachedSection(sections, y >> 4);
if (section == null) return;
if (direction) {
for (int j = 0; j <= maxY; j++) {
for (int j = 0; j < 256; j++) {
int x = j & 15;
int z = j >> 4;
if (mask[j] >= 14 || (mask[j] == 0 && queue.getOpacity(section, x, y, z) > 1)) {
@ -372,7 +395,7 @@ public class NMSRelighter implements Relighter{
if (value > mask[j]) queue.setSkyLight(section, x, y, z, mask[j] = value);
}
} else {
for (int j = maxY; j >= 0; j--) {
for (int j = 255; j >= 0; j--) {
int x = j & 15;
int z = j >> 4;
if (mask[j] >= 14 || (mask[j] == 0 && queue.getOpacity(section, x, y, z) > 1)) {
@ -415,11 +438,11 @@ public class NMSRelighter implements Relighter{
public final int x;
public final int z;
public final byte[] mask;
public final boolean[] fix;
public final byte[] fix;
public int bitmask;
public boolean smooth;
public RelightSkyEntry(int x, int z, boolean[] fix, int bitmask) {
public RelightSkyEntry(int x, int z, byte[] fix, int bitmask) {
this.x = x;
this.z = z;
byte[] array = new byte[maxY + 1];
@ -427,28 +450,33 @@ public class NMSRelighter implements Relighter{
this.mask = array;
this.bitmask = bitmask;
if (fix == null) {
this.fix = new boolean[(maxY + 1) >> 4];
Arrays.fill(this.fix, true);
this.fix = new byte[(maxY + 1) >> 4];
Arrays.fill(this.fix, SkipReason.NONE);
} else {
this.fix = fix;
}
}
@Override
public String toString() {
return x + "," + z;
}
@Override
public int compareTo(Object o) {
RelightSkyEntry other = (RelightSkyEntry) o;
if (other.x < x) {
return -1;
return 1;
}
if (other.x > x) {
return 1;
}
if (other.z < z) {
return -1;
}
if (other.z > z) {
if (other.z < z) {
return 1;
}
if (other.z > z) {
return -1;
}
return 0;
}
}

2
core/src/main/java/com/boydti/fawe/example/NullRelighter.java
View File

@ -7,7 +7,7 @@ public class NullRelighter implements Relighter {
private NullRelighter() {}
@Override
public boolean addChunk(int cx, int cz, boolean[] fix, int bitmask) {
public boolean addChunk(int cx, int cz, byte[] fix, int bitmask) {
return false;
}

8
core/src/main/java/com/boydti/fawe/example/Relighter.java
View File

@ -1,7 +1,7 @@
package com.boydti.fawe.example;
public interface Relighter {
boolean addChunk(int cx, int cz, boolean[] fix, int bitmask);
boolean addChunk(int cx, int cz, byte[] skipReason, int bitmask);
void addLightUpdate(int x, int y, int z);
@ -12,4 +12,10 @@ public interface Relighter {
void fixSkyLighting();
boolean isEmpty();
public static class SkipReason {
public static final byte NONE = 0;
public static final byte AIR = 1;
public static final byte SOLID = 2;
}
}