wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add render source flag debug mode & fix sparse source to render source transform bug

Browse Source
This commit is contained in:
TomTheFurry
2022-09-19 12:28:39 +08:00
parent b4ea8854a8
commit 4158573129
10 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/seibel/lod/api/enums/rendering/EDebugMode.java
+15 -3
View File
@@ -28,6 +28,8 @@ package com.seibel.lod.api.enums.rendering;
* SHOW_GENMODE_WIREFRAME, <br>
* SHOW_OVERLAPPING_QUADS, <br>
* SHOW_OVERLAPPING_QUADS_WIREFRAME, <br>
* SHOW_RENDER_SOURCE_FLAG, <br>
* SHOW_RENDER_SOURCE_FLAG_WIREFRAME, <br>
*
* @author Leetom
* @author James Seibel
@@ -62,8 +64,14 @@ public enum EDebugMode
SHOW_OVERLAPPING_QUADS,
/** Only draw overlapping LOD quads, and draws in wireframe. */
SHOW_OVERLAPPING_QUADS_WIREFRAME;
SHOW_OVERLAPPING_QUADS_WIREFRAME,
/** LOD colors are based on renderSource flags. */
SHOW_RENDER_SOURCE_FLAG,
/** LOD colors are based on renderSource flags, and draws in wireframe. */
SHOW_RENDER_SOURCE_FLAG_WIREFRAME;
/** returns the next debug mode */
// Deprecated: use DebugMode.next() instead
@Deprecated
@@ -81,13 +89,17 @@ public enum EDebugMode
case SHOW_GENMODE: return SHOW_GENMODE_WIREFRAME;
case SHOW_GENMODE_WIREFRAME: return SHOW_OVERLAPPING_QUADS;
case SHOW_OVERLAPPING_QUADS: return SHOW_OVERLAPPING_QUADS_WIREFRAME;
case SHOW_OVERLAPPING_QUADS_WIREFRAME: return SHOW_RENDER_SOURCE_FLAG;
case SHOW_RENDER_SOURCE_FLAG: return SHOW_RENDER_SOURCE_FLAG_WIREFRAME;
default: return OFF;
}
}
public static EDebugMode previous(EDebugMode type) {
switch (type) {
case OFF: return SHOW_OVERLAPPING_QUADS_WIREFRAME;
case OFF: return SHOW_RENDER_SOURCE_FLAG_WIREFRAME;
case SHOW_RENDER_SOURCE_FLAG_WIREFRAME: return SHOW_RENDER_SOURCE_FLAG;
case SHOW_RENDER_SOURCE_FLAG: return SHOW_OVERLAPPING_QUADS_WIREFRAME;
case SHOW_OVERLAPPING_QUADS_WIREFRAME: return SHOW_OVERLAPPING_QUADS;
case SHOW_OVERLAPPING_QUADS: return SHOW_GENMODE_WIREFRAME;
case SHOW_GENMODE_WIREFRAME: return SHOW_GENMODE;
core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java
+30
View File
@@ -15,6 +15,7 @@ import com.seibel.lod.core.level.ILevel;
import com.seibel.lod.core.render.LodQuadTree;
import com.seibel.lod.core.render.LodRenderSection;
import com.seibel.lod.core.datatype.LodRenderSource;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.objects.Reference;
import com.seibel.lod.core.util.LodUtil;
import org.apache.logging.log4j.Logger;
@@ -45,6 +46,31 @@ public class ColumnRenderSource implements LodRenderSource, IColumnDatatype {
public final long[] dataContainer;
public final int[] airDataContainer;
public enum DebugSourceFlag {
FULL(ColorUtil.BLUE),
DIRECT(ColorUtil.WHITE),
SPARSE(ColorUtil.YELLOW),
FILE(ColorUtil.BROWN);
public final int color;
DebugSourceFlag(int color) {
this.color = color;
}
}
public final DebugSourceFlag[] debugSourceFlags;
public void debugFillFlag(int ox, int oz, int w, int h, DebugSourceFlag flag) {
for (int x = ox; x < ox + w; x++) {
for (int z = oz; z < oz + h; z++) {
debugSourceFlags[x * SECTION_SIZE + z] = flag;
}
}
}
public DebugSourceFlag debugGetFlag(int ox, int oz) {
return debugSourceFlags[ox * SECTION_SIZE + oz];
}
private boolean isEmpty = true;
/**
@@ -55,6 +81,7 @@ public class ColumnRenderSource implements LodRenderSource, IColumnDatatype {
verticalSize = maxVerticalSize;
dataContainer = new long[SECTION_SIZE * SECTION_SIZE * verticalSize];
airDataContainer = new int[AIR_SECTION_SIZE * AIR_SECTION_SIZE * verticalSize];
debugSourceFlags = new DebugSourceFlag[SECTION_SIZE * SECTION_SIZE];
this.sectionPos = sectionPos;
this.yOffset = yOffset;
}
@@ -98,6 +125,8 @@ public class ColumnRenderSource implements LodRenderSource, IColumnDatatype {
verticalSize = inputData.readByte() & 0b01111111;
dataContainer = loadData(inputData, version, verticalSize);
airDataContainer = new int[AIR_SECTION_SIZE * AIR_SECTION_SIZE * verticalSize];
debugSourceFlags = new DebugSourceFlag[SECTION_SIZE * SECTION_SIZE];
debugFillFlag(0, 0, SECTION_SIZE, SECTION_SIZE, DebugSourceFlag.FILE);
}
@Override
@@ -381,6 +410,7 @@ public class ColumnRenderSource implements LodRenderSource, IColumnDatatype {
if (genMode <= srcGenMode) {
new ColumnArrayView(dataContainer, verticalSize, i, verticalSize).copyFrom(
new ColumnArrayView(src.dataContainer, verticalSize, i, verticalSize));
debugSourceFlags[i/verticalSize] = src.debugSourceFlags[i/verticalSize];
}
}
}
core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java
+2 -1
View File
@@ -302,6 +302,7 @@ public class ColumnRenderBuffer extends RenderBuffer {
if (posData.size() == 0 || !ColumnFormat.doesItExist(posData.get(0))
|| ColumnFormat.isVoid(posData.get(0)))
continue;
ColumnRenderSource.DebugSourceFlag debugSourceFlag = region.debugGetFlag(x, z);
ColumnArrayView[][] adjData = new ColumnArrayView[4][];
// We extract the adj data in the four cardinal direction
@@ -381,7 +382,7 @@ public class ColumnRenderBuffer extends RenderBuffer {
long adjDataBot = i + 1 < posData.size() ? posData.get(i + 1) : ColumnFormat.EMPTY_DATA;
CubicLodTemplate.addLodToBuffer(data, adjDataTop, adjDataBot, adjData, detailLevel,
x, z, quadBuilder, debugMode);
x, z, quadBuilder, debugMode, debugSourceFlag);
}
}
}
core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java
+10 -1
View File
@@ -19,6 +19,7 @@
package com.seibel.lod.core.datatype.column.render;
import com.seibel.lod.core.datatype.column.ColumnRenderSource;
import com.seibel.lod.core.datatype.column.accessor.ColumnFormat;
import com.seibel.lod.api.enums.rendering.EDebugMode;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
@@ -38,7 +39,8 @@ public class CubicLodTemplate
private static final ILodConfigWrapperSingleton CONFIG = SingletonInjector.INSTANCE.get(ILodConfigWrapperSingleton.class);
public static void addLodToBuffer(long data, long topData, long botData, ColumnArrayView[][] adjData, byte detailLevel, int offsetPosX, int offsetOosZ, LodQuadBuilder quadBuilder, EDebugMode debugging)
public static void addLodToBuffer(long data, long topData, long botData, ColumnArrayView[][] adjData,
byte detailLevel, int offsetPosX, int offsetOosZ, LodQuadBuilder quadBuilder, EDebugMode debugging, ColumnRenderSource.DebugSourceFlag debugSource)
{
short width = (short) (1 << detailLevel);
short x = (short) LevelPosUtil.convert(detailLevel, offsetPosX, LodUtil.BLOCK_DETAIL_LEVEL);
@@ -92,6 +94,13 @@ public class CubicLodTemplate
fullBright = true;
break;
}
case SHOW_RENDER_SOURCE_FLAG:
case SHOW_RENDER_SOURCE_FLAG_WIREFRAME:
{
color = debugSource == null ? ColorUtil.RED : debugSource.color;
fullBright = true;
break;
}
default:
throw new IllegalArgumentException("Unknown debug mode: " + debugging);
}
core/src/main/java/com/seibel/lod/core/datatype/full/IdBiomeBlockStateMap.java
+7 -7
View File
@@ -98,12 +98,12 @@ public class IdBiomeBlockStateMap {
@Override
public boolean equals(Object other) {
if (other == this) return true;
if (!(other instanceof IdBiomeBlockStateMap)) return false;
IdBiomeBlockStateMap otherMap = (IdBiomeBlockStateMap) other;
if (entries.size() != otherMap.entries.size()) return false;
for (int i=0; i<entries.size(); i++) {
if (!entries.get(i).equals(otherMap.entries.get(i))) return false;
}
return true;
// if (!(other instanceof IdBiomeBlockStateMap)) return false;
// IdBiomeBlockStateMap otherMap = (IdBiomeBlockStateMap) other;
// if (entries.size() != otherMap.entries.size()) return false;
// for (int i=0; i<entries.size(); i++) {
// if (!entries.get(i).equals(otherMap.entries.get(i))) return false;
// }
return false;
}
}
core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataSource.java
+2 -5
View File
@@ -242,14 +242,11 @@ public class SparseDataSource implements LodDataSource {
if (end != 0xFFFFFFFF) throw new IOException("invalid header end guard");
int length = dos.readInt();
if (length <= 0 || length > chunks*chunks/8+64)
if (length < 0 || length > (chunks*chunks/8+64)*2)
throw new IOException(LodUtil.formatLog("Sparse Flag BitSet size outside reasonable range: {} (expects {} to {})",
length, 1, chunks*chunks/8+63));
byte[] bytes = dos.readNBytes(length);
BitSet set = BitSet.valueOf(bytes);
if (set.size() < chunks*chunks)
throw new IOException((LodUtil.formatLog("Sparse Flag BitSet too small: {} != {}*{}",
set.size(), chunks, chunks)));
long[][][] dataChunks = new long[chunks*chunks][][];
@@ -332,6 +329,6 @@ public class SparseDataSource implements LodDataSource {
int chunkZ = z / dataPerChunk;
FullArrayView chunk = sparseData[chunkX * chunks + chunkZ];
if (chunk == null) return null;
return chunk.get(chunkX % dataPerChunk, chunkZ % dataPerChunk);
return chunk.get(x % dataPerChunk, z % dataPerChunk);
}
}
core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java
+4
View File
@@ -45,6 +45,7 @@ public class FullToColumnTransformer {
if (fullArrayView.doesItExist()) LodUtil.assertTrue(columnSource.doesItExist(x, z));
}
}
columnSource.debugFillFlag(0, 0, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.DebugSourceFlag.FULL);
// } else if (dataDetail == 0 && columnSource.getDataDetail() > dataDetail) {
// byte deltaDetail = (byte) (columnSource.getDataDetail() - dataDetail);
// int perColumnWidth = 1 << deltaDetail;
@@ -82,6 +83,7 @@ public class FullToColumnTransformer {
if (fullArrayView == null) continue;
ColumnArrayView columnArrayView = columnSource.getVerticalDataView(x, z);
convertColumnData(level, baseX + x, baseZ + z, columnArrayView, fullArrayView, 1);
columnSource.debugFillFlag(x, z, 1, 1, ColumnRenderSource.DebugSourceFlag.SPARSE);
if (fullArrayView.doesItExist()) LodUtil.assertTrue(columnSource.doesItExist(x, z));
}
}
@@ -117,6 +119,7 @@ public class FullToColumnTransformer {
if (fullArrayView.doesItExist()) LodUtil.assertTrue(render.doesItExist(renderOffsetX + x, renderOffsetZ + z));
}
}
render.debugFillFlag(renderOffsetX, renderOffsetZ, 16, 16, ColumnRenderSource.DebugSourceFlag.DIRECT);
} else {
final int dataPerRender = 1 << (render.getDataDetail() - data.dataDetail);
final int dataSize = 16 / dataPerRender;
@@ -141,6 +144,7 @@ public class FullToColumnTransformer {
downSampledArrayView.mergeMultiDataFrom(tempQuadView);
}
}
render.debugFillFlag(renderOffsetX, renderOffsetZ, dataSize, dataSize, ColumnRenderSource.DebugSourceFlag.DIRECT);
}
}
core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class LodQuadTree implements AutoCloseable {
for (byte i = LAYER_BEGINNING_OFFSET; i < numbersOfSectionLevels; i++) {
byte targetDataDetail = getLayerDataDetail(i);
int maxDist = getFurthestDistance(targetDataDetail);
int halfSize = MathUtil.ceilDiv(maxDist, (1 << i)) + 2; // +2 to make sure the section is fully contained in the ringList
int halfSize = MathUtil.ceilDiv(maxDist, (1 << i)) + 8; // +8 to make sure the section is fully contained in the ringList
{
DhSectionPos checkerPos = new DhSectionPos(i, halfSize, halfSize);
byte checkedDetail = calculateExpectedDetailLevel(new DhBlockPos2D(initialPlayerX, initialPlayerZ),checkerPos);
core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java
+2 -1
View File
@@ -163,7 +163,8 @@ public class LodRenderer
if (debugModeConfig.get() == EDebugMode.SHOW_DETAIL_WIREFRAME
|| debugModeConfig.get() == EDebugMode.SHOW_GENMODE_WIREFRAME
|| debugModeConfig.get() == EDebugMode.SHOW_WIREFRAME
|| debugModeConfig.get() == EDebugMode.SHOW_OVERLAPPING_QUADS_WIREFRAME) {
|| debugModeConfig.get() == EDebugMode.SHOW_OVERLAPPING_QUADS_WIREFRAME
|| debugModeConfig.get() == EDebugMode.SHOW_RENDER_SOURCE_FLAG_WIREFRAME) {
GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_LINE);
//GL32.glDisable(GL32.GL_CULL_FACE);
}
core/src/main/java/com/seibel/lod/core/util/ColorUtil.java
+12 -1
View File
@@ -35,8 +35,19 @@ public class ColorUtil
public static final int BLACK = rgbToInt(0,0,0);
public static final int WHITE = rgbToInt(255,255,255);
public static final int TRANSPARENT = rgbToInt(0, 0, 0, 0);
public static final int RED = rgbToInt(255,0,0);
public static final int GREEN = rgbToInt(0,255,0);
public static final int BLUE = rgbToInt(0,0,255);
public static final int YELLOW = rgbToInt(255,255,0);
public static final int CYAN = rgbToInt(0,255,255);
public static final int MAGENTA = rgbToInt(255,0,255);
public static final int ORANGE = rgbToInt(255,128,0);
public static final int PINK = rgbToInt(255,128,128);
public static final int GRAY = rgbToInt(128,128,128);
public static final int LIGHT_GRAY = rgbToInt(192,192,192);
public static final int DARK_GRAY = rgbToInt(64,64,64);
public static final int BROWN = rgbToInt(128,64,0);
public static final int PURPLE = rgbToInt(128,0,128);
public static int rgbToInt(int red, int green, int blue)
{