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

Fix incorrect FullDataSourceV2 downsampling for worldGenStep

Browse Source
This commit is contained in:
James Seibel
2024-03-16 20:54:12 -05:00
parent 6d2912e320
commit ce4c5db5df
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java
+33 -12
View File
@@ -355,7 +355,7 @@ public class FullDataSourceV2 implements IDataSource<IDhLevel>
{
if (inputDataSource.pos.getDetailLevel() + 1 != this.pos.getDetailLevel())
{
throw new IllegalArgumentException("Input data source must be exactly 1 detail level below this data source. Expected ["+(this.pos.getDetailLevel() - 1)+"], received ["+inputDataSource.pos.getDetailLevel()+"].");
throw new IllegalArgumentException("Input data source must be exactly 1 detail level below this data source. Expected [" + (this.pos.getDetailLevel() - 1) + "], received [" + inputDataSource.pos.getDetailLevel() + "].");
}
// input is one detail level lower (higher detail)
@@ -377,35 +377,56 @@ public class FullDataSourceV2 implements IDataSource<IDhLevel>
for (int x = 0; x < WIDTH; x += 2)
{
for (int z = 0; z < WIDTH; z += 2)
{
long[] mergedInputDataArray = mergeInputTwoByTwoDataColumn(inputDataSource, x, z);
// TODO
byte inputGenStep = inputDataSource.columnGenerationSteps[0];
{
int recipientX = (x / 2) + recipientOffsetX;
int recipientZ = (z / 2) + recipientOffsetZ;
int recipientIndex = relativePosToIndex(recipientX, recipientZ);
long[] oldDataArray = this.dataPoints[recipientIndex];
// world gen
byte inputGenStep = determineMinWorldGenStepForTwoByTwoColumn(inputDataSource.columnGenerationSteps, x, z);
this.columnGenerationSteps[recipientIndex] = inputGenStep;
// data points
long[] oldDataArray = this.dataPoints[recipientIndex];
long[] mergedInputDataArray = mergeInputTwoByTwoDataColumn(inputDataSource, x, z);
this.dataPoints[recipientIndex] = mergedInputDataArray;
// mapping
this.remapDataColumn(recipientIndex, remappedIds);
// we only need to see if the data was changed in one column
if (!dataChanged)
{
// needs to be done after the ID's have been remapped otherwise the ID's won't match even if the data is the same
dataChanged = areDataColumnsDifferent(oldDataArray, this.dataPoints[recipientIndex]);
}
this.isEmpty = false;
}
}
return dataChanged;
}
/**
* The minimum value is used because we don't want to accidentally record that
* something was generated when it wasn't.
*/
private static byte determineMinWorldGenStepForTwoByTwoColumn(byte[] columnGenerationSteps, int relX, int relZ)
{
byte minWorldGenStepValue = Byte.MAX_VALUE;
for (int x = 0; x < 2; x++)
{
for (int z = 0; z < 2; z++)
{
int index = relativePosToIndex(x + relX, z + relZ);
byte worldGenStepValue = columnGenerationSteps[index];
minWorldGenStepValue = (byte) Math.min(minWorldGenStepValue, worldGenStepValue);
}
}
return minWorldGenStepValue;
}
private static long[] mergeInputTwoByTwoDataColumn(FullDataSourceV2 inputDataSource, int x, int z)
{
ArrayList<Long> newColumnList = new ArrayList<>();