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

Added slice in mergeAndAddData

Browse Source
This commit is contained in:
Morippi
2021-12-13 22:55:29 +01:00
parent c751b6fcc6
commit 27d9e6aeb7
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/core/objects/lod/VerticalLevelContainer.java
+17 -6
View File
@@ -256,6 +256,14 @@ public class VerticalLevelContainer implements LevelContainer
* @return one column of correctly parsed data
*/
public void mergeAndAddData(int posZ, int posX, short[] inputPositionDataToMerge, int[] inputVerticalData, int[] inputColorData, int[] inputLightData, byte inputDetailLevel, int inputVerticalSize)
{
mergeAndAddData(0, inputPositionDataToMerge.length, posZ, posX, inputPositionDataToMerge, inputVerticalData, inputColorData, inputLightData, inputDetailLevel, inputVerticalSize);
}
/**
* This method merge column of multiple data together
* @return one column of correctly parsed data
*/
public void mergeAndAddData(int sliceStart, int sliceEnd, int posZ, int posX, short[] inputPositionDataToMerge, int[] inputVerticalData, int[] inputColorData, int[] inputLightData, byte inputDetailLevel, int inputVerticalSize)
{
@@ -278,13 +286,16 @@ public class VerticalLevelContainer implements LevelContainer
boolean allEmpty = true;
boolean allVoid = true;
//we combine every position of the input
for(short data : inputPositionDataToMerge)
short tempPositionData;
//we combine every position in the slice of the input
//I THINK YOU CAN SEE HOW TO USE THE SLICE FROM HERE
for(int index = sliceStart; index <=sliceEnd; index++)
{
genMode = (byte) Math.min(genMode, PositionDataFormat.getGenerationMode(data));
correctLight &= PositionDataFormat.getFlag(data);
allVoid &= PositionDataFormat.isVoid(data);
allEmpty &= PositionDataFormat.doesItExist(data);
tempPositionData = inputPositionDataToMerge[index];
genMode = (byte) Math.min(genMode, PositionDataFormat.getGenerationMode(tempPositionData));
correctLight &= PositionDataFormat.getFlag(tempPositionData);
allVoid &= PositionDataFormat.isVoid(tempPositionData);
allEmpty &= PositionDataFormat.doesItExist(tempPositionData);
}
//Case 1: should never happen but we use this just in case